dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #16990
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6619: Renamed class EquipmentWorkingStatus to EquipmentStatus in CCEM
------------------------------------------------------------
revno: 6619
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-04-17 17:58:23 +0530
message:
Renamed class EquipmentWorkingStatus to EquipmentStatus in CCEM
removed:
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatus.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatusService.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatusStore.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentWorkingStatusService.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentWorkingStatusStore.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentWorkingStatus.hbm.xml
added:
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentStatus.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentStatusService.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentStatusStore.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentStatusService.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentStatusStore.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentStatus.hbm.xml
modified:
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstance.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentInstance.hbm.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstance.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstance.java 2012-04-17 10:58:04 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstance.java 2012-04-17 12:28:23 +0000
@@ -16,7 +16,7 @@
private boolean working = true;
- private Set<EquipmentWorkingStatus> equipmentStatusUpdates;
+ private Set<EquipmentStatus> equipmentStatusUpdates;
// -------------------------------------------------------------------------
// Constructors
@@ -117,12 +117,12 @@
this.working = working;
}
- public Set<EquipmentWorkingStatus> getEquipmentStatusUpdates()
+ public Set<EquipmentStatus> getEquipmentStatusUpdates()
{
return equipmentStatusUpdates;
}
- public void setEquipmentStatusUpdates( Set<EquipmentWorkingStatus> equipmentStatusUpdates )
+ public void setEquipmentStatusUpdates( Set<EquipmentStatus> equipmentStatusUpdates )
{
this.equipmentStatusUpdates = equipmentStatusUpdates;
}
=== added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentStatus.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentStatus.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentStatus.java 2012-04-17 12:28:23 +0000
@@ -0,0 +1,148 @@
+package org.hisp.dhis.coldchain.inventory;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class EquipmentStatus implements Serializable
+{
+ private int id;
+
+ private EquipmentInstance equipmentInstance;
+
+ private Date reportingDate;
+
+ private Date updationDate;
+
+ private String status;
+
+ private String description;
+
+ private String storedBy;
+
+
+ // -------------------------------------------------------------------------
+ // Constructors
+ // -------------------------------------------------------------------------
+
+ public EquipmentStatus( )
+ {
+
+ }
+
+ public EquipmentStatus( EquipmentInstance equipmentInstance, Date reportingDate, Date updationDate, String status )
+ {
+ this.equipmentInstance = equipmentInstance;
+ }
+
+ // -------------------------------------------------------------------------
+ // hashCode and equals
+ // -------------------------------------------------------------------------
+ @Override
+ public boolean equals( Object o )
+ {
+ if ( this == o )
+ {
+ return true;
+ }
+
+ if ( o == null )
+ {
+ return false;
+ }
+
+ if ( !(o instanceof EquipmentStatus) )
+ {
+ return false;
+ }
+
+ final EquipmentStatus other = (EquipmentStatus) o;
+
+ return equipmentInstance.equals( other.getEquipmentInstance() );
+
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+
+ result = result * prime + equipmentInstance.hashCode();
+
+ return result;
+ }
+
+ // -------------------------------------------------------------------------
+ // Getters and setters
+ // -------------------------------------------------------------------------
+ public int getId()
+ {
+ return id;
+ }
+
+ public void setId( int id )
+ {
+ this.id = id;
+ }
+
+ public EquipmentInstance getEquipmentInstance()
+ {
+ return equipmentInstance;
+ }
+
+ public void setEquipmentInstance( EquipmentInstance equipmentInstance )
+ {
+ this.equipmentInstance = equipmentInstance;
+ }
+
+ public Date getReportingDate()
+ {
+ return reportingDate;
+ }
+
+ public void setReportingDate( Date reportingDate )
+ {
+ this.reportingDate = reportingDate;
+ }
+
+ public Date getUpdationDate()
+ {
+ return updationDate;
+ }
+
+ public void setUpdationDate( Date updationDate )
+ {
+ this.updationDate = updationDate;
+ }
+
+ public String getStatus()
+ {
+ return status;
+ }
+
+ public void setStatus( String status )
+ {
+ this.status = status;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public void setDescription( String description )
+ {
+ this.description = description;
+ }
+
+ public String getStoredBy()
+ {
+ return storedBy;
+ }
+
+ public void setStoredBy( String storedBy )
+ {
+ this.storedBy = storedBy;
+ }
+
+}
=== added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentStatusService.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentStatusService.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentStatusService.java 2012-04-17 12:28:23 +0000
@@ -0,0 +1,17 @@
+package org.hisp.dhis.coldchain.inventory;
+
+import java.util.Collection;
+
+public interface EquipmentStatusService
+{
+ String ID = EquipmentStatusService.class.getName();
+
+ int addEquipmentStatus( EquipmentStatus equipmentStatus );
+
+ void updateEquipmentStatus( EquipmentStatus equipmentStatus );
+
+ void deleteEquipmentStatus( EquipmentStatus equipmentStatus );
+
+ Collection<EquipmentStatus> getAllEquipmentStatus();
+
+}
=== added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentStatusStore.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentStatusStore.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentStatusStore.java 2012-04-17 12:28:23 +0000
@@ -0,0 +1,17 @@
+package org.hisp.dhis.coldchain.inventory;
+
+import java.util.Collection;
+
+public interface EquipmentStatusStore
+{
+ String ID = EquipmentStatusStore.class.getName();
+
+ int addEquipmentStatus( EquipmentStatus equipmentStatus );
+
+ void updateEquipmentStatus( EquipmentStatus equipmentStatus );
+
+ void deleteEquipmentStatus( EquipmentStatus equipmentStatus );
+
+ Collection<EquipmentStatus> getAllEquipmentStatus();
+
+}
=== removed file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatus.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatus.java 2012-04-17 10:58:04 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatus.java 1970-01-01 00:00:00 +0000
@@ -1,148 +0,0 @@
-package org.hisp.dhis.coldchain.inventory;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class EquipmentWorkingStatus implements Serializable
-{
- private int id;
-
- private EquipmentInstance equipmentInstance;
-
- private Date reportingDate;
-
- private Date updationDate;
-
- private String status;
-
- private String description;
-
- private String storedBy;
-
-
- // -------------------------------------------------------------------------
- // Constructors
- // -------------------------------------------------------------------------
-
- public EquipmentWorkingStatus( )
- {
-
- }
-
- public EquipmentWorkingStatus( EquipmentInstance equipmentInstance, Date reportingDate, Date updationDate, String status )
- {
- this.equipmentInstance = equipmentInstance;
- }
-
- // -------------------------------------------------------------------------
- // hashCode and equals
- // -------------------------------------------------------------------------
- @Override
- public boolean equals( Object o )
- {
- if ( this == o )
- {
- return true;
- }
-
- if ( o == null )
- {
- return false;
- }
-
- if ( !(o instanceof EquipmentWorkingStatus) )
- {
- return false;
- }
-
- final EquipmentWorkingStatus other = (EquipmentWorkingStatus) o;
-
- return equipmentInstance.equals( other.getEquipmentInstance() );
-
- }
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
-
- result = result * prime + equipmentInstance.hashCode();
-
- return result;
- }
-
- // -------------------------------------------------------------------------
- // Getters and setters
- // -------------------------------------------------------------------------
- public int getId()
- {
- return id;
- }
-
- public void setId( int id )
- {
- this.id = id;
- }
-
- public EquipmentInstance getEquipmentInstance()
- {
- return equipmentInstance;
- }
-
- public void setEquipmentInstance( EquipmentInstance equipmentInstance )
- {
- this.equipmentInstance = equipmentInstance;
- }
-
- public Date getReportingDate()
- {
- return reportingDate;
- }
-
- public void setReportingDate( Date reportingDate )
- {
- this.reportingDate = reportingDate;
- }
-
- public Date getUpdationDate()
- {
- return updationDate;
- }
-
- public void setUpdationDate( Date updationDate )
- {
- this.updationDate = updationDate;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus( String status )
- {
- this.status = status;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public void setDescription( String description )
- {
- this.description = description;
- }
-
- public String getStoredBy()
- {
- return storedBy;
- }
-
- public void setStoredBy( String storedBy )
- {
- this.storedBy = storedBy;
- }
-
-}
=== removed file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatusService.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatusService.java 2012-04-16 11:29:53 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatusService.java 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-package org.hisp.dhis.coldchain.inventory;
-
-import java.util.Collection;
-
-public interface EquipmentWorkingStatusService
-{
- String ID = EquipmentWorkingStatusService.class.getName();
-
- int addEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus );
-
- void updateEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus );
-
- void deleteEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus );
-
- Collection<EquipmentWorkingStatus> getAllEquipmentWorkingStatus();
-
-}
=== removed file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatusStore.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatusStore.java 2012-04-16 11:29:53 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatusStore.java 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-package org.hisp.dhis.coldchain.inventory;
-
-import java.util.Collection;
-
-public interface EquipmentWorkingStatusStore
-{
- String ID = EquipmentWorkingStatusStore.class.getName();
-
- int addEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus );
-
- void updateEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus );
-
- void deleteEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus );
-
- Collection<EquipmentWorkingStatus> getAllEquipmentWorkingStatus();
-
-}
=== added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentStatusService.java'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentStatusService.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentStatusService.java 2012-04-17 12:28:23 +0000
@@ -0,0 +1,48 @@
+package org.hisp.dhis.coldchain.inventory;
+
+import java.util.Collection;
+
+import org.springframework.transaction.annotation.Transactional;
+
+public class DefaultEquipmentStatusService implements EquipmentStatusService
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private EquipmentStatusStore equipmentStatusStore;
+
+ public void setEquipmentStatusStore( EquipmentStatusStore equipmentStatusStore )
+ {
+ this.equipmentStatusStore = equipmentStatusStore;
+ }
+
+ // -------------------------------------------------------------------------
+ // EquipmentWorkingStatus
+ // -------------------------------------------------------------------------
+ @Transactional
+ @Override
+ public int addEquipmentStatus( EquipmentStatus equipmentStatus )
+ {
+ return equipmentStatusStore.addEquipmentStatus( equipmentStatus );
+ }
+ @Transactional
+ @Override
+ public void deleteEquipmentStatus( EquipmentStatus equipmentStatus )
+ {
+ equipmentStatusStore.deleteEquipmentStatus( equipmentStatus );
+ }
+ @Transactional
+ @Override
+ public Collection<EquipmentStatus> getAllEquipmentStatus()
+ {
+ return equipmentStatusStore.getAllEquipmentStatus();
+ }
+ @Transactional
+ @Override
+ public void updateEquipmentStatus( EquipmentStatus equipmentStatus )
+ {
+ equipmentStatusStore.updateEquipmentStatus( equipmentStatus );
+ }
+
+}
=== removed file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentWorkingStatusService.java'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentWorkingStatusService.java 2012-04-16 11:29:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentWorkingStatusService.java 1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-package org.hisp.dhis.coldchain.inventory;
-
-import java.util.Collection;
-
-import org.springframework.transaction.annotation.Transactional;
-
-public class DefaultEquipmentWorkingStatusService implements EquipmentWorkingStatusService
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private EquipmentWorkingStatusStore equipmentWorkingStatusStore;
-
- public void setEquipmentWorkingStatusStore( EquipmentWorkingStatusStore equipmentWorkingStatusStore )
- {
- this.equipmentWorkingStatusStore = equipmentWorkingStatusStore;
- }
-
- // -------------------------------------------------------------------------
- // EquipmentWorkingStatus
- // -------------------------------------------------------------------------
- @Transactional
- @Override
- public int addEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus )
- {
- return equipmentWorkingStatusStore.addEquipmentWorkingStatus( equipmentWorkingStatus );
- }
- @Transactional
- @Override
- public void deleteEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus )
- {
- equipmentWorkingStatusStore.deleteEquipmentWorkingStatus( equipmentWorkingStatus );
- }
- @Transactional
- @Override
- public Collection<EquipmentWorkingStatus> getAllEquipmentWorkingStatus()
- {
- return equipmentWorkingStatusStore.getAllEquipmentWorkingStatus();
- }
- @Transactional
- @Override
- public void updateEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus )
- {
- equipmentWorkingStatusStore.updateEquipmentWorkingStatus( equipmentWorkingStatus );
- }
-
-}
=== added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentStatusStore.java'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentStatusStore.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentStatusStore.java 2012-04-17 12:28:23 +0000
@@ -0,0 +1,59 @@
+package org.hisp.dhis.coldchain.inventory.hibernate;
+
+import java.util.Collection;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hisp.dhis.coldchain.inventory.EquipmentStatus;
+import org.hisp.dhis.coldchain.inventory.EquipmentStatusStore;
+
+public class HibernateEquipmentStatusStore implements EquipmentStatusStore
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private SessionFactory sessionFactory;
+
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
+ // -------------------------------------------------------------------------
+ // EquipmentWorkingStatus
+ // -------------------------------------------------------------------------
+
+ @Override
+ public int addEquipmentStatus( EquipmentStatus equipmentStatus )
+ {
+ Session session = sessionFactory.getCurrentSession();
+
+ return (Integer) session.save( equipmentStatus );
+ }
+
+ @Override
+ public void deleteEquipmentStatus( EquipmentStatus equipmentStatus )
+ {
+ Session session = sessionFactory.getCurrentSession();
+
+ session.delete( equipmentStatus );
+ }
+
+ @Override
+ public Collection<EquipmentStatus> getAllEquipmentStatus()
+ {
+ Session session = sessionFactory.getCurrentSession();
+
+ return session.createCriteria( EquipmentStatus.class ).list();
+ }
+
+ @Override
+ public void updateEquipmentStatus( EquipmentStatus equipmentStatus )
+ {
+ Session session = sessionFactory.getCurrentSession();
+
+ session.update( equipmentStatus );
+ }
+
+}
=== removed file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentWorkingStatusStore.java'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentWorkingStatusStore.java 2012-04-16 11:29:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentWorkingStatusStore.java 1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-package org.hisp.dhis.coldchain.inventory.hibernate;
-
-import java.util.Collection;
-
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hisp.dhis.coldchain.inventory.EquipmentWorkingStatus;
-import org.hisp.dhis.coldchain.inventory.EquipmentWorkingStatusStore;
-
-public class HibernateEquipmentWorkingStatusStore implements EquipmentWorkingStatusStore
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private SessionFactory sessionFactory;
-
- public void setSessionFactory( SessionFactory sessionFactory )
- {
- this.sessionFactory = sessionFactory;
- }
-
- // -------------------------------------------------------------------------
- // EquipmentWorkingStatus
- // -------------------------------------------------------------------------
-
- @Override
- public int addEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus )
- {
- Session session = sessionFactory.getCurrentSession();
-
- return (Integer) session.save( equipmentWorkingStatus );
- }
-
- @Override
- public void deleteEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus )
- {
- Session session = sessionFactory.getCurrentSession();
-
- session.delete( equipmentWorkingStatus );
- }
-
- @Override
- public Collection<EquipmentWorkingStatus> getAllEquipmentWorkingStatus()
- {
- Session session = sessionFactory.getCurrentSession();
-
- return session.createCriteria( EquipmentWorkingStatus.class ).list();
- }
-
- @Override
- public void updateEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus )
- {
- Session session = sessionFactory.getCurrentSession();
-
- session.update( equipmentWorkingStatus );
- }
-
-}
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/META-INF/dhis/beans.xml 2012-04-16 11:29:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/META-INF/dhis/beans.xml 2012-04-17 12:28:23 +0000
@@ -34,8 +34,8 @@
class="org.hisp.dhis.coldchain.inventory.hibernate.HibernateEquipmentInstanceStore">
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
- <bean id="org.hisp.dhis.coldchain.inventory.EquipmentWorkingStatusStore"
- class="org.hisp.dhis.coldchain.inventory.hibernate.HibernateEquipmentWorkingStatusStore">
+ <bean id="org.hisp.dhis.coldchain.inventory.EquipmentStatusStore"
+ class="org.hisp.dhis.coldchain.inventory.hibernate.HibernateEquipmentStatusStore">
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
<bean id="org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeOptionStore"
@@ -82,9 +82,9 @@
class="org.hisp.dhis.coldchain.inventory.DefaultEquipmentInstanceService">
<property name="equipmentInstanceStore" ref="org.hisp.dhis.coldchain.inventory.EquipmentInstanceStore"/>
</bean>
- <bean id="org.hisp.dhis.coldchain.inventory.EquipmentWorkingStatusService"
- class="org.hisp.dhis.coldchain.inventory.DefaultEquipmentWorkingStatusService">
- <property name="equipmentWorkingStatusStore" ref="org.hisp.dhis.coldchain.inventory.EquipmentWorkingStatusStore"/>
+ <bean id="org.hisp.dhis.coldchain.inventory.EquipmentStatusService"
+ class="org.hisp.dhis.coldchain.inventory.DefaultEquipmentStatusService">
+ <property name="equipmentStatusStore" ref="org.hisp.dhis.coldchain.inventory.EquipmentStatusStore"/>
</bean>
<bean id="org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeOptionService"
class="org.hisp.dhis.coldchain.inventory.DefaultInventoryTypeAttributeOptionService">
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentInstance.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentInstance.hbm.xml 2012-04-17 11:59:19 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentInstance.hbm.xml 2012-04-17 12:28:23 +0000
@@ -20,7 +20,7 @@
<set name="equipmentStatusUpdates" cascade="all-delete-orphan" inverse="true" >
<key column="equipmentinstanceid" />
- <one-to-many class="org.hisp.dhis.coldchain.inventory.EquipmentWorkingStatus" />
+ <one-to-many class="org.hisp.dhis.coldchain.inventory.EquipmentStatus" />
</set>
</class>
=== added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentStatus.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentStatus.hbm.xml 1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentStatus.hbm.xml 2012-04-17 12:28:23 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
+<hibernate-mapping>
+ <class name="org.hisp.dhis.coldchain.inventory.EquipmentStatus" table="equipmentstatusupdates">
+
+ <id name="id" column="equipmentstatusid">
+ <generator class="native" />
+ </id>
+
+ <many-to-one name="equipmentInstance" class="org.hisp.dhis.coldchain.inventory.EquipmentInstance" column="equipmentinstanceid"
+ foreign-key="fk_equipmentstatus_equipmentInstanceid" />
+
+ <property name="reportingDate" column="reportingdate" />
+
+ <property name="updationDate" column="updationdate" />
+
+ <property name="status" column="status" />
+
+ <property name="description" column="description" />
+
+ <property name="storedBy" column="storedby" />
+
+ </class>
+</hibernate-mapping>
\ No newline at end of file
=== removed file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentWorkingStatus.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentWorkingStatus.hbm.xml 2012-04-17 11:59:19 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentWorkingStatus.hbm.xml 1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
-<hibernate-mapping>
- <class name="org.hisp.dhis.coldchain.inventory.EquipmentWorkingStatus" table="equipmentstatusupdates">
-
- <id name="id" column="equipmentworkingstatusid">
- <generator class="native" />
- </id>
-
- <property name="reportingDate" column="reportingdate" />
-
- <property name="updationDate" column="updationdate" />
-
- <property name="status" column="status" />
-
- <property name="description" column="description" />
-
- <property name="storedBy" column="storedby" />
-
- <many-to-one name="equipmentInstance" class="org.hisp.dhis.coldchain.inventory.EquipmentInstance" column="equipmentinstanceid"
- foreign-key="fk_equipmentworkingstatus_equipmentInstanceid" />
-
- </class>
-</hibernate-mapping>
\ No newline at end of file
