[wsas-java-dev] svn commit r11815 - in trunk:
commons/utils/src/main/java/org/wso2/utils
wsas/java/modules/admin/src/org/wso2/wsas/admin/module/admin/handler
wsas/java/modules/admin/src/org/wso2/wsas/admin/service
wsas/java/modules/admin/src/org/wso2/wsas/admin/service/META-INF
wsas/java/modules/admin/src/org/wso2/wsas/admin/service/logging
wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util
wsas/java/modules/core/src/org/wso2/wsas
wsas/java/modules/core/src/org/wso2/wsas/deployment
wsas/java/modules/core/src/org/wso2/wsas/feed
wsas/java/modules/core/src/org/wso2/wsas/installer
wsas/java/modules/core/src/org/wso2/wsas/persistence
wsas/java/modules/core/src/org/wso2/wsas/persistence/dao
wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject
wsas/java/modules/core/src/org/wso2/wsas/persistence/exception
wsas/java/modules/core/src/org/wso2/wsas/security
wsas/java/modules/core/src/org/wso2/wsas/security/pox
wsas/java/modules/core/src/org/wso2/wsas/serverinfo
wsas/java/modules/core/src/org/wso2/wsas/services/version/META-INF
wsas/java/modules/core/src/org/wso2/wsas/transport
wsas/java/modules/core/src/org/wso2/wsas/transport/fileupload
wsas/java/modules/core/src/org/wso2/wsas/transport/http
wsas/java/modules/core/src/org/wso2/wsas/transport/util
wsas/java/modules/core/src/org/wso2/wsas/util
svn at wso2.org
svn at wso2.org
Thu Jan 3 06:49:45 PST 2008
Author: azeez
Date: Thu Jan 3 06:46:50 2008
New Revision: 11815
Log:
1. Fix for WSAS-679
2. Code formatting
Modified:
trunk/commons/utils/src/main/java/org/wso2/utils/AbstractAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/module/admin/handler/AuthenticationHandler.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/CryptoAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/DataServiceAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/EJBProviderAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/GeneralServices.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/LogViewAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/META-INF/services.xml
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/STSAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/Sandesha2Admin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdminMBean.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/TransportAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/CertData.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/DBServerData.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/EJBAppServerData.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/EJBProviderData.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/OperationMetaData.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/Sandesha2Data.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServerData.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceArchiveCreator.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceGroupMetaData.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceMetaData.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/TrustedServiceData.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/UtKeystoreSecurityAssignment.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/MainServlet.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerConstants.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerStatus.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/TomcatRepositoryListener.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/TomcatServer.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/TomcatServerCache.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/feed/FeedListener.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/AbstractInstaller.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/EclipseWtpPluginInstalltionMode.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/GenericInstaller.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/GeronimoInstaller.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/InstallationManager.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/InstallationMode.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/InstallerConstants.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/JBossInstaller.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/ServletContainerInstallationMode.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/TomcatInstaller.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/EJBAppServerDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/EJBConfigurationDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/KeyStoreDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/LoggerDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/MessageDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ModuleDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/OperationDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/SecurityScenarioDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServerConfigurationDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceGroupDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/TransportDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/AbstractDataObject.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/EJBAppServerDO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/SecurityTokenDO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/exception/EJBAppServerAlreadyExistsException.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/exception/EJBAppServerNotFoundException.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/exception/TransportAlreadyExistsException.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/security/ServerCrypto.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/security/XKMSCryptoClient.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/security/pox/POXSecurityHandler.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/serverinfo/EmbeddedTomcatServerInfo.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/serverinfo/GenericServerInfo.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/serverinfo/GeronimoServerInfo.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/serverinfo/JBossServerInfo.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/serverinfo/Tomcat41xServerInfo.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/serverinfo/Tomcat5xServerInfo.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/serverinfo/Tomcat6xServerInfo.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/services/version/META-INF/version.wsdl
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileDownloadServlet.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileUploadServlet.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/HttpGetRequestProcessor.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/RequestRedirectionFilter.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/UIInitializerServlet.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/WSASServlet.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/fileupload/AbstractFileUploadExecutor.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/fileupload/EJBInterfaceFileUploadExecutor.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/fileupload/JarZipUploadExecutor.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/fileupload/ModuleFileUploadExecutor.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/fileupload/POJOFileUploadExecutor.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/fileupload/ServiceFileUploadExecutor.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/fileupload/SpringFileUploadExecutor.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/http/GenericHttpsTransportListener.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/http/HttpTransportListener.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/http/HttpsTransportListener.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/AbstractWsdlProcessor.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/AtomProcessor.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/CertProcessor.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/RequestProcessorUtil.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/RssProcessor.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/XsdProcessor.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/XsdUtil.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/util/ClusteringUtil.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/util/KeyStoreUtil.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/util/LoggingUtil.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/util/ParameterUtil.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/util/PasswordUpdater.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/util/PolicyUtil.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/util/ServerController.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/util/SystemRestarter.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/util/XmlConfiguration.java
Modified: trunk/commons/utils/src/main/java/org/wso2/utils/AbstractAdmin.java
==============================================================================
--- trunk/commons/utils/src/main/java/org/wso2/utils/AbstractAdmin.java (original)
+++ trunk/commons/utils/src/main/java/org/wso2/utils/AbstractAdmin.java Thu Jan 3 06:46:50 2008
@@ -28,50 +28,49 @@
*/
public abstract class AbstractAdmin {
- protected AxisConfiguration axisConfig;
- protected ConfigurationContext configCtx;
+// protected AxisConfiguration axisConfig;
+// protected ConfigurationContext configCtx;
//this method will be using dependency injection
- public void init(ServiceContext serviceContext) {
- this.setConfigContext(serviceContext.getConfigurationContext());
- this.setAxisConfig(serviceContext.getConfigurationContext().getAxisConfiguration());
- }
+
+// public void init(ServiceContext serviceContext) {
+// this.setConfigContext(serviceContext.getConfigurationContext());
+// this.setAxisConfig(serviceContext.getConfigurationContext().getAxisConfiguration());
+// }
public AxisConfiguration getAxisConfig() {
- if (axisConfig == null) {
- try {
- configCtx = WSO2ConfigurationContextFactory.
- getConfigurationContext(ServerConfigurator.getInstance());
- axisConfig = configCtx.getAxisConfiguration();
- } catch (AxisFault axisFault) {
- throw new RuntimeException(Messages.getMessage("InvalidAxisConfiguration"),
- axisFault);
- }
+// if (axisConfig == null) {
+ try {
+ return WSO2ConfigurationContextFactory.
+ getConfigurationContext(ServerConfigurator.getInstance()).getAxisConfiguration();
+ } catch (AxisFault axisFault) {
+ throw new RuntimeException(Messages.getMessage("InvalidAxisConfiguration"),
+ axisFault);
}
- return axisConfig;
+// }
+// return axisConfig;
}
- public void setAxisConfig(AxisConfiguration axisConfig) {
+ /*public void setAxisConfig(AxisConfiguration axisConfig) {
this.axisConfig = axisConfig;
- }
+ }*/
- public void setConfigContext(ConfigurationContext configurationContext) {
+ /*public void setConfigContext(ConfigurationContext configurationContext) {
this.configCtx = configurationContext;
- }
+ }*/
public ConfigurationContext getConfigContext() {
- if (configCtx == null) {
- try {
- configCtx = WSO2ConfigurationContextFactory.
- getConfigurationContext(ServerConfigurator.getInstance());
- axisConfig = configCtx.getAxisConfiguration();
- } catch (AxisFault axisFault) {
- throw new RuntimeException(Messages.getMessage("InvalidAxisConfiguration"),
- axisFault);
- }
+// if (configCtx == null) {
+ try {
+ return WSO2ConfigurationContextFactory.
+ getConfigurationContext(ServerConfigurator.getInstance());
+ } catch (AxisFault axisFault) {
+ throw new RuntimeException(Messages.getMessage("InvalidAxisConfiguration"),
+ axisFault);
}
- return configCtx;
}
+// return configCtx;
+//}
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/module/admin/handler/AuthenticationHandler.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/module/admin/handler/AuthenticationHandler.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/module/admin/handler/AuthenticationHandler.java Thu Jan 3 06:46:50 2008
@@ -22,8 +22,8 @@
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.wso2.wsas.ServerConstants;
import java.text.SimpleDateFormat;
@@ -67,10 +67,10 @@
(String) serviceCtx.getServiceGroupContext().
getPropertyNonReplicable(ServerConstants.ADMIN_LOGGED_IN);
boolean authenticated = "true".equals(loginStatus);
- if(!authenticated){
+ if (!authenticated) {
SimpleDateFormat date = new SimpleDateFormat("'['yyyy-MM-dd HH:mm:ss,SSSS']'");
log.warn("Illegal access attempt at " +
- date.format(new Date()) + " from IP address " + remoteIP);
+ date.format(new Date()) + " from IP address " + remoteIP);
}
return authenticated;
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/CryptoAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/CryptoAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/CryptoAdmin.java Thu Jan 3 06:46:50 2008
@@ -119,7 +119,7 @@
/**
* Get the certificate aliases in a particular key store
*
- * @param keyStoreName The name of the keystore
+ * @param keyStoreName The name of the keystore
* @return Certificate aliases
* @throws AxisFault
*/
@@ -153,7 +153,8 @@
* 2. Private key alise
* 3. Private key value
* to a given keystore.
- * @param keyStoreName The name of the keystore
+ *
+ * @param keyStoreName The name of the keystore
* @return Instance of KeyStoreData
* @throws AxisFault will be thrown
*/
@@ -364,7 +365,7 @@
String certFile = getFilePathFromFileId(certificatePathId);
FileInputStream certIn = new FileInputStream(certFile);
String fileSeparator = File.separator;
- if(File.separator.equals("\\")){
+ if (File.separator.equals("\\")) {
fileSeparator = "\\";
}
String origCertAlias =
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/DataServiceAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/DataServiceAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/DataServiceAdmin.java Thu Jan 3 06:46:50 2008
@@ -65,11 +65,6 @@
public DataServiceAdmin() {
}
- public DataServiceAdmin(ConfigurationContext configCtx) {
- this.configCtx = configCtx;
- this.axisConfig = configCtx.getAxisConfiguration();
- }
-
/**
* This method will give the setup for DS. if arg init is null or "", it will consider as
* a call for a new DS. If new, configuration would only allow for non url repositories.
@@ -213,11 +208,11 @@
AxisService axisService = getAxisConfig().getService(serviceId);
if (axisService == null) {
// New service
- String axis2RepoDirectory =
- this.configCtx.getAxisConfiguration().getRepository().getPath();
- String repoDirectory = (String) this.configCtx.getProperty(DBConstants.DB_SERVICE_REPO);
+ String axis2RepoDirectory = getAxisConfig().getRepository().getPath();
+ ConfigurationContext configCtx = getConfigContext();
+ String repoDirectory = (String) configCtx.getProperty(DBConstants.DB_SERVICE_REPO);
String fileExtension =
- (String) this.configCtx.getProperty(DBConstants.DB_SERVICE_EXTENSION);
+ (String) configCtx.getProperty(DBConstants.DB_SERVICE_EXTENSION);
String dataServiceDirectory = axis2RepoDirectory + File.separator + repoDirectory;
dataServiceFilePath = dataServiceDirectory + File.separator
@@ -398,7 +393,7 @@
log.debug(message, e);
return message;
} catch (ClassNotFoundException e) {
- String message = "Drive class " +driverClass+ " can not be loaded";
+ String message = "Drive class " + driverClass + " can not be loaded";
log.debug(message);
return message;
} finally {
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/EJBProviderAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/EJBProviderAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/EJBProviderAdmin.java Thu Jan 3 06:46:50 2008
@@ -52,27 +52,27 @@
public EJBProviderAdmin() {
pm = new PersistenceManager();
}
-
+
public void addApplicationServer(String providerURL,
- String jndiContextClass,
- String userName,
- String password,
- String appServerType) throws AxisFault{
- EJBAppServerDO ejbAppServerDO = new EJBAppServerDO();
-
- ejbAppServerDO.setAppServerType(appServerType);
- ejbAppServerDO.setJndiContextClass(jndiContextClass);
- ejbAppServerDO.setPassword(password);
- ejbAppServerDO.setUserName(userName);
- ejbAppServerDO.setProviderURL(providerURL);
-
- try {
- pm.addEJBAppServerConfiguration(ejbAppServerDO);
- } catch (EJBAppServerAlreadyExistsException e) {
- throw new AxisFault(e.getMessage());
- }
+ String jndiContextClass,
+ String userName,
+ String password,
+ String appServerType) throws AxisFault {
+ EJBAppServerDO ejbAppServerDO = new EJBAppServerDO();
+
+ ejbAppServerDO.setAppServerType(appServerType);
+ ejbAppServerDO.setJndiContextClass(jndiContextClass);
+ ejbAppServerDO.setPassword(password);
+ ejbAppServerDO.setUserName(userName);
+ ejbAppServerDO.setProviderURL(providerURL);
+
+ try {
+ pm.addEJBAppServerConfiguration(ejbAppServerDO);
+ } catch (EJBAppServerAlreadyExistsException e) {
+ throw new AxisFault(e.getMessage());
+ }
}
-
+
public void addEJBConfiguration(String providerURL,
String jndiContextClass,
String userName,
@@ -121,7 +121,7 @@
ejbProviderData.setJndiContextClass(ejbProviderDO.getJndiContextClass());
ejbProviderData.setPassword(ejbProviderDO.getPassword());
ejbProviderData.setProviderURL(ejbProviderDO.getProviderURL());
- String remoteInterface = ejbProviderDO.getRemoteInterface();
+ String remoteInterface = ejbProviderDO.getRemoteInterface();
ejbProviderData.setRemoteInterface(remoteInterface);
ejbProviderData.setUserName(ejbProviderDO.getUserName());
ejbProviderData.setServiceName(remoteInterface.substring(remoteInterface.lastIndexOf('.') + 1));
@@ -131,16 +131,17 @@
return ejbProviderDataObjs;
}
- public EJBProviderDO getEJBConfiguration(String beanJNDIName, String jnpProviderUrl)throws AxisFault {
- try {
- return pm.getEJBConfiguration(beanJNDIName, jnpProviderUrl);
- } catch (Exception e) {
- throw new AxisFault(e.getMessage());
- }
+ public EJBProviderDO getEJBConfiguration(String beanJNDIName, String jnpProviderUrl)
+ throws AxisFault {
+ try {
+ return pm.getEJBConfiguration(beanJNDIName, jnpProviderUrl);
+ } catch (Exception e) {
+ throw new AxisFault(e.getMessage());
+ }
}
-
+
public void deleteEJBConfiguration(String beanJNDIName, String jnpProviderUrl)
throws AxisFault {
try {
@@ -185,18 +186,18 @@
ejbAppServers.toArray(ejbAppServerList);
return ejbAppServerList;
}
-
- public EJBAppServerData[] getEJBAppServerConfigurations(){
- EJBAppServerDO[] ejbAppServers = pm.getEJBAppServerConfigurations();
- EJBAppServerData[] ejbAppServerConfigurations = new EJBAppServerData[ejbAppServers.length];
-
- for (int a = 0; a < ejbAppServers.length; a++) {
- ejbAppServerConfigurations[a] = new EJBAppServerData();
- ejbAppServerConfigurations[a].setAppServerType(ejbAppServers[a].getAppServerType());
- ejbAppServerConfigurations[a].setProviderURL(ejbAppServers[a].getProviderURL());
- }
- return ejbAppServerConfigurations;
+
+ public EJBAppServerData[] getEJBAppServerConfigurations() {
+ EJBAppServerDO[] ejbAppServers = pm.getEJBAppServerConfigurations();
+ EJBAppServerData[] ejbAppServerConfigurations = new EJBAppServerData[ejbAppServers.length];
+
+ for (int a = 0; a < ejbAppServers.length; a++) {
+ ejbAppServerConfigurations[a] = new EJBAppServerData();
+ ejbAppServerConfigurations[a].setAppServerType(ejbAppServers[a].getAppServerType());
+ ejbAppServerConfigurations[a].setProviderURL(ejbAppServers[a].getProviderURL());
+ }
+ return ejbAppServerConfigurations;
}
-
-
+
+
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/GeneralServices.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/GeneralServices.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/GeneralServices.java Thu Jan 3 06:46:50 2008
@@ -15,30 +15,30 @@
*/
package org.wso2.wsas.admin.service;
-import org.wso2.wsas.admin.service.util.ServiceGroupMetaData;
-import org.wso2.wsas.admin.service.util.ServiceMetaData;
-import org.wso2.wsas.ServerConstants;
-import org.wso2.utils.WSO2Constants;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMText;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.commons.collections.bidimap.TreeBidiMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.collections.bidimap.TreeBidiMap;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.OMText;
+import org.wso2.utils.WSO2Constants;
+import org.wso2.wsas.ServerConstants;
+import org.wso2.wsas.admin.service.util.ServiceGroupMetaData;
+import org.wso2.wsas.admin.service.util.ServiceMetaData;
-import javax.xml.namespace.QName;
import javax.activation.DataHandler;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
+import javax.xml.namespace.QName;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
/**
* This class will provide method to access general Axis2 services info and
@@ -60,8 +60,6 @@
public ServiceGroupMetaData[] listServiceGroups() throws AxisFault {
ServiceGroupAdmin sga = new ServiceGroupAdmin();
- sga.setConfigContext(getConfigurationContext());
- sga.setAxisConfig(getAxisConfiguration());
List list = new ArrayList();
ServiceGroupMetaData[] serviceGroupMetaData = sga.listServiceGroups();
for (int i = 0; i < serviceGroupMetaData.length; i++) {
@@ -75,8 +73,6 @@
public ServiceMetaData getServiceData(String serviceName) throws AxisFault {
ServiceAdmin sa = new ServiceAdmin();
- sa.setConfigContext(getConfigurationContext());
- sa.setAxisConfig(getAxisConfiguration());
return sa.getServiceData(serviceName);
}
@@ -90,6 +86,7 @@
/**
* Web service method
+ *
* @param payload payload
* @return String Id
* @throws AxisFault will be thrown
@@ -138,7 +135,8 @@
/**
* Write the attachment to the file system.
- * @param dh DataHandler
+ *
+ * @param dh DataHandler
* @param type available type
* @return String uuid
* @throws AxisFault will be thrown
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/LogViewAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/LogViewAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/LogViewAdmin.java Thu Jan 3 06:46:50 2008
@@ -17,17 +17,17 @@
package org.wso2.wsas.admin.service;
import org.apache.axis2.AxisFault;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.log4j.Appender;
-import org.apache.log4j.Logger;
import org.apache.log4j.Layout;
+import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.wso2.utils.MemoryAppender;
import org.wso2.wsas.ServerConstants;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
/**
@@ -48,7 +48,7 @@
} else {
return new String[]{
"--- No log entries found. " +
- "You may try increasing the log level ---"
+ "You may try increasing the log level ---"
};
}
Object[] objects;
@@ -58,10 +58,10 @@
objects = memoryAppender.getCircularQueue().getObjects(definedamount);
}
if ((memoryAppender.getCircularQueue().getObjects(definedamount) == null) ||
- (memoryAppender.getCircularQueue().getObjects(definedamount).length == 0)) {
+ (memoryAppender.getCircularQueue().getObjects(definedamount).length == 0)) {
return new String[]{
"--- No log entries found. " +
- "You may try increasing the log level ---"
+ "You may try increasing the log level ---"
};
}
String[] resp = new String[objects.length];
@@ -75,7 +75,7 @@
return resp;
} else {
return new String[]{"The log must be configured to use the " +
- "org.wso2.utils.MemoryAppender to view entries on the admin console"};
+ "org.wso2.utils.MemoryAppender to view entries on the admin console"};
}
}
@@ -114,7 +114,7 @@
if (resultList.isEmpty()) {
return new String[]{
"--- No log entries found for " +
- "the keyword " + keyword + " and the log level " + type + "---"
+ "the keyword " + keyword + " and the log level " + type + "---"
};
}
return (String[]) resultList.toArray(new String[resultList.size()]);
@@ -134,7 +134,7 @@
} else {
return new String[]{
"--- No log entries found for " +
- "the " + keyword + " ---"
+ "the " + keyword + " ---"
};
}
Object[] objects;
@@ -144,10 +144,10 @@
objects = memoryAppender.getCircularQueue().getObjects(definedAmount);
}
if ((memoryAppender.getCircularQueue().getObjects(definedAmount) == null) ||
- (memoryAppender.getCircularQueue().getObjects(definedAmount).length == 0)) {
+ (memoryAppender.getCircularQueue().getObjects(definedAmount).length == 0)) {
return new String[]{
"--- No log entries found for " +
- "the " + keyword + " ---"
+ "the " + keyword + " ---"
};
}
Layout layout = memoryAppender.getLayout();
@@ -164,13 +164,13 @@
if (resultList.isEmpty()) {
return new String[]{
"--- No log entries found for " +
- "the " + keyword + " ---"
+ "the " + keyword + " ---"
};
}
return (String[]) resultList.toArray(new String[resultList.size()]);
} else {
return new String[]{"The log must be configured to use the " +
- "org.wso2.utils.MemoryAppender to view entries on the admin console"};
+ "org.wso2.utils.MemoryAppender to view entries on the admin console"};
}
}
@@ -187,7 +187,7 @@
} else {
return new String[]{
"--- No log entries found for " +
- "the " + type + " ---"
+ "the " + type + " ---"
};
}
@@ -198,10 +198,10 @@
objects = memoryAppender.getCircularQueue().getObjects(definedAmount);
}
if ((memoryAppender.getCircularQueue().getObjects(definedAmount) == null) ||
- (memoryAppender.getCircularQueue().getObjects(definedAmount).length == 0)) {
+ (memoryAppender.getCircularQueue().getObjects(definedAmount).length == 0)) {
return new String[]{
"--- No log entries found for " +
- "the " + type + " ---"
+ "the " + type + " ---"
};
}
Layout layout = memoryAppender.getLayout();
@@ -218,13 +218,13 @@
if (resultList.isEmpty()) {
return new String[]{
"--- No log entries found for " +
- "the " + type + " ---"
+ "the " + type + " ---"
};
}
return (String[]) resultList.toArray(new String[resultList.size()]);
} else {
return new String[]{"The log must be configured to use the " +
- "org.wso2.utils.MemoryAppender to view entries through the admin console"};
+ "org.wso2.utils.MemoryAppender to view entries through the admin console"};
}
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/META-INF/services.xml
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/META-INF/services.xml (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/META-INF/services.xml Thu Jan 3 06:46:50 2008
@@ -247,7 +247,8 @@
<transport>http</transport>
</transports>
<description>This class will provide method to access general Axis2 services info and
- provide method to upload files using Axis2 MTOM support</description>
+ provide method to upload files using Axis2 MTOM support
+ </description>
<parameter name="ServiceClass">org.wso2.wsas.admin.service.GeneralServices</parameter>
</service>
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java Thu Jan 3 06:46:50 2008
@@ -20,7 +20,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.AxisModule;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
@@ -87,10 +86,6 @@
public ModuleAdmin() {
}
- public ModuleAdmin(ConfigurationContext configCtx) {
- this.configCtx = configCtx;
- this.axisConfig = configCtx.getAxisConfiguration();
- }
/**
* List all the available modules
@@ -379,7 +374,7 @@
if (statSG != null) {
statSG.disengageModule(axisModule);
}
- AxisServiceGroup tracerSG =
+ AxisServiceGroup tracerSG =
axisConfig.getServiceGroup(ServerConstants.TRACER_SERVICE_GROUP);
if (tracerSG != null) {
tracerSG.disengageModule(axisModule);
@@ -470,7 +465,7 @@
// Check whether Rahas is engaged. If so, Rampart cannot be disengaged since Rahas
// requires Rampart.
- AxisModule rahasModule = axisConfig.getModule(RAHAS);
+ AxisModule rahasModule = getAxisConfig().getModule(RAHAS);
if (rahasModule != null) {
if (service.isEngaged(rahasModule)) {
throw new AxisFault("Rampart cannot be disengaged since Rahas is engaged to " +
@@ -499,7 +494,7 @@
if (serviceDO != null) {
SecurityScenarioDO secScenario = serviceDO.getSecurityScenario();
- AxisModule rahasModule = axisConfig.getModule(RAHAS);
+ AxisModule rahasModule = getAxisConfig().getModule(RAHAS);
ModuleDO moduleDO =
pm.getModule(rahasModule.getName(), rahasModule.getVersion());
if (moduleDO != null && secScenario != null) {
@@ -780,7 +775,7 @@
trustStores.append(trustStore.getFilePath()).append(",");
}
- ServiceAdmin serviceAdmin = new ServiceAdmin(configCtx);
+ ServiceAdmin serviceAdmin = new ServiceAdmin();
cryptoProps.setProperty(ServerCrypto.PROP_ID_TRUST_STORES, trustStores.toString());
try {
serviceAdmin.
@@ -879,7 +874,7 @@
if (moduleId.equals("rahas")) {
//Remove the Rahas configuration parameters
- ServiceAdmin serviceAdmin = new ServiceAdmin(configCtx);
+ ServiceAdmin serviceAdmin = new ServiceAdmin();
serviceAdmin.removeServiceParameter(serviceId,
SCTIssuerConfig.SCT_ISSUER_CONFIG.
getLocalPart());
@@ -1008,7 +1003,7 @@
// Rampart cannot be disengaged, if Rahas is engaged
if (moduleId.equalsIgnoreCase("rampart")) {
- AxisModule rahasModule = axisConfig.getModule(RAHAS);
+ AxisModule rahasModule = getAxisConfig().getModule(RAHAS);
if (rahasModule != null) {
if (axisOp.isEngaged(rahasModule)) {
throw new AxisFault("Rampart cannot be disengaged since Rahas " +
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java Thu Jan 3 06:46:50 2008
@@ -157,12 +157,14 @@
/**
* Configuring MTOM
+ *
* @param flag
* @param serviceName
* @param operationName
* @throws AxisFault
*/
- public void configureMTOM(String flag,String serviceName, String operationName) throws AxisFault {
+ public void configureMTOM(String flag, String serviceName, String operationName)
+ throws AxisFault {
AxisService axisService = getAxisConfig().getService(serviceName);
AxisOperation operation;
if (axisService != null) {
@@ -679,7 +681,7 @@
private OperationMetaData getOperationMetaData(String serviceName,
String operationName) throws AxisFault {
- AxisService axisService = configCtx.getAxisConfiguration().getService(serviceName);
+ AxisService axisService = getAxisConfig().getService(serviceName);
AxisOperation axisOperation = null;
if (axisService != null) {
axisOperation = axisService.getOperation(new QName(operationName));
@@ -692,7 +694,7 @@
opMetaData.setControlOperation(axisOperation.isControlOperation());
Parameter parameter = axisOperation.getParameter(Constants.Configuration.ENABLE_MTOM);
if (parameter != null) {
- opMetaData.setEnableMTOM((String)parameter.getValue());
+ opMetaData.setEnableMTOM((String) parameter.getValue());
} else {
opMetaData.setEnableMTOM("false");
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/STSAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/STSAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/STSAdmin.java Thu Jan 3 06:46:50 2008
@@ -49,8 +49,9 @@
/**
* Add a the given service endpoint as a trusted endpoint address
+ *
* @param serviceAddress Address of the service endpoint
- * @param certAlias Alias of the service cert
+ * @param certAlias Alias of the service cert
* @throws AxisFault
*/
public void addTrustedService(String serviceAddress, String certAlias) throws AxisFault {
@@ -60,7 +61,7 @@
AxisService stsService = config.getService(ServerConstants.STS_NAME);
Parameter origParam =
stsService.getParameter(SAMLTokenIssuerConfig.SAML_ISSUER_CONFIG.getLocalPart());
- if(origParam != null) {
+ if (origParam != null) {
OMElement samlConfigElem =
origParam.getParameterElement().
getFirstChildWithName(SAMLTokenIssuerConfig.SAML_ISSUER_CONFIG);
@@ -85,7 +86,7 @@
Parameter origParam = service
.getParameter(SAMLTokenIssuerConfig.SAML_ISSUER_CONFIG
.getLocalPart());
- if(origParam != null) {
+ if (origParam != null) {
OMElement samlConfigElem = origParam.getParameterElement().getFirstChildWithName(
SAMLTokenIssuerConfig.SAML_ISSUER_CONFIG);
SAMLTokenIssuerConfig samlConfig = new SAMLTokenIssuerConfig(samlConfigElem);
@@ -94,7 +95,7 @@
} else {
throw new AxisFault("missing parameter : "
+ SAMLTokenIssuerConfig.SAML_ISSUER_CONFIG
- .getLocalPart());
+ .getLocalPart());
}
} catch (Exception e) {
@@ -110,7 +111,7 @@
Parameter origParam = service
.getParameter(SAMLTokenIssuerConfig.SAML_ISSUER_CONFIG
.getLocalPart());
- if(origParam != null) {
+ if (origParam != null) {
OMElement samlConfigElem = origParam.getParameterElement().getFirstChildWithName(
SAMLTokenIssuerConfig.SAML_ISSUER_CONFIG);
SAMLTokenIssuerConfig samlConfig = new SAMLTokenIssuerConfig(samlConfigElem);
@@ -120,7 +121,7 @@
ArrayList serviceBag = new ArrayList();
for (Iterator iterator = addresses.iterator(); iterator.hasNext();) {
String address = (String) iterator.next();
- String alias = (String)trustedServicesMap.get(address);
+ String alias = (String) trustedServicesMap.get(address);
TrustedServiceData data = new TrustedServiceData(address, alias);
serviceBag.add(data);
}
@@ -144,7 +145,7 @@
Parameter origParam = service
.getParameter(SAMLTokenIssuerConfig.SAML_ISSUER_CONFIG
.getLocalPart());
- if(origParam != null) {
+ if (origParam != null) {
OMElement samlConfigElem =
origParam.getParameterElement().
getFirstChildWithName(SAMLTokenIssuerConfig.SAML_ISSUER_CONFIG);
@@ -162,6 +163,7 @@
/**
* Returns certificate aliases of primary keystore
+ *
* @return String array
* @throws AxisFault
*/
@@ -190,13 +192,13 @@
log.error(msg, e);
throw new AxisFault(msg + e.getMessage());
}
- return (String[])aliases.toArray(new String[aliases.size()]);
+ return (String[]) aliases.toArray(new String[aliases.size()]);
}
throw new AxisFault("Primary Keystore cannot be found.");
}
private void setSTSParameter(SAMLTokenIssuerConfig samlConfig) throws AxisFault {
- new ServiceAdmin(configCtx).setServiceParameter3(ServerConstants.STS_NAME,
- samlConfig.getParameter());
+ new ServiceAdmin().setServiceParameter3(ServerConstants.STS_NAME,
+ samlConfig.getParameter());
}
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/Sandesha2Admin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/Sandesha2Admin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/Sandesha2Admin.java Thu Jan 3 06:46:50 2008
@@ -48,16 +48,17 @@
/**
* convenience method to return observation data
+ *
* @return Sandesha2Data array
* @throws AxisFault
*/
public Sandesha2Data[] getOutgoingSequenceData() throws AxisFault {
-
+
SandeshaReport sandeshaReport = getSandeshaReport();
List outgoingSequnces = sandeshaReport.getOutgoingSequenceList();
ArrayList dataList = new ArrayList();
for (Iterator iterator = outgoingSequnces.iterator(); iterator.hasNext();) {
- String sequenceId = (String)iterator.next();
+ String sequenceId = (String) iterator.next();
Sandesha2Data s2Data = new Sandesha2Data();
s2Data.setSequenceID(sequenceId);
s2Data.setFlow(2);
@@ -68,20 +69,20 @@
sandeshaReport = getSandeshaReport();
List incomingSequences = sandeshaReport.getIncomingSequenceList();
for (Iterator iterator = incomingSequences.iterator(); iterator.hasNext();) {
- String sequenceId = (String)iterator.next();
+ String sequenceId = (String) iterator.next();
Sandesha2Data s2Data = new Sandesha2Data();
s2Data.setSequenceID(sequenceId);
s2Data.setFlow(1);
- s2Data.setSequenceReport(getIncomingSequenceDetails (sequenceId));
+ s2Data.setSequenceReport(getIncomingSequenceDetails(sequenceId));
dataList.add(s2Data);
}
-
+
Sandesha2Data[] arr = new Sandesha2Data[dataList.size()];
- for (int i =0;i<arr.length;i++) {
- Sandesha2Data data = (Sandesha2Data) dataList.get(i);
- arr[i] = data;
+ for (int i = 0; i < arr.length; i++) {
+ Sandesha2Data data = (Sandesha2Data) dataList.get(i);
+ arr[i] = data;
}
-
+
return arr;
}
@@ -106,8 +107,9 @@
*/
public SequenceReport getIncomingSequenceDetails(String sequenceID) throws AxisFault {
ConfigurationContext configurationContext = getConfigContext();
- if (configurationContext == null)
+ if (configurationContext == null) {
throw new AxisFault("Cannot proceed. ConfigurationContext is not set");
+ }
SequenceReport incomingSequenceReport =
SandeshaClient.getIncomingSequenceReport(sequenceID, configurationContext);
@@ -123,8 +125,9 @@
*/
public SequenceReport getOutgoingSequenceDetails(String sequenceID) throws AxisFault {
ConfigurationContext configurationContext = getConfigContext();
- if (configurationContext == null)
+ if (configurationContext == null) {
throw new AxisFault("Cannot proceed. ConfigurationContext is not set");
+ }
SequenceReport outgoingSequenceReport =
SandeshaClient.getOutgoingSequenceReport(sequenceID, configurationContext);
@@ -133,12 +136,14 @@
private SandeshaReport getSandeshaReport() throws AxisFault {
ConfigurationContext configurationContext = getConfigContext();
- if (configurationContext == null)
+ if (configurationContext == null) {
throw new AxisFault("Cannot proceed. ConfigurationContext is not set");
+ }
SandeshaReport sandeshaReport = SandeshaClient.getSandeshaReport(configurationContext);
- if (sandeshaReport == null)
+ if (sandeshaReport == null) {
throw new AxisFault("Could not find a valid SandeshaReport");
+ }
return sandeshaReport;
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java Thu Jan 3 06:46:50 2008
@@ -24,6 +24,7 @@
import org.apache.axis2.description.AxisModule;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.PolicyInclude;
+import org.apache.axis2.engine.AxisConfiguration;
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -131,7 +132,7 @@
populateRampartConfig(rampartConfig, props);
- ServiceAdmin serviceAdmin = new ServiceAdmin(configCtx);
+ ServiceAdmin serviceAdmin = new ServiceAdmin();
// Remove policies of other scenarios
removeAllSecurityScenarioPolicies(serviceAdmin, serviceName);
@@ -172,7 +173,7 @@
if (httpsRequired) {
List httpsTransports = new ArrayList();
- for (Iterator iter = axisConfig.getTransportsIn().keySet().iterator();
+ for (Iterator iter = getAxisConfig().getTransportsIn().keySet().iterator();
iter.hasNext();) {
String transport = (String) iter.next();
if (transport.toLowerCase().indexOf(ServerConstants.HTTPS_TRANSPORT) != -1) {
@@ -224,12 +225,12 @@
}
public void disableSecurity(String serviceName) throws AxisFault {
- ServiceAdmin serviceAdmin = new ServiceAdmin(configCtx);
+ ServiceAdmin serviceAdmin = new ServiceAdmin();
removeAllSecurityScenarioPolicies(serviceAdmin, serviceName);
ServiceDO serviceDO = pm.getService(serviceName, ServiceIdentifierDO.EMPTY_SERVICE_VERSION);
serviceDO.setIsUTAuthEnabled(false);
serviceDO.setIsExposedOnAllTransports(true);
- axisConfig.getService(serviceName).setEnableAllTransports(true);
+ getAxisConfig().getService(serviceName).setEnableAllTransports(true);
SecurityScenarioDO securityScenario = serviceDO.getSecurityScenario();
if (securityScenario != null) {
securityScenario.removeService(serviceDO);
@@ -275,7 +276,7 @@
xp.setNamespaceContext(nsCtx);
OMElement policyEle = (OMElement) xp.selectSingleNode(builder.getDocumentElement());
OMAttribute idAtt = policyEle.getAttribute(ID);
- if(idAtt == null){
+ if (idAtt == null) {
throw new AxisFault("The policy ID in the policy file " +
policyFile.getAbsolutePath() + " is null");
}
@@ -455,7 +456,7 @@
ServiceIdentifierDO.EMPTY_SERVICE_VERSION);
serviceDO.setIsUTAuthEnabled(false);
serviceDO.setIsExposedOnAllTransports(true);
- axisConfig.getService(serviceName).setEnableAllTransports(true);
+ getAxisConfig().getService(serviceName).setEnableAllTransports(true);
for (int i = 0; i < trustedCertStores.length; i++) {
String ks = trustedCertStores[i];
KeyStoreDO keyStore = pm.getKeyStore(ks);
@@ -552,13 +553,13 @@
private void engageModules(String serviceId,
String scenarioId) throws AxisFault {
SecurityScenarioDO securityScenario = pm.getSecurityScenario(scenarioId);
- AxisService axisService = axisConfig.getService(serviceId);
+ AxisService axisService = getAxisConfig().getService(serviceId);
for (Iterator modules = securityScenario.modules.iterator(); modules.hasNext();) {
ModuleDO moduleDO = (ModuleDO) modules.next();
String moduleName = moduleDO.getModuleIdentifierDO().getName();
if (!axisService.isEngaged(moduleName)) {
- AxisModule axisModule = axisConfig.getModule(moduleName);
- new ModuleAdmin(this.configCtx).
+ AxisModule axisModule = getAxisConfig().getModule(moduleName);
+ new ModuleAdmin().
engageModuleForService(axisModule.getName(),
axisModule.getVersion(),
serviceId,
@@ -570,8 +571,9 @@
private void disengageModules(String serviceId,
String scenarioId) throws AxisFault {
SecurityScenarioDO securityScenario = pm.getSecurityScenario(scenarioId);
+ AxisConfiguration axisConfig = getAxisConfig();
AxisService axisService = axisConfig.getService(serviceId);
- ModuleAdmin moduleAdmin = new ModuleAdmin(this.configCtx);
+ ModuleAdmin moduleAdmin = new ModuleAdmin();
for (Iterator modules = securityScenario.modules.iterator(); modules.hasNext();) {
ModuleDO moduleDO = (ModuleDO) modules.next();
String moduleName = moduleDO.getModuleIdentifierDO().getName();
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java Thu Jan 3 06:46:50 2008
@@ -134,11 +134,6 @@
public ServiceAdmin() {
}
- public ServiceAdmin(ConfigurationContext configCtx) {
- this.configCtx = configCtx;
- this.axisConfig = configCtx.getAxisConfiguration();
- }
-
/**
* Expose this service only via the specified transport
*
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdminMBean.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdminMBean.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdminMBean.java Thu Jan 3 06:46:50 2008
@@ -22,6 +22,7 @@
/**
* Get the number of faulty services
+ *
* @return number of faulty services
* @throws Exception If an error occurs
*/
@@ -29,6 +30,7 @@
/**
* Start the service specified by <code>serviceName</code>
+ *
* @param serviceName Name of the service to be restarted
* @throws Exception If an error occurs while starting the service
*/
@@ -36,6 +38,7 @@
/**
* Stop the service specified by <code>serviceName</code>
+ *
* @param serviceName Name of the service to be restarted
* @throws Exception If an error occurs while stopping the service
*/
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java Thu Jan 3 06:46:50 2008
@@ -67,9 +67,7 @@
* Return service group details for a given service group
*
* @param serviceGroupName
- *
* @return ServiceGroupMetaData
- *
* @throws AxisFault
*/
public ServiceGroupMetaData listServiceGroup(String serviceGroupName) throws AxisFault {
@@ -92,7 +90,6 @@
* set the service group parameter enableMTOM to manipulate MTOM flag true/false/optional
*
* @param flag
- *
* @return ServiceGroupMetaData
*/
public ServiceGroupMetaData configureMTOM(String flag,
@@ -294,7 +291,6 @@
* Remove a service group
*
* @param groupName
- *
* @throws AxisFault
*/
public void removeServiceGroup(String groupName) throws AxisFault {
@@ -311,9 +307,7 @@
*
* @param service_group_id
* @param group_version
- *
* @return list of service group params as on OMElement[]
- *
* @throws AxisFault
*/
public OMElement[] getServiceGroupParameters(String service_group_id,
@@ -339,9 +333,7 @@
* ones), where each parameter is an XML fragment representing the "parameter" element
*
* @param serviceGroupId
- *
* @return list of declared service group params as an OMElement[]
- *
* @throws AxisFault
*/
public OMElement[] getDeclaredServiceGroupParameters(String serviceGroupId) throws AxisFault {
@@ -523,13 +515,11 @@
* be returned with ID, that can be used to access the AAR and dump it anywhere user wishes.
*
* @param serviceGroupName
- *
* @return id of service archive
- *
* @throws AxisFault
*/
public String dumpAAR(String serviceGroupName) throws AxisFault {
- return ServiceArchiveCreator.createArchive(configCtx, serviceGroupName);
+ return ServiceArchiveCreator.createArchive(getConfigContext(), serviceGroupName);
}
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/TransportAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/TransportAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/TransportAdmin.java Thu Jan 3 06:46:50 2008
@@ -43,7 +43,7 @@
Collection transCollection = new ArrayList();
for (Iterator iter = transports.values().iterator(); iter.hasNext();) {
- TransportInDescription inTransport= (TransportInDescription) iter.next();
+ TransportInDescription inTransport = (TransportInDescription) iter.next();
TransportSummary summary = new TransportSummary();
summary.setProtocol(inTransport.getName());
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java Thu Jan 3 06:46:50 2008
@@ -154,7 +154,7 @@
}
public boolean changeUserPassword(String username, String password) throws Exception {
- if ((username == null) || (username.trim().length() == 0)) {
+ if ((username == null) || (username.trim().length() == 0)) {
return false;
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingAdmin.java Thu Jan 3 06:46:50 2008
@@ -22,11 +22,11 @@
import org.apache.log4j.Appender;
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.FileAppender;
+import org.apache.log4j.Layout;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
-import org.apache.log4j.Layout;
import org.apache.log4j.Priority;
import org.apache.log4j.net.SyslogAppender;
import org.wso2.wsas.ServerConstants;
@@ -40,15 +40,15 @@
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Collections;
/**
* This is the Admin service used for obtaining Log4J information about the system and also used for
@@ -144,7 +144,6 @@
/**
* @param appenderName The name of the appender
- *
* @return The appender information the given appender with name <code>appenderName</code>
*/
public AppenderData getAppenderData(String appenderName) {
@@ -167,7 +166,6 @@
* Convert a Log$J Appender to an instance of {@link AppenderData}
*
* @param targetAppender The Appender to be converted
- *
* @return The {@link AppenderData} instance corresponding to <code>targetAppender</code>
*/
private AppenderData toAppenderData(Appender targetAppender) {
@@ -238,7 +236,6 @@
* @param facility The Syslog facility - Only relevant to SyslogAppenders
* @param persist true - indicates persist these changes to the DB; false - indicates
* make changes only in memory and do not persist the changes to DB
- *
* @throws AxisFault If failure occurs during setting of these values
*/
public void updateAllAppenderData(String appenderName,
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/CertData.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/CertData.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/CertData.java Thu Jan 3 06:46:50 2008
@@ -22,7 +22,7 @@
* This will provide cert as well as keystore important data.
*/
public class CertData {
-
+
private String alias;
private String subjectDN;
private String issuerDN;
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/DBServerData.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/DBServerData.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/DBServerData.java Thu Jan 3 06:46:50 2008
@@ -17,29 +17,34 @@
package org.wso2.wsas.admin.service.util;
public class DBServerData {
- private String serverId;
- private String jdbcUrl;
- private String driverClass;
+ private String serverId;
+ private String jdbcUrl;
+ private String driverClass;
private String protocol;
public String getDriverClass() {
- return driverClass;
- }
- public void setDriverClass(String driverClass) {
- this.driverClass = driverClass;
- }
- public String getJdbcUrl() {
- return jdbcUrl;
- }
- public void setJdbcUrl(String jdbcUrl) {
- this.jdbcUrl = jdbcUrl;
- }
- public String getServerId() {
- return serverId;
- }
- public void setServerId(String serverId) {
- this.serverId = serverId;
- }
+ return driverClass;
+ }
+
+ public void setDriverClass(String driverClass) {
+ this.driverClass = driverClass;
+ }
+
+ public String getJdbcUrl() {
+ return jdbcUrl;
+ }
+
+ public void setJdbcUrl(String jdbcUrl) {
+ this.jdbcUrl = jdbcUrl;
+ }
+
+ public String getServerId() {
+ return serverId;
+ }
+
+ public void setServerId(String serverId) {
+ this.serverId = serverId;
+ }
public String getProtocol() {
return protocol;
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/EJBAppServerData.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/EJBAppServerData.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/EJBAppServerData.java Thu Jan 3 06:46:50 2008
@@ -56,21 +56,21 @@
this.providerURL = providerURL;
}
- public String getAppServerType() {
- return appServerType;
- }
-
- public void setAppServerType(String appServerType) {
- this.appServerType = appServerType;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
-
+ public String getAppServerType() {
+ return appServerType;
+ }
+
+ public void setAppServerType(String appServerType) {
+ this.appServerType = appServerType;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/EJBProviderData.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/EJBProviderData.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/EJBProviderData.java Thu Jan 3 06:46:50 2008
@@ -27,14 +27,14 @@
String serviceName;
public String getServiceName() {
- return serviceName;
- }
+ return serviceName;
+ }
- public void setServiceName(String serviceName) {
- this.serviceName = serviceName;
- }
+ public void setServiceName(String serviceName) {
+ this.serviceName = serviceName;
+ }
- public String getBeanJNDIName() {
+ public String getBeanJNDIName() {
return beanJNDIName;
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/OperationMetaData.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/OperationMetaData.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/OperationMetaData.java Thu Jan 3 06:46:50 2008
@@ -173,6 +173,7 @@
/**
* Configuring enable
+ *
* @return boolean
*/
public String getEnableMTOM() {
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/Sandesha2Data.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/Sandesha2Data.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/Sandesha2Data.java Thu Jan 3 06:46:50 2008
@@ -23,7 +23,7 @@
*/
public class Sandesha2Data {
-
+
private String sequenceID;
private SequenceReport sequenceReport;
/**
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServerData.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServerData.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServerData.java Thu Jan 3 06:46:50 2008
@@ -207,19 +207,19 @@
public String toString() {
- return "JVM Name='" + javaRuntimeName + '\'' +
- ", JVM Version='" + javaVMVersion + '\'' +
- ", JVM Vendor='" + javaVMVendor + '\'' +
- ", Java Home='" + javaHome + '\'' +
- ", OS Name='" + osName + '\'' +
- ", OS Version='" + osVersion + '\'' +
- ", user.home='" + userHome + '\'' +
- ", user.timezone='" + userTimezone + '\'' +
- ", username='" + userName + '\'' +
- ", user.country='" + userCountry + '\'' +
- ", Axis2 Location='" + axis2Location + '\'' +
- ", Server Name='" + serverName + '\'' +
- ", Repository Location='" + repoLocation + '\'' +
- ", WSO2 WSAS Version='" + wso2wsasVersion + '\'';
+ return "JVM Name='" + javaRuntimeName + '\'' +
+ ", JVM Version='" + javaVMVersion + '\'' +
+ ", JVM Vendor='" + javaVMVendor + '\'' +
+ ", Java Home='" + javaHome + '\'' +
+ ", OS Name='" + osName + '\'' +
+ ", OS Version='" + osVersion + '\'' +
+ ", user.home='" + userHome + '\'' +
+ ", user.timezone='" + userTimezone + '\'' +
+ ", username='" + userName + '\'' +
+ ", user.country='" + userCountry + '\'' +
+ ", Axis2 Location='" + axis2Location + '\'' +
+ ", Server Name='" + serverName + '\'' +
+ ", Repository Location='" + repoLocation + '\'' +
+ ", WSO2 WSAS Version='" + wso2wsasVersion + '\'';
}
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceArchiveCreator.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceArchiveCreator.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceArchiveCreator.java Thu Jan 3 06:46:50 2008
@@ -50,8 +50,8 @@
import org.wso2.utils.WSO2Constants;
import org.wso2.ws.dataservice.DBConstants;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsas.util.SystemFilter;
import org.wso2.wsas.util.PolicyUtil;
+import org.wso2.wsas.util.SystemFilter;
import org.wso2.wsas.util.WsasUtils;
import javax.xml.namespace.QName;
@@ -79,11 +79,12 @@
private static Log log = LogFactory.getLog(ServiceArchiveCreator.class);
/**
- * This method will generate an aar based on the information given.
- * @param configurationContext configuration context
- * @param serviceGroupName service group name
+ * This method will generate an aar based on the information given.
+ *
+ * @param configurationContext configuration context
+ * @param serviceGroupName service group name
* @return String : an id. User can access the generated archive using HTTP GET interface and
- * this Id
+ * this Id
* @throws AxisFault will be thrown.
*/
public static String createArchive(ConfigurationContext configurationContext,
@@ -251,7 +252,6 @@
* independent service.
*
* @param axisService The AxisService which is to be serialized
- *
* @return OMElement The serialized format for the service in the services.xml file
*/
private static OMElement createServicesXMLInfoset(AxisService axisService) {
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceGroupMetaData.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceGroupMetaData.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceGroupMetaData.java Thu Jan 3 06:46:50 2008
@@ -65,16 +65,17 @@
this.serviceContextPath = serviceContextPath;
}
- public String[] getServiceTypes() {
- return serviceTypes;
- }
+ public String[] getServiceTypes() {
+ return serviceTypes;
+ }
- public void setServiceTypes(String[] serviceTypes) {
- this.serviceTypes = serviceTypes;
- }
+ public void setServiceTypes(String[] serviceTypes) {
+ this.serviceTypes = serviceTypes;
+ }
/**
* Check if MTOM is available at this point
+ *
* @return boolean
*/
public String getEnableMTOM() {
@@ -83,6 +84,7 @@
/**
* Set MTOM status
+ *
* @param enableMTOM
*/
public void setEnableMTOM(String enableMTOM) {
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceMetaData.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceMetaData.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceMetaData.java Thu Jan 3 06:46:50 2008
@@ -177,6 +177,7 @@
/**
* enable MTOM
+ *
* @return boolean
*/
public String getEnableMTOM() {
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/TrustedServiceData.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/TrustedServiceData.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/TrustedServiceData.java Thu Jan 3 06:46:50 2008
@@ -23,11 +23,12 @@
private String serviceAddress;
private String certAlias;
-
+
/**
* Create a new data instance with the service address and cert alias
+ *
* @param serviceAddress Address of the trusted service
- * @param certAlias Alias of the cert of the service
+ * @param certAlias Alias of the cert of the service
*/
public TrustedServiceData(String serviceAddress, String certAlias) {
this.serviceAddress = serviceAddress;
@@ -41,7 +42,6 @@
public String getCertAlias() {
return certAlias;
}
-
-
-
+
+
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/UtKeystoreSecurityAssignment.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/UtKeystoreSecurityAssignment.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/UtKeystoreSecurityAssignment.java Thu Jan 3 06:46:50 2008
@@ -23,7 +23,7 @@
public class UtKeystoreSecurityAssignment {
private SecurityAssignment ut;
-
+
private ServiceKeyStore[] keystore;
public SecurityAssignment getUt() {
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/MainServlet.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/MainServlet.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/MainServlet.java Thu Jan 3 06:46:50 2008
@@ -26,7 +26,6 @@
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.catalina.LifecycleException;
import org.wso2.adminui.AdminUIServletFilter;
import org.wso2.utils.FileManipulator;
import org.wso2.utils.ServerConfiguration;
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerConstants.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerConstants.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerConstants.java Thu Jan 3 06:46:50 2008
@@ -116,7 +116,7 @@
public static final String GENERATED_PAGES = "local_wso2wsas.generated.pages";
public static final String CONFIGURATION_CONTEXT = "CONFIGURATION_CONTEXT";
public final static String STS_NAME = "wso2wsas-sts";
-
+
public static class Axis2ParameterNames {
public static final String CONTEXT_ROOT = "contextRoot";
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerStatus.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerStatus.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerStatus.java Thu Jan 3 06:46:50 2008
@@ -15,10 +15,10 @@
*/
package org.wso2.wsas;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.ConfigurationContext;
import org.wso2.utils.ServerConfigurator;
import org.wso2.utils.WSO2ConfigurationContextFactory;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.AxisFault;
/**
* The status in which this WSAS instance can currently be in
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/TomcatRepositoryListener.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/TomcatRepositoryListener.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/TomcatRepositoryListener.java Thu Jan 3 06:46:50 2008
@@ -26,7 +26,11 @@
import java.io.File;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
/**
*
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/TomcatServer.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/TomcatServer.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/TomcatServer.java Thu Jan 3 06:46:50 2008
@@ -76,7 +76,7 @@
Context samplesContext = embedded.createContext("/samples", samples.getAbsolutePath());
defaultHost.addChild(samplesContext);
}
-
+
defaultHost.setDeployOnStartup(true);
defaultHost.setAutoDeploy(true);
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/TomcatServerCache.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/TomcatServerCache.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/TomcatServerCache.java Thu Jan 3 06:46:50 2008
@@ -56,7 +56,7 @@
connectors.remove(connector);
}
- public static void removeAllConnectors(){
+ public static void removeAllConnectors() {
connectors.clear();
}
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java Thu Jan 3 06:46:50 2008
@@ -152,7 +152,7 @@
if (eventType == AxisEvent.SERVICE_START) {
ServiceDO service = persistenceMgr.getService(serviceName,
- ServiceIdentifierDO.EMPTY_SERVICE_VERSION);
+ ServiceIdentifierDO.EMPTY_SERVICE_VERSION);
service.setIsActive(true);
persistenceMgr.updateEntity(service);
} else if (eventType == AxisEvent.SERVICE_STOP) {
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/feed/FeedListener.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/feed/FeedListener.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/feed/FeedListener.java Thu Jan 3 06:46:50 2008
@@ -18,7 +18,12 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisServiceGroup;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.ParameterInclude;
+import org.apache.axis2.description.ParameterIncludeImpl;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisEvent;
import org.apache.axis2.engine.AxisObserver;
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/AbstractInstaller.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/AbstractInstaller.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/AbstractInstaller.java Thu Jan 3 06:46:50 2008
@@ -16,8 +16,8 @@
package org.wso2.wsas.installer;
-import org.wso2.wsas.transport.ServerPropertyKeys;
import org.wso2.utils.ArchiveManipulator;
+import org.wso2.wsas.transport.ServerPropertyKeys;
import java.io.BufferedWriter;
import java.io.File;
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/EclipseWtpPluginInstalltionMode.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/EclipseWtpPluginInstalltionMode.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/EclipseWtpPluginInstalltionMode.java Thu Jan 3 06:46:50 2008
@@ -111,7 +111,6 @@
* Validates the given Eclipse installation for its WTP Plugins(JST,WST) existance
*
* @param wtpPluginDir : Eclipse WTP Installation Directory
- *
* @return : result of the basic validation of the WTP Plugins
*/
private static boolean validateEclipseWTPInstallation(File wtpPluginDir) {
@@ -127,7 +126,6 @@
*
* @param wsasHome The WSO2 WSAS home directory
* @param destination The directory to which the files need to be copied
- *
* @throws IOException If file copying fails
*/
private static void installWSASEclipsePlugins(String wsasHome,
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/GenericInstaller.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/GenericInstaller.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/GenericInstaller.java Thu Jan 3 06:46:50 2008
@@ -80,7 +80,7 @@
// Re-archive the wso2wsas.war and copy it to the webapps dir
createWebArchive();
-
+
try {
System.out.println("Copying \"wso2wsas.war\" to \"" + webappDir.getAbsolutePath() + "\"");
File warFile = new File(webappDir.getAbsolutePath() + File.separator + "wso2wsas.war");
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/GeronimoInstaller.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/GeronimoInstaller.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/GeronimoInstaller.java Thu Jan 3 06:46:50 2008
@@ -23,12 +23,21 @@
import org.jaxen.SimpleNamespaceContext;
import org.jaxen.XPath;
import org.wso2.utils.InputReader;
-import org.wso2.wsas.serverinfo.GeronimoServerInfo;
import org.wso2.wsas.serverinfo.GenericServerInfo;
+import org.wso2.wsas.serverinfo.GeronimoServerInfo;
import org.wso2.wsas.transport.ServerPropertyKeys;
-import javax.xml.stream.*;
-import java.io.*;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.util.Properties;
/**
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/InstallationManager.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/InstallationManager.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/InstallationManager.java Thu Jan 3 06:46:50 2008
@@ -48,9 +48,9 @@
public InstallationManager() {
String osName = System.getProperty("os.name");
if (osName.toLowerCase().indexOf("win") != -1) {
- INSTALLATION_MODES =
- new InstallationMode[]{eclipsePluginInstMode, scInstMode,
- ntServiceInstMode, ntServiceUninstMode};
+ INSTALLATION_MODES =
+ new InstallationMode[]{eclipsePluginInstMode, scInstMode,
+ ntServiceInstMode, ntServiceUninstMode};
} else {
INSTALLATION_MODES =
new InstallationMode[]{eclipsePluginInstMode, scInstMode};
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/InstallationMode.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/InstallationMode.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/InstallationMode.java Thu Jan 3 06:46:50 2008
@@ -17,7 +17,7 @@
/**
* This interface specifies the installation mode for WSAS.
- *
+ * <p/>
* e.g. some installation modes are; <br/>
* <ol>
* <li>Servlet Container Installation</li>
@@ -30,13 +30,13 @@
/**
* Carry out the installation
*
- * @throws InstallationException If something goes wrong during the installation
+ * @throws InstallationException If something goes wrong during the installation
*/
void doInstallation() throws InstallationException;
/**
* Get the description for this installation mode
- *
+ *
* @return The description for this installation mode
*/
String getDescription();
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/InstallerConstants.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/InstallerConstants.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/InstallerConstants.java Thu Jan 3 06:46:50 2008
@@ -32,16 +32,16 @@
public static final String WSO2WSAS_PROPERTIES = "wso2wsas.properties";
public static final String WSO2WSAS_WAR = TMP_DIR + File.separator + "wso2wsas.war";
-
-
+
+
// Axis2 Eclipse WTP Plugins
- public static final String AXIS2_CORE = "org.eclipse.jst.ws.axis2.core";
+ public static final String AXIS2_CORE = "org.eclipse.jst.ws.axis2.core";
public static final String AXIS2_UI = "org.eclipse.jst.ws.axis2.ui";
public static final String AXIS2_CREATION_CORE = "org.eclipse.jst.ws.axis2..creation.core";
public static final String AXIS2_CREATION_UI = "org.eclipse.jst.ws.axis2..creation.ui";
public static final String AXIS2_CONSUMPRION_CORE = "org.eclipse.jst.ws.axis2..consumption.core";
public static final String AXIS2_CONSUMPRION_UI = "org.eclipse.jst.ws.axis2..consumption.ui";
-
+
private InstallerConstants() {
}
}
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/JBossInstaller.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/JBossInstaller.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/JBossInstaller.java Thu Jan 3 06:46:50 2008
@@ -23,12 +23,16 @@
import org.apache.axiom.om.impl.llom.factory.OMXMLBuilderFactory;
import org.wso2.utils.FileManipulator;
import org.wso2.utils.InputReader;
-import org.wso2.wsas.serverinfo.JBossServerInfo;
import org.wso2.wsas.serverinfo.GenericServerInfo;
+import org.wso2.wsas.serverinfo.JBossServerInfo;
import org.wso2.wsas.transport.ServerPropertyKeys;
import javax.xml.namespace.QName;
-import javax.xml.stream.*;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/ServletContainerInstallationMode.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/ServletContainerInstallationMode.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/ServletContainerInstallationMode.java Thu Jan 3 06:46:50 2008
@@ -15,9 +15,9 @@
*/
package org.wso2.wsas.installer;
-import org.wso2.utils.ArchiveManipulator;
-import org.wso2.utils.AntBuildInvoker;
import org.wso2.utils.AntBuildException;
+import org.wso2.utils.AntBuildInvoker;
+import org.wso2.utils.ArchiveManipulator;
import org.wso2.utils.InputReader;
import java.io.File;
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/TomcatInstaller.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/TomcatInstaller.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/installer/TomcatInstaller.java Thu Jan 3 06:46:50 2008
@@ -24,12 +24,12 @@
import org.apache.axiom.om.xpath.AXIOMXPath;
import org.jaxen.SimpleNamespaceContext;
import org.jaxen.XPath;
+import org.wso2.utils.ArchiveManipulator;
import org.wso2.utils.FileManipulator;
import org.wso2.utils.InputReader;
-import org.wso2.utils.ArchiveManipulator;
+import org.wso2.wsas.serverinfo.GenericServerInfo;
import org.wso2.wsas.serverinfo.Tomcat41xServerInfo;
import org.wso2.wsas.serverinfo.Tomcat5xServerInfo;
-import org.wso2.wsas.serverinfo.GenericServerInfo;
import org.wso2.wsas.serverinfo.Tomcat6xServerInfo;
import org.wso2.wsas.transport.ServerPropertyKeys;
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java Thu Jan 3 06:46:50 2008
@@ -776,9 +776,7 @@
* Extract all the service policies from the AxisService.
*
* @param service
- *
* @return policies
- *
* @throws XMLStreamException
*/
private ServicePolicyDO[] getServicePolicies(AxisService service) throws XMLStreamException {
@@ -799,9 +797,7 @@
* Extract all the service policies from the AxisService.
*
* @param axisModule
- *
* @return module policies
- *
* @throws XMLStreamException
*/
private ModulePolicyDO[] getModulePolicies(AxisModule axisModule) throws XMLStreamException {
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/EJBAppServerDAO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/EJBAppServerDAO.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/EJBAppServerDAO.java Thu Jan 3 06:46:50 2008
@@ -33,38 +33,37 @@
public class EJBAppServerDAO extends BaseDAO {
private static final Log log = LogFactory.getLog(EJBAppServerDAO.class);
-
+
public EJBAppServerDAO(HibernateConfig hbConfig) {
super(hbConfig);
}
- public void saveEJBAppServer(EJBAppServerDO ejbAppServerDO,boolean isUpdate){
- Session session = hbConfig.currentSession();
- Transaction tx = session.beginTransaction();
- try {
- if(isUpdate){
- session.update(ejbAppServerDO);
- }else{
- session.save(ejbAppServerDO);
- }
- tx.commit();
- } catch (Throwable e) {
- tx.rollback();
- String msg = "Unable to save EJB Application Server";
- log.error(msg, e);
- throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ public void saveEJBAppServer(EJBAppServerDO ejbAppServerDO, boolean isUpdate) {
+ Session session = hbConfig.currentSession();
+ Transaction tx = session.beginTransaction();
+ try {
+ if (isUpdate) {
+ session.update(ejbAppServerDO);
+ } else {
+ session.save(ejbAppServerDO);
+ }
+ tx.commit();
+ } catch (Throwable e) {
+ tx.rollback();
+ String msg = "Unable to save EJB Application Server";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
+ } finally {
+ hbConfig.closeSession();
+ }
}
- public EJBAppServerDO[] getEJBAppServers() {
+ public EJBAppServerDO[] getEJBAppServers() {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
EJBAppServerDO[] ejbAppServers = new EJBAppServerDO[0];
- try
- {
- Criteria ejbProviderCriteria = session.createCriteria(EJBAppServerDO.class);
+ try {
+ Criteria ejbProviderCriteria = session.createCriteria(EJBAppServerDO.class);
List list = ejbProviderCriteria.list();
ejbAppServers = (EJBAppServerDO[]) list.toArray(new EJBAppServerDO[list.size()]);
session.flush();
@@ -108,28 +107,28 @@
public EJBAppServerDO getEJBAppServer(String jnpProviderUrl) {
- Session session = hbConfig.currentSession();
- Transaction tx = session.beginTransaction();
- EJBAppServerDO ejbAppServerDO = null;
- try {
- Criteria ejbCriteria = session.createCriteria(EJBAppServerDO.class);
- ejbCriteria.add(Expression.eq("providerURL", jnpProviderUrl));
-
- ejbAppServerDO = (EJBAppServerDO) ejbCriteria.uniqueResult();
- if (ejbAppServerDO == null) {
- tx.rollback();
- return null;
- }
- tx.commit();
- } catch (Throwable e) {
- tx.rollback();
- String msg = "Unable to retrieve EJB Configuration";
- log.error(msg, e);
- throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
- return ejbAppServerDO;
+ Session session = hbConfig.currentSession();
+ Transaction tx = session.beginTransaction();
+ EJBAppServerDO ejbAppServerDO = null;
+ try {
+ Criteria ejbCriteria = session.createCriteria(EJBAppServerDO.class);
+ ejbCriteria.add(Expression.eq("providerURL", jnpProviderUrl));
+
+ ejbAppServerDO = (EJBAppServerDO) ejbCriteria.uniqueResult();
+ if (ejbAppServerDO == null) {
+ tx.rollback();
+ return null;
+ }
+ tx.commit();
+ } catch (Throwable e) {
+ tx.rollback();
+ String msg = "Unable to retrieve EJB Configuration";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
+ } finally {
+ hbConfig.closeSession();
+ }
+ return ejbAppServerDO;
}
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/EJBConfigurationDAO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/EJBConfigurationDAO.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/EJBConfigurationDAO.java Thu Jan 3 06:46:50 2008
@@ -123,15 +123,15 @@
} catch (Throwable e) {
tx.rollback();
String msg;
- if(e instanceof org.hibernate.NonUniqueResultException){
- msg = "More than one EJB Configuration found";
+ if (e instanceof org.hibernate.NonUniqueResultException) {
+ msg = "More than one EJB Configuration found";
log.error(msg, e);
throw new RuntimeException(msg, e);
- }else{
+ } else {
msg = "Unable to retrieve EJB Configuration";
log.error(msg, e);
throw new RuntimeException(msg, e);
- }
+ }
} finally {
hbConfig.closeSession();
}
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/KeyStoreDAO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/KeyStoreDAO.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/KeyStoreDAO.java Thu Jan 3 06:46:50 2008
@@ -16,12 +16,12 @@
package org.wso2.wsas.persistence.dao;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.wso2.wsas.persistence.dataobject.KeyStoreDO;
import org.wso2.wsas.util.HibernateConfig;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.util.List;
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/LoggerDAO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/LoggerDAO.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/LoggerDAO.java Thu Jan 3 06:46:50 2008
@@ -16,12 +16,12 @@
package org.wso2.wsas.persistence.dao;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.wso2.wsas.persistence.dataobject.LoggerDO;
import org.wso2.wsas.util.HibernateConfig;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/MessageDAO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/MessageDAO.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/MessageDAO.java Thu Jan 3 06:46:50 2008
@@ -16,14 +16,14 @@
package org.wso2.wsas.persistence.dao;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.wso2.wsas.persistence.dataobject.MessageDO;
import org.wso2.wsas.persistence.dataobject.OperationDO;
import org.wso2.wsas.persistence.dataobject.ServiceDO;
import org.wso2.wsas.util.HibernateConfig;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.util.List;
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ModuleDAO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ModuleDAO.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ModuleDAO.java Thu Jan 3 06:46:50 2008
@@ -78,7 +78,7 @@
Set engagedServiceGroups = moduleDO.getEngagedServiceGroups();
for (Iterator iterator = engagedServiceGroups.iterator(); iterator.hasNext();) {
- ServiceGroupDO sg = (ServiceGroupDO)iterator.next();
+ ServiceGroupDO sg = (ServiceGroupDO) iterator.next();
sg.getEngagedModules().remove(moduleDO);
session.saveOrUpdate(sg);
}
@@ -86,12 +86,12 @@
Set engagedServices = moduleDO.getEngagedServices();
for (Iterator iterator = engagedServices.iterator(); iterator.hasNext();) {
- ServiceDO service = (ServiceDO) iterator.next();
+ ServiceDO service = (ServiceDO) iterator.next();
service.getEngagedModules().remove(moduleDO);
session.saveOrUpdate(service);
}
engagedServices.clear();
-
+
session.delete(moduleDO);
tx.commit();
} catch (Throwable e) {
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/OperationDAO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/OperationDAO.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/OperationDAO.java Thu Jan 3 06:46:50 2008
@@ -16,12 +16,16 @@
package org.wso2.wsas.persistence.dao;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.wso2.wsas.persistence.dataobject.*;
+import org.wso2.wsas.persistence.dataobject.ModuleDO;
+import org.wso2.wsas.persistence.dataobject.OperationDO;
+import org.wso2.wsas.persistence.dataobject.OperationParameterDO;
+import org.wso2.wsas.persistence.dataobject.ServiceDO;
+import org.wso2.wsas.persistence.dataobject.ServiceIdentifierDO;
import org.wso2.wsas.util.HibernateConfig;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.util.Date;
import java.util.Iterator;
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/SecurityScenarioDAO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/SecurityScenarioDAO.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/SecurityScenarioDAO.java Thu Jan 3 06:46:50 2008
@@ -16,14 +16,14 @@
package org.wso2.wsas.persistence.dao;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.criterion.Expression;
import org.wso2.wsas.persistence.dataobject.SecurityScenarioDO;
import org.wso2.wsas.util.HibernateConfig;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServerConfigurationDAO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServerConfigurationDAO.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServerConfigurationDAO.java Thu Jan 3 06:46:50 2008
@@ -16,14 +16,14 @@
package org.wso2.wsas.persistence.dao;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.criterion.Expression;
import org.wso2.wsas.persistence.dataobject.ServerConfigurationDO;
import org.wso2.wsas.util.HibernateConfig;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* Data access object managing persistence operations related to WSO2 WSAS
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java Thu Jan 3 06:46:50 2008
@@ -19,16 +19,24 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
-import org.apache.rampart.handler.WSSHandlerConstants;
-import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.rampart.handler.WSSHandlerConstants;
+import org.apache.ws.security.handler.WSHandlerConstants;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.criterion.Expression;
import org.hibernate.criterion.Restrictions;
-import org.wso2.wsas.persistence.dataobject.*;
+import org.wso2.wsas.persistence.dataobject.KeyStoreDO;
+import org.wso2.wsas.persistence.dataobject.ModuleDO;
+import org.wso2.wsas.persistence.dataobject.OperationDO;
+import org.wso2.wsas.persistence.dataobject.ServiceDO;
+import org.wso2.wsas.persistence.dataobject.ServiceIdentifierDO;
+import org.wso2.wsas.persistence.dataobject.ServiceParameterDO;
+import org.wso2.wsas.persistence.dataobject.ServicePolicyDO;
+import org.wso2.wsas.persistence.dataobject.ServiceUserDO;
+import org.wso2.wsas.persistence.dataobject.ServiceUserRoleDO;
import org.wso2.wsas.persistence.exception.ServicePolicyNotFoundException;
import org.wso2.wsas.util.HibernateConfig;
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceGroupDAO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceGroupDAO.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceGroupDAO.java Thu Jan 3 06:46:50 2008
@@ -16,17 +16,17 @@
package org.wso2.wsas.persistence.dao;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.criterion.Expression;
+import org.wso2.wsas.persistence.dataobject.ServiceDO;
import org.wso2.wsas.persistence.dataobject.ServiceGroupDO;
import org.wso2.wsas.persistence.dataobject.ServiceGroupParameterDO;
-import org.wso2.wsas.persistence.dataobject.ServiceDO;
import org.wso2.wsas.persistence.exception.ServiceGroupNotFoundException;
import org.wso2.wsas.util.HibernateConfig;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.util.Date;
import java.util.Set;
@@ -141,7 +141,7 @@
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
ServiceGroupDO serviceGroupDO = getServiceGroup(serviceGroupName, session);
- if(serviceGroupDO == null){
+ if (serviceGroupDO == null) {
String msg = "Service group " + serviceGroupName + " not found";
log.error(msg);
throw new ServiceGroupNotFoundException(msg);
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/TransportDAO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/TransportDAO.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/TransportDAO.java Thu Jan 3 06:46:50 2008
@@ -16,14 +16,14 @@
package org.wso2.wsas.persistence.dao;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.criterion.Expression;
import org.wso2.wsas.persistence.dataobject.TransportDO;
import org.wso2.wsas.util.HibernateConfig;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.util.List;
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserDAO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserDAO.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserDAO.java Thu Jan 3 06:46:50 2008
@@ -16,6 +16,8 @@
package org.wso2.wsas.persistence.dao;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.Transaction;
@@ -24,8 +26,6 @@
import org.wso2.wsas.persistence.dataobject.ServiceUserDO;
import org.wso2.wsas.persistence.dataobject.ServiceUserRoleDO;
import org.wso2.wsas.util.HibernateConfig;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.util.Iterator;
import java.util.List;
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/AbstractDataObject.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/AbstractDataObject.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/AbstractDataObject.java Thu Jan 3 06:46:50 2008
@@ -46,7 +46,7 @@
this.lastUpdatedTime = lastUpdatedTime;
}
- public void notifyObservers(){
+ public void notifyObservers() {
setChanged();
super.notifyObservers();
}
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/EJBAppServerDO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/EJBAppServerDO.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/EJBAppServerDO.java Thu Jan 3 06:46:50 2008
@@ -21,86 +21,109 @@
*/
public class EJBAppServerDO extends AbstractDataObject {
- String providerURL;
- String jndiContextClass;
- String userName;
- String password;
- String appServerType;
-
- public String getAppServerType() {
- return appServerType;
- }
- public void setAppServerType(String appServerType) {
- this.appServerType = appServerType;
- }
- public String getJndiContextClass() {
- return jndiContextClass;
- }
- public void setJndiContextClass(String jndiContextClass) {
- this.jndiContextClass = jndiContextClass;
- }
- public String getPassword() {
- return password;
- }
- public void setPassword(String password) {
- this.password = password;
- }
- public String getProviderURL() {
- return providerURL;
- }
- public void setProviderURL(String providerURL) {
- this.providerURL = providerURL;
- }
- public String getUserName() {
- return userName;
- }
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public int hashCode() {
- final int PRIME = 31;
- int result = 1;
- result = PRIME * result + ((appServerType == null) ? 0 : appServerType.hashCode());
- result = PRIME * result + ((jndiContextClass == null) ? 0 : jndiContextClass.hashCode());
- result = PRIME * result + ((password == null) ? 0 : password.hashCode());
- result = PRIME * result + ((providerURL == null) ? 0 : providerURL.hashCode());
- result = PRIME * result + ((userName == null) ? 0 : userName.hashCode());
- return result;
- }
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- final EJBAppServerDO other = (EJBAppServerDO) obj;
- if (appServerType == null) {
- if (other.appServerType != null)
- return false;
- } else if (!appServerType.equals(other.appServerType))
- return false;
- if (jndiContextClass == null) {
- if (other.jndiContextClass != null)
- return false;
- } else if (!jndiContextClass.equals(other.jndiContextClass))
- return false;
- if (password == null) {
- if (other.password != null)
- return false;
- } else if (!password.equals(other.password))
- return false;
- if (providerURL == null) {
- if (other.providerURL != null)
- return false;
- } else if (!providerURL.equals(other.providerURL))
- return false;
- if (userName == null) {
- if (other.userName != null)
- return false;
- } else if (!userName.equals(other.userName))
- return false;
- return true;
- }
+ String providerURL;
+ String jndiContextClass;
+ String userName;
+ String password;
+ String appServerType;
+
+ public String getAppServerType() {
+ return appServerType;
+ }
+
+ public void setAppServerType(String appServerType) {
+ this.appServerType = appServerType;
+ }
+
+ public String getJndiContextClass() {
+ return jndiContextClass;
+ }
+
+ public void setJndiContextClass(String jndiContextClass) {
+ this.jndiContextClass = jndiContextClass;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getProviderURL() {
+ return providerURL;
+ }
+
+ public void setProviderURL(String providerURL) {
+ this.providerURL = providerURL;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public int hashCode() {
+ final int PRIME = 31;
+ int result = 1;
+ result = PRIME * result + ((appServerType == null) ? 0 : appServerType.hashCode());
+ result = PRIME * result + ((jndiContextClass == null) ? 0 : jndiContextClass.hashCode());
+ result = PRIME * result + ((password == null) ? 0 : password.hashCode());
+ result = PRIME * result + ((providerURL == null) ? 0 : providerURL.hashCode());
+ result = PRIME * result + ((userName == null) ? 0 : userName.hashCode());
+ return result;
+ }
+
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final EJBAppServerDO other = (EJBAppServerDO) obj;
+ if (appServerType == null) {
+ if (other.appServerType != null) {
+ return false;
+ }
+ } else if (!appServerType.equals(other.appServerType)) {
+ return false;
+ }
+ if (jndiContextClass == null) {
+ if (other.jndiContextClass != null) {
+ return false;
+ }
+ } else if (!jndiContextClass.equals(other.jndiContextClass)) {
+ return false;
+ }
+ if (password == null) {
+ if (other.password != null) {
+ return false;
+ }
+ } else if (!password.equals(other.password)) {
+ return false;
+ }
+ if (providerURL == null) {
+ if (other.providerURL != null) {
+ return false;
+ }
+ } else if (!providerURL.equals(other.providerURL)) {
+ return false;
+ }
+ if (userName == null) {
+ if (other.userName != null) {
+ return false;
+ }
+ } else if (!userName.equals(other.userName)) {
+ return false;
+ }
+ return true;
+ }
}
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/SecurityTokenDO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/SecurityTokenDO.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/SecurityTokenDO.java Thu Jan 3 06:46:50 2008
@@ -27,7 +27,11 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import java.io.ByteArrayInputStream;
-import java.util.*;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Set;
/**
*
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java Thu Jan 3 06:46:50 2008
@@ -219,12 +219,13 @@
/**
* Retrun the ServiceParameterDO to the given para name
+ *
* @param paramName
* @return ServiceParameterDO
*/
public ServiceParameterDO getParameter(String paramName) {
for (Iterator iterator = parameters.iterator(); iterator.hasNext();) {
- ServiceParameterDO serviceGroupParameterDO = (ServiceParameterDO)iterator.next();
+ ServiceParameterDO serviceGroupParameterDO = (ServiceParameterDO) iterator.next();
if (serviceGroupParameterDO.getName().equals(paramName)) {
return serviceGroupParameterDO;
}
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/exception/EJBAppServerAlreadyExistsException.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/exception/EJBAppServerAlreadyExistsException.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/exception/EJBAppServerAlreadyExistsException.java Thu Jan 3 06:46:50 2008
@@ -18,9 +18,9 @@
public class EJBAppServerAlreadyExistsException extends Exception {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public EJBAppServerAlreadyExistsException() {
+ public EJBAppServerAlreadyExistsException() {
super();
}
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/exception/EJBAppServerNotFoundException.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/exception/EJBAppServerNotFoundException.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/exception/EJBAppServerNotFoundException.java Thu Jan 3 06:46:50 2008
@@ -17,7 +17,7 @@
package org.wso2.wsas.persistence.exception;
public class EJBAppServerNotFoundException extends Exception {
-
+
private static final long serialVersionUID = 493602186285871890L;
public EJBAppServerNotFoundException() {
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/exception/TransportAlreadyExistsException.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/exception/TransportAlreadyExistsException.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/exception/TransportAlreadyExistsException.java Thu Jan 3 06:46:50 2008
@@ -20,7 +20,7 @@
*
*/
public class TransportAlreadyExistsException extends Exception {
-
+
private static final long serialVersionUID = 1334086767200536143L;
public TransportAlreadyExistsException() {
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/security/ServerCrypto.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/security/ServerCrypto.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/security/ServerCrypto.java Thu Jan 3 06:46:50 2008
@@ -16,6 +16,29 @@
package org.wso2.wsas.security;
+import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMElement;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.engine.ListenerManager;
+import org.apache.commons.discovery.Resource;
+import org.apache.commons.discovery.ResourceIterator;
+import org.apache.commons.discovery.jdk.JDKHooks;
+import org.apache.commons.discovery.resource.DiscoverResources;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.components.crypto.CredentialException;
+import org.apache.ws.security.components.crypto.Crypto;
+import org.apache.ws.security.components.crypto.X509NameTokenizer;
+import org.wso2.utils.ServerConfiguration;
+import org.wso2.utils.ServerException;
+import org.wso2.utils.security.CryptoException;
+import org.wso2.utils.security.CryptoUtil;
+import org.wso2.wsas.persistence.PersistenceManager;
+import org.wso2.wsas.persistence.dataobject.KeyStoreDO;
+
+import javax.xml.namespace.QName;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -50,30 +73,6 @@
import java.util.Properties;
import java.util.Vector;
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMElement;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.ListenerManager;
-import org.apache.commons.discovery.Resource;
-import org.apache.commons.discovery.ResourceIterator;
-import org.apache.commons.discovery.jdk.JDKHooks;
-import org.apache.commons.discovery.resource.DiscoverResources;
-import org.apache.commons.logging.Log;
-