[wsas-java-dev] svn commit r4073 - in trunk/wsas/java/modules/core: conf/hibernate src/org/wso2/wsas/persistence src/org/wso2/wsas/persistence/dataobject

[svn at wso2.org]

Author: suran
Date: Tue Jun 19 22:33:01 2007
New Revision: 4073

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:
Added changes to facilitate the persisting of Service & Operation descriptions(documentation).

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	Tue Jun 19 22:33:01 2007
@@ -379,7 +379,8 @@
             <property name="serviceId" column="c_service_id" not-null="true"/>
             <property name="version" column="c_version" not-null="true"/>
         </component>
-
+		
+		<property name="description" column="c_description" />
         <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"/>
@@ -473,6 +474,8 @@
         <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" />
+		
         <many-to-one name="service" column="c_service_id" not-null="true"/>
         <set name="messages" inverse="true" cascade="all-delete-orphan">
             <key column="c_operation_id"/>

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	Tue Jun 19 22:33:01 2007
@@ -534,6 +534,8 @@
         serviceDO.setServiceIdentifierDO(serviceIdentifier);
         serviceIdentifier.setServiceId(axisService.getName());
         serviceIdentifier.setVersion(ServiceIdentifierDO.EMPTY_SERVICE_VERSION);
+        
+        serviceDO.setDescription(axisService.getDocumentation());
 
         // Add the Service Policies
         ServicePolicyDO[] servicePolicies = getServicePolicies(axisService);
@@ -546,6 +548,7 @@
             AxisOperation axisOperation = (AxisOperation) iter.next();
             OperationDO op = new OperationDO();
             op.setName(axisOperation.getName().getLocalPart());
+            op.setDescription(axisOperation.getDocumentation());
             serviceDO.addOperation(op);
         }
 
@@ -827,7 +830,9 @@
                     axisService.addParameter(parameter);
                 }
             }
-
+            //add description
+            axisService.setDocumentation(serviceDO.getDescription());
+            
             // Engage modules to service
             for (Iterator iter = serviceDO.getEngagedModules().iterator(); iter.hasNext();) {
                 ModuleDO moduleDO = (ModuleDO) iter.next();
@@ -858,7 +863,9 @@
                         axisOp.engageModule(axisModule);
                     }
                 }
-
+                //set operation description
+                axisOp.setDocumentation(opDO.getDescription());
+                
                 // Handle operation parameters
                 for (Iterator opIter = opDO.getParameters().iterator(); opIter.hasNext();) {
                     OperationParameterDO opParamDO = (OperationParameterDO) opIter.next();

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	Tue Jun 19 22:33:01 2007
@@ -24,6 +24,7 @@
 public class OperationDO extends AbstractDataObject {
     private ServiceDO service;
     private String name;
+    private String description;
     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
@@ -108,4 +109,12 @@
             return name.hashCode();
         }
     }
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
 }

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	Tue Jun 19 22:33:01 2007
@@ -25,6 +25,7 @@
 public class ServiceDO extends AbstractDataObject {
 
     private boolean isUTAuthEnabled;  // Username Token Authentication Enabled
+    private String description;
     private boolean isActive;  // Is service active
     private boolean isExposedOnAllTransports;  // Is service exposed on all available transports
     private ServiceIdentifierDO serviceIdentifierDO;
@@ -470,4 +471,12 @@
         }
         return false;
     }
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
 }