Author: saminda Date: Wed Jun 4 02:49:52 2008 New Revision: 17903 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=17903
Log: Fixes to remove redundant code Modified: branches/wsas/java/2.3/wsas/modules/core/conf/hibernate/wso2wsas.hbm.xml branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/dataobject/MessageDO.java branches/wsas/java/2.3/wsas/pom.xml Modified: branches/wsas/java/2.3/wsas/modules/core/conf/hibernate/wso2wsas.hbm.xml URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/wsas/modules/core/conf/hibernate/wso2wsas.hbm.xml?rev=17903&r1=17902&r2=17903&view=diff ============================================================================== --- branches/wsas/java/2.3/wsas/modules/core/conf/hibernate/wso2wsas.hbm.xml (original) +++ branches/wsas/java/2.3/wsas/modules/core/conf/hibernate/wso2wsas.hbm.xml Wed Jun 4 02:49:52 2008 @@ -165,8 +165,7 @@ <property name="lastUpdatedTime" type="timestamp" column="c_last_updated" not-null="true"/> <property name="type" column="c_msg_type" not-null="true"/> <property name="xml" column="c_xml_string" type="text" not-null="true" length="100000000"/> - <property name="sequence" column="c_sequence_num" not-null="true"/> - <property name="name" column="c_name" not-null="true"/> + <property name="sequence" column="c_sequence_num" not-null="true"/> <many-to-one name="operationDO" column="c_operation_id" not-null="true"/> </class> @@ -603,115 +602,115 @@ <property name="userName" column="c_username" not-null="false"/> <property name="password" column="c_password" not-null="false"/> <property name="appServerType" column="c_app_server_type" not-null="true"/> - </class> - - <!-- ################################################## --> - - <class name="org.wso2.wsas.persistence.dataobject.EndpointDO" - table="endpoint_t"> - <id name="id" column="c_id"> - <generator class="native" /> - </id> - <property name="name" column="c_name" not-null="true"/> - <many-to-one name="service" foreign-key="c_service_id" /> - <one-to-one name="binding" foreign-key='c_binding_id"' /> - </class> - <class name="org.wso2.wsas.persistence.dataobject.BindingDO" - table="binding_t"> - <id name="id" column="c_id"> - <generator class="native" /> - </id> - <property name="name" column="c_name" not-null="true"/> - <many-to-one name="endpoint" column="c_endpoint_id" /> - <set name="bindingOperations" inverse="true" - cascade="all-delete-orphan" lazy="false"> - <key column="c_binding_id" on-delete="cascade" /> - <one-to-many - class="org.wso2.wsas.persistence.dataobject.BindingOperationDO" /> - </set> - <set name="policies" inverse="true" cascade="all-delete-orphan" - lazy="false"> - <key column="c_binding_id" on-delete="cascade" /> - <one-to-many - class="org.wso2.wsas.persistence.dataobject.BindingOperationPolicyDO" /> - </set> - </class> - <class name="org.wso2.wsas.persistence.dataobject.BindingPolicyDO" - table="binding_policy_t"> - <id name="id" column="c_id"> - <generator class="native" /> - </id> - <property name="lastUpdatedTime" type="timestamp" - column="c_last_updated" not-null="true" /> - <property name="uuid" column="c_uuid" not-null="true" /> - <property name="policy" column="c_policy" not-null="true" - type="text" length="1000000" /> - <many-to-one name="binding" column="c_binding_id" - not-null="true" /> - </class> - <class - name="org.wso2.wsas.persistence.dataobject.BindingOperationDO" - table="binding_operation_t"> - <id name="id" column="c_id"> - <generator class="native" /> - </id> - <many-to-one name="binding" column="c_binding_id" /> - <many-to-one name="operation" column="c_operation_id" /> - <set name="bindingMessages" inverse="true" - cascade="all-delete-orphan" lazy="false"> - <key column="c_binding_operation_id" on-delete="cascade" /> - <one-to-many - class="org.wso2.wsas.persistence.dataobject.BindingMessageDO" /> - </set> - <set name="policies" inverse="true" cascade="all-delete-orphan" - lazy="false"> - <key column="c_binding_operation_id" on-delete="cascade" /> - <one-to-many - class="org.wso2.wsas.persistence.dataobject.BindingOperationPolicyDO" /> - </set> - </class> - <class - name="org.wso2.wsas.persistence.dataobject.BindingOperationPolicyDO" - table="binding_operation_policy_t"> - <id name="id" column="c_id"> - <generator class="native" /> - </id> - <property name="lastUpdatedTime" type="timestamp" - column="c_last_updated" not-null="true" /> - <property name="uuid" column="c_uuid" not-null="true" /> - <property name="policy" column="c_policy" not-null="true" - type="text" length="1000000" /> - <many-to-one name="bindingOperation" - column="c_binding_operation_id" not-null="true" /> - </class> - <class name="org.wso2.wsas.persistence.dataobject.BindingMessageDO" - table="binding_message_t"> - <id name="id" column="c_id"> - <generator class="native" /> - </id> - <many-to-one name="bindingOperation" - column="c_binding_operation_id" /> - <many-to-one name="message" column="c_message_id" /> - <set name="policies" inverse="true" cascade="all-delete-orphan" - lazy="false"> - <key column="c_binding_message_id" on-delete="cascade" /> - <one-to-many - class="org.wso2.wsas.persistence.dataobject.BindingMessagePolicyDO" /> - </set> - </class> - <class - name="org.wso2.wsas.persistence.dataobject.BindingMessagePolicyDO" - table="binding_message_policy_t"> - <id name="id" column="c_id"> - <generator class="native" /> - </id> - <property name="lastUpdatedTime" type="timestamp" - column="c_last_updated" not-null="true" /> - - <property name="uuid" column="c_uuid" not-null="true" /> - <property name="policy" column="c_policy" not-null="true" - type="text" length="1000000" /> - <many-to-one name="bindingMessage" column="c_binding_message_id" - not-null="true" /> - </class> + </class> + + <!-- ################################################## --> + + <class name="org.wso2.wsas.persistence.dataobject.EndpointDO" + table="endpoint_t"> + <id name="id" column="c_id"> + <generator class="native" /> + </id> + <property name="name" column="c_name" not-null="true"/> + <many-to-one name="service" foreign-key="c_service_id" /> + <one-to-one name="binding" foreign-key='c_binding_id"' /> + </class> + <class name="org.wso2.wsas.persistence.dataobject.BindingDO" + table="binding_t"> + <id name="id" column="c_id"> + <generator class="native" /> + </id> + <property name="name" column="c_name" not-null="true"/> + <many-to-one name="endpoint" column="c_endpoint_id" /> + <set name="bindingOperations" inverse="true" + cascade="all-delete-orphan" lazy="false"> + <key column="c_binding_id" on-delete="cascade" /> + <one-to-many + class="org.wso2.wsas.persistence.dataobject.BindingOperationDO" /> + </set> + <set name="policies" inverse="true" cascade="all-delete-orphan" + lazy="false"> + <key column="c_binding_id" on-delete="cascade" /> + <one-to-many + class="org.wso2.wsas.persistence.dataobject.BindingOperationPolicyDO" /> + </set> + </class> + <class name="org.wso2.wsas.persistence.dataobject.BindingPolicyDO" + table="binding_policy_t"> + <id name="id" column="c_id"> + <generator class="native" /> + </id> + <property name="lastUpdatedTime" type="timestamp" + column="c_last_updated" not-null="true" /> + <property name="uuid" column="c_uuid" not-null="true" /> + <property name="policy" column="c_policy" not-null="true" + type="text" length="1000000" /> + <many-to-one name="binding" column="c_binding_id" + not-null="true" /> + </class> + <class + name="org.wso2.wsas.persistence.dataobject.BindingOperationDO" + table="binding_operation_t"> + <id name="id" column="c_id"> + <generator class="native" /> + </id> + <many-to-one name="binding" column="c_binding_id" /> + <many-to-one name="operation" column="c_operation_id" /> + <set name="bindingMessages" inverse="true" + cascade="all-delete-orphan" lazy="false"> + <key column="c_binding_operation_id" on-delete="cascade" /> + <one-to-many + class="org.wso2.wsas.persistence.dataobject.BindingMessageDO" /> + </set> + <set name="policies" inverse="true" cascade="all-delete-orphan" + lazy="false"> + <key column="c_binding_operation_id" on-delete="cascade" /> + <one-to-many + class="org.wso2.wsas.persistence.dataobject.BindingOperationPolicyDO" /> + </set> + </class> + <class + name="org.wso2.wsas.persistence.dataobject.BindingOperationPolicyDO" + table="binding_operation_policy_t"> + <id name="id" column="c_id"> + <generator class="native" /> + </id> + <property name="lastUpdatedTime" type="timestamp" + column="c_last_updated" not-null="true" /> + <property name="uuid" column="c_uuid" not-null="true" /> + <property name="policy" column="c_policy" not-null="true" + type="text" length="1000000" /> + <many-to-one name="bindingOperation" + column="c_binding_operation_id" not-null="true" /> + </class> + <class name="org.wso2.wsas.persistence.dataobject.BindingMessageDO" + table="binding_message_t"> + <id name="id" column="c_id"> + <generator class="native" /> + </id> + <many-to-one name="bindingOperation" + column="c_binding_operation_id" /> + <many-to-one name="message" column="c_message_id" /> + <set name="policies" inverse="true" cascade="all-delete-orphan" + lazy="false"> + <key column="c_binding_message_id" on-delete="cascade" /> + <one-to-many + class="org.wso2.wsas.persistence.dataobject.BindingMessagePolicyDO" /> + </set> + </class> + <class + name="org.wso2.wsas.persistence.dataobject.BindingMessagePolicyDO" + table="binding_message_policy_t"> + <id name="id" column="c_id"> + <generator class="native" /> + </id> + <property name="lastUpdatedTime" type="timestamp" + column="c_last_updated" not-null="true" /> + + <property name="uuid" column="c_uuid" not-null="true" /> + <property name="policy" column="c_policy" not-null="true" + type="text" length="1000000" /> + <many-to-one name="bindingMessage" column="c_binding_message_id" + not-null="true" /> + </class> </hibernate-mapping> Modified: branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/dataobject/MessageDO.java URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/dataobject/MessageDO.java?rev=17903&r1=17902&r2=17903&view=diff ============================================================================== --- branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/dataobject/MessageDO.java (original) +++ branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/dataobject/MessageDO.java Wed Jun 4 02:49:52 2008 @@ -189,12 +189,4 @@ public void setXml(String xml) { this.xml = xml; } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } } Modified: branches/wsas/java/2.3/wsas/pom.xml URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/wsas/pom.xml?rev=17903&r1=17902&r2=17903&view=diff ============================================================================== --- branches/wsas/java/2.3/wsas/pom.xml (original) +++ branches/wsas/java/2.3/wsas/pom.xml Wed Jun 4 02:49:52 2008 @@ -2141,7 +2141,7 @@ <wso2.adminui.version.graphs>1.1</wso2.adminui.version.graphs> <axiom.version>1.2.7</axiom.version> - <addressing.version>1.4</addressing.version> + <addressing.version>1.4.01</addressing.version> <rampart.version>1.4</rampart.version> <sandesha2.version>1.3</sandesha2.version> <wso2sandesha2.version>2.2</wso2sandesha2.version> _______________________________________________ Wsas-java-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
