[wsas-java-dev] svn commit r1120 - in
branches/wsas/java/standalone-tomcat/java/modules:
admin/src/org/wso2/wsas/admin/service core/conf/hibernate
core/src/org/wso2/wsas/persistence/dataobject
svn at wso2.org
svn at wso2.org
Fri Mar 2 23:34:37 PST 2007
Author: azeez
Date: Fri Mar 2 23:34:13 2007
New Revision: 1120
Modified:
branches/wsas/java/standalone-tomcat/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java
branches/wsas/java/standalone-tomcat/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java
branches/wsas/java/standalone-tomcat/java/modules/core/conf/hibernate/wso2wsas.hbm.xml
branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/persistence/dataobject/SecurityScenarioDO.java
Log:
fixing regression issues related to security scenario configuration.
Modified: branches/wsas/java/standalone-tomcat/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java Fri Mar 2 23:34:13 2007
@@ -442,7 +442,7 @@
pm.getModule(ModuleIdUtil.getModuleId(rahasModule),
ModuleIdUtil.getModuleVersion(rahasModule));
if (moduleDO != null && secScenario != null) {
- if (secScenario.getModules().contains(moduleDO)) {
+ if (secScenario.modules.contains(moduleDO)) {
throw new AxisFault("Rahas cannot be disengaged since " + serviceName +
" service is associated with a security scenario which " +
"requires the Rahas module.");
Modified: branches/wsas/java/standalone-tomcat/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java Fri Mar 2 23:34:13 2007
@@ -70,7 +70,9 @@
public static final String ENCRYPTION_USER = "rampart.config.encryption.user";
public static final Log log = LogFactory.getLog(SecurityScenarioConfigAdmin.class);
- private PersistenceManager pm;
+ private PersistenceManager pm =
+ new PersistenceManager(HibernateConfigFactory.
+ getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
private String scenarioDir =
System.getProperty("wso2wsas.home") + File.separator + "conf" +
File.separator + "rampart" + File.separator;
@@ -81,8 +83,6 @@
private static final String SCENARIO_DISABLE_SECURITY = "DisableSecurity";
public SecurityScenarioConfigAdmin() {
- pm = new PersistenceManager(HibernateConfigFactory.
- getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
}
public SecurityScenarioDO[] getScenarios(String serviceName) {
@@ -94,7 +94,7 @@
boolean isServiceScenarioFound = false;
for (int i = 0; i < scenarios.length; i++) {
SecurityScenarioDO scenario = scenarios[i];
- if (scenario.getServices().contains(service)) {
+ if (scenario.services.contains(service)) {
scenario.setIsCurrentScenario(true);
isServiceScenarioFound = true;
break; // a service can have only one current scenario
@@ -361,8 +361,7 @@
serviceVersion));
}
-
- if (serviceVersion.equals("")) {
+ if (serviceVersion == null || serviceVersion.trim().length() == 0) {
serviceVersion = ServiceIdentifierDO.EMPTY_SERVICE_VERSION;
}
@@ -392,7 +391,7 @@
// assign users
for (int i = 0; i < users.length; i++) {
String user = users[i];
- if (!user.equals("")) {
+ if (user != null && user.trim().length() != 0) {
serviceDO.setIsUTAuthEnabled(true);
ServiceUserDO userDO = pm.getUser(user);
serviceDO.addUser(userDO);
@@ -403,7 +402,7 @@
// assign roles
for (int i = 0; i < roles.length; i++) {
String role = roles[i];
- if (!role.equals("")) {
+ if (role != null && role.trim().length() != 0) {
serviceDO.setIsUTAuthEnabled(true);
ServiceUserRoleDO roleDO = pm.getRole(role);
serviceDO.addRole(roleDO);
@@ -425,7 +424,7 @@
String scenarioId) throws AxisFault {
SecurityScenarioDO securityScenario = pm.getSecurityScenario(scenarioId);
AxisService axisService = axisConfig.getService(serviceId);
- for (Iterator modules = securityScenario.getModules().iterator(); modules.hasNext();) {
+ for (Iterator modules = securityScenario.modules.iterator(); modules.hasNext();) {
ModuleDO moduleDO = (ModuleDO) modules.next();
QName moduleQName = new QName(moduleDO.getModuleIdentifierDO().getName());
if (!axisService.isEngaged(moduleQName)) {
@@ -444,7 +443,7 @@
SecurityScenarioDO securityScenario = pm.getSecurityScenario(scenarioId);
AxisService axisService = axisConfig.getService(serviceId);
ModuleAdmin moduleAdmin = new ModuleAdmin(this.configCtx);
- for (Iterator modules = securityScenario.getModules().iterator(); modules.hasNext();) {
+ for (Iterator modules = securityScenario.modules.iterator(); modules.hasNext();) {
ModuleDO moduleDO = (ModuleDO) modules.next();
QName moduleQName = new QName(moduleDO.getModuleIdentifierDO().getName());
if (axisService.isEngaged(moduleQName)) {
@@ -462,7 +461,7 @@
SecurityAssignment assignment = new SecurityAssignment();
- if (serviceVersion.equals("")) {
+ if (serviceVersion == null || serviceVersion.trim().length() == 0) {
serviceVersion = ServiceIdentifierDO.EMPTY_SERVICE_VERSION;
}
ServiceDO serviceDO = pm.getService(serviceId, serviceVersion);
Modified: branches/wsas/java/standalone-tomcat/java/modules/core/conf/hibernate/wso2wsas.hbm.xml
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/core/conf/hibernate/wso2wsas.hbm.xml (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/core/conf/hibernate/wso2wsas.hbm.xml Fri Mar 2 23:34:13 2007
@@ -23,7 +23,7 @@
<one-to-many class="org.wso2.wsas.persistence.dataobject.ServiceDO"/>
</set>
<set name="modules"
- table="sec_scenario_module_t" inverse="false" sort="unsorted" lazy="false">
+ table="sec_scenario_module_t" inverse="false" sort="unsorted" lazy="false">
<key column="c_sec_scenario_id"/>
<many-to-many class="org.wso2.wsas.persistence.dataobject.ModuleDO"
column="c_module_id"/>
@@ -250,7 +250,7 @@
<property name="name" column="c_name" not-null="true"/>
<property name="version" column="c_version" not-null="true"/>
</component>
- <set name="parameters" inverse="true" cascade="all-delete-orphan" lazy="false">
+ <set name="parameters" inverse="true" cascade="all-delete-orphan">
<key column="c_module_id"/>
<one-to-many class="org.wso2.wsas.persistence.dataobject.ModuleParameterDO"/>
</set>
@@ -261,24 +261,24 @@
column="c_sec_scenario_id"/>
</set>
<set name="engagedOperations"
- table="operation_module_engagement_t" inverse="true" lazy="false">
+ table="operation_module_engagement_t" inverse="true">
<key column="c_module_id"/>
<many-to-many class="org.wso2.wsas.persistence.dataobject.OperationDO"
column="c_operation_id"/>
</set>
<set name="engagedServices"
- table="service_module_engagement_t" inverse="true" lazy="false">
+ table="service_module_engagement_t" inverse="true">
<key column="c_module_id"/>
<many-to-many class="org.wso2.wsas.persistence.dataobject.ServiceDO"
column="c_service_id"/>
</set>
<set name="engagedServiceGroups"
- table="service_group_module_engagement_t" inverse="true" lazy="false">
+ table="service_group_module_engagement_t" inverse="true">
<key column="c_module_id"/>
<many-to-many class="org.wso2.wsas.persistence.dataobject.ServiceGroupDO"
column="c_service_group_id"/>
</set>
- <set name="policies" inverse="true" cascade="all-delete-orphan" lazy="false">
+ <set name="policies" inverse="true" cascade="all-delete-orphan">
<key column="c_module_id"/>
<one-to-many class="org.wso2.wsas.persistence.dataobject.ModulePolicyDO"/>
</set>
Modified: branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/persistence/dataobject/SecurityScenarioDO.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/persistence/dataobject/SecurityScenarioDO.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/persistence/dataobject/SecurityScenarioDO.java Fri Mar 2 23:34:13 2007
@@ -22,13 +22,14 @@
*
*/
public class SecurityScenarioDO extends AbstractDataObject {
+ public Set services = new HashSet(); // 1-m relationship between Security Scenarios & Services
+ public Set modules = new HashSet(); // m-n relationship between Sec scenarions & modules
+
private String scenarioId;
private String summary;
private String category;
private String description;
- private Set services = new HashSet(); // 1-m relationship between Security Scenarios & Services
private boolean isCurrentScenario;
- private Set modules = new HashSet(); // m-n relationship between Sec scenarions & modules
/** Constructs a new SecurityScenarioDO. */
public SecurityScenarioDO() {
@@ -100,7 +101,7 @@
* @return Value for property 'services'.
* @see #setServices
*/
- public Set getServices() {
+ Set getServices() {
return services;
}
@@ -114,11 +115,11 @@
this.services = services;
}
- public Set getModules() {
+ Set getModules() {
return modules;
}
- public void setModules(Set modules) {
+ void setModules(Set modules) {
this.modules = modules;
}
More information about the Wsas-java-dev
mailing list