[wsas-java-dev] svn commit r4624 - in trunk/wsas/java/modules/core:
conf/hibernate src/org/wso2/wsas/persistence
src/org/wso2/wsas/persistence/dataobject
svn at wso2.org
svn at wso2.org
Mon Jul 2 00:02:47 PDT 2007
Author: saminda
Date: Mon Jul 2 00:02:01 2007
New Revision: 4624
Modified:
trunk/wsas/java/modules/core/conf/hibernate/wso2wsas.hbm.xml
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/OperationDO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java
Log:
Fixed Axis1 deployer related problems
Modified: trunk/wsas/java/modules/core/conf/hibernate/wso2wsas.hbm.xml
==============================================================================
--- trunk/wsas/java/modules/core/conf/hibernate/wso2wsas.hbm.xml (original)
+++ trunk/wsas/java/modules/core/conf/hibernate/wso2wsas.hbm.xml Mon Jul 2 00:02:01 2007
@@ -380,7 +380,7 @@
<property name="version" column="c_version" not-null="true"/>
</component>
- <property name="description" column="c_description" type="text" length="1000000"/>
+ <property name="documentation" column="c_documentation" type="text" length="1000000"/>
<property name="isUTAuthEnabled" column="c_is_ut_auth_enabled" not-null="true"/>
<property name="isExposedOnAllTransports" column="c_expose_on_all_transp" not-null="true"/>
<property name="isActive" column="c_is_active" not-null="true"/>
@@ -474,7 +474,7 @@
<property name="lastUpdatedTime" type="timestamp" column="c_last_updated" not-null="true"/>
<property name="name" column="c_name" not-null="true"/>
- <property name="description" column="c_description" type="text" length="1000000"/>
+ <property name="documentation" column="c_documentation" type="text" length="1000000"/>
<many-to-one name="service" column="c_service_id" not-null="true"/>
<set name="messages" inverse="true" cascade="all-delete-orphan">
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 Mon Jul 2 00:02:01 2007
@@ -539,7 +539,7 @@
serviceIdentifier.setServiceId(axisService.getName());
serviceIdentifier.setVersion(ServiceIdentifierDO.EMPTY_SERVICE_VERSION);
- serviceDO.setDescription(axisService.getDocumentation());
+ serviceDO.setDocumentation(axisService.getDocumentation());
// Add the Service Policies
ServicePolicyDO[] servicePolicies = getServicePolicies(axisService);
@@ -552,7 +552,7 @@
AxisOperation axisOperation = (AxisOperation) iter.next();
OperationDO op = new OperationDO();
op.setName(axisOperation.getName().getLocalPart());
- op.setDescription(axisOperation.getDocumentation());
+ op.setDocumentation(axisOperation.getDocumentation());
serviceDO.addOperation(op);
}
@@ -834,8 +834,12 @@
axisService.addParameter(parameter);
}
}
+
//add description
- axisService.setDocumentation(serviceDO.getDescription());
+ String doc = serviceDO.getDocumentation();
+ if (doc != null) {
+ axisService.setDocumentation(doc);
+ }
// Engage modules to service
for (Iterator iter = serviceDO.getEngagedModules().iterator(); iter.hasNext();) {
@@ -867,8 +871,12 @@
axisOp.engageModule(axisModule);
}
}
+
//set operation description
- axisOp.setDocumentation(opDO.getDescription());
+ String documentation = opDO.getDocumentation();
+ if (documentation != null) {
+ axisOp.setDocumentation(documentation);
+ }
// Handle operation parameters
for (Iterator opIter = opDO.getParameters().iterator(); opIter.hasNext();) {
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/OperationDO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/OperationDO.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/OperationDO.java Mon Jul 2 00:02:01 2007
@@ -24,7 +24,7 @@
public class OperationDO extends AbstractDataObject {
private ServiceDO service;
private String name;
- private String description;
+ private String documentation;
private Set engagedModules = new HashSet(); // many-many relationship between operations & modules (Operation-Module Engagement)
private Set parameters = new HashSet(); // one-many relationship between Operations and OperationParameters
private Set messages = new HashSet(); // one-many relationship between Operations and Messages
@@ -110,11 +110,11 @@
}
}
- public String getDescription() {
- return description;
+ public String getDocumentation() {
+ return documentation;
}
- public void setDescription(String description) {
- this.description = description;
+ public void setDocumentation(String documentation) {
+ this.documentation = documentation;
}
}
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 Mon Jul 2 00:02:01 2007
@@ -19,15 +19,13 @@
import java.util.Iterator;
import java.util.Set;
-import org.apache.axis2.description.AxisOperation;
-
/**
* Data object representing a service in WSO2 WSAS
*/
public class ServiceDO extends AbstractDataObject {
private boolean isUTAuthEnabled; // Username Token Authentication Enabled
- private String description;
+ private String documentation;
private boolean isActive; // Is service active
private boolean isExposedOnAllTransports; // Is service exposed on all available transports
private ServiceIdentifierDO serviceIdentifierDO;
@@ -174,7 +172,7 @@
* Method to get a single operationDO by specifying name.
*
* @param operationName
- * @return
+ * @return OperationDO[] array
*/
public OperationDO[] getOperation(String operationName) {
@@ -492,11 +490,11 @@
return false;
}
- public String getDescription() {
- return description;
+ public String getDocumentation() {
+ return documentation;
}
- public void setDescription(String description) {
- this.description = description;
+ public void setDocumentation(String documentation) {
+ this.documentation = documentation;
}
}
More information about the Wsas-java-dev
mailing list