inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.2 to HEAD

Browse Source 
8146: Interim checkin for Oracle upgrade scripts.
   8150: AR-1905
   8151: AR-1956
   8152: Correct I18N when reporting patch description
   8153: QName script for Oracle along with fixes for unique constraints on assoc tables
   8155: Upgrade scripts for Oracle V2.2 - almost there
   8164: AWC-1633: Unable to edit rule added via web service
   8166: V2.2 upgrade scripts for MySQL and Oracle
   8170: AWC-1515: E-mail doesn't reach user's mail box, if it was created with the help of templates
   8174: Fix for AWC-798
   8180: Fix for AWC-1843
   8183: Fixes for different unique index names on alf_child_assoc
   8189: AWC-1719: Need to alllow Rules to account for a space being deleted
   8249: Fixed handling of empty namespaces on Oracle
   8259: Fixes for null namespaces in QName
   8360: Modified alf_audit_date columns and added patch
   8404: Fix AR-2133: Fix handling of empty namespaces during upgrade


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8481 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-10 15:32:55 +00:00
parent 1f8c86d46d
commit a118105ed7
31 changed files with 1393 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/repo/audit/hibernate/Audit.hbm.xml
View File

@@ -75,8 +75,8 @@
<property name="weekOfMonth" column="week_of_month" type="integer" index="idx_alf_adtd_wom" not-null="true"/>
<property name="month" column="month" type="integer" index="idx_alf_adtd_m" not-null="true"/>
<property name="quarter" column="quarter" type="integer" index="idx_alf_adtd_q" not-null="true"/>
<property name="halfYear" column="halfYear" type="integer" index="idx_alf_adtd_hy" not-null="true"/>
<property name="year" column="year" type="integer" index="idx_alf_adtd_y" not-null="true"/>
<property name="halfYear" column="half_year" type="integer" index="idx_alf_adtd_hy" not-null="true"/>
<property name="fullYear" column="full_year" type="integer" index="idx_alf_adtd_fy" not-null="true"/>
</class>

47
source/java/org/alfresco/repo/audit/hibernate/AuditDate.java
View File

@@ -33,82 +33,59 @@ import java.util.Date;
*/
public interface AuditDate
{
/**
* Get the date
*
* @return
* @return the date object
*/
public abstract Date getDate();
/**
* Get the day of the year.
*
* @return
* @return the day of the year
*/
public abstract int getDayOfYear();
/**
* Get the day of the month.
*
* @return
* @return the day of the month
*/
public abstract int getDayOfMonth();
/**
* Get the day of the week
*
* @return
* @return the day of the week
*/
public abstract int getDayOfWeek();
/**
* Get the half year;
*
* @return
* @return the half year
*/
public abstract int getHalfYear();
/**
* Get the surrogate key
*
* @return
* @return the surrogate key
*/
public abstract long getId();
/**
* Get the month
*
* @return
* @return the month of the year
*/
public abstract int getMonth();
/**
* Get the quarter
*
* @return
* @return the quarter in the year
*/
public abstract int getQuarter();
/**
* Get the week of the month.
*
* @return
* @return the week of the month
*/
public abstract int getWeekOfMonth();
/**
* Get the week of the year.
*
* @return
* @return the week of the year
*/
public abstract int getWeekOfYear();
/**
* Get the year.
* @return
* @return the full year
*/
public abstract int getYear();
public abstract int getFullYear();
}

45
source/java/org/alfresco/repo/audit/hibernate/AuditDateImpl.java
View File

@@ -92,7 +92,7 @@ public class AuditDateImpl implements AuditDate
/**
* The year
*/
private int year;
private int fullYear;
protected AuditDateImpl()
{
@@ -105,9 +105,6 @@ public class AuditDateImpl implements AuditDate
setDate(date);
}
/* (non-Javadoc)
* @see org.alfresco.repo.audit.hibernate.AuditDate#getDate()
*/
public Date getDate()
{
return date;
@@ -131,12 +128,9 @@ public class AuditDateImpl implements AuditDate
this.setQuarter((getMonth()/3));
this.setWeekOfMonth(cal.get(Calendar.WEEK_OF_MONTH));
this.setWeekOfYear(cal.get(Calendar.WEEK_OF_YEAR));
this.setYear(cal.get(Calendar.YEAR));
this.setFullYear(cal.get(Calendar.YEAR));
}
/* (non-Javadoc)
* @see org.alfresco.repo.audit.hibernate.AuditDate#getDayOfYear()
*/
public int getDayOfYear()
{
return dayOfYear;
@@ -147,9 +141,6 @@ public class AuditDateImpl implements AuditDate
this.dayOfYear = dayOfYear;
}
/* (non-Javadoc)
* @see org.alfresco.repo.audit.hibernate.AuditDate#getDayOfMonth()
*/
public int getDayOfMonth()
{
return dayOfMonth;
@@ -160,9 +151,6 @@ public class AuditDateImpl implements AuditDate
this.dayOfMonth = dayOfMonth;
}
/* (non-Javadoc)
* @see org.alfresco.repo.audit.hibernate.AuditDate#getDayOfWeek()
*/
public int getDayOfWeek()
{
return dayOfWeek;
@@ -173,9 +161,6 @@ public class AuditDateImpl implements AuditDate
this.dayOfWeek = dayOfWeek;
}
/* (non-Javadoc)
* @see org.alfresco.repo.audit.hibernate.AuditDate#getHalfYear()
*/
public int getHalfYear()
{
return halfYear;
@@ -186,9 +171,6 @@ public class AuditDateImpl implements AuditDate
this.halfYear = halfYear;
}
/* (non-Javadoc)
* @see org.alfresco.repo.audit.hibernate.AuditDate#getId()
*/
public long getId()
{
return id;
@@ -199,9 +181,6 @@ public class AuditDateImpl implements AuditDate
this.id = id;
}
/* (non-Javadoc)
* @see org.alfresco.repo.audit.hibernate.AuditDate#getMonth()
*/
public int getMonth()
{
return month;
@@ -212,9 +191,6 @@ public class AuditDateImpl implements AuditDate
this.month = month;
}
/* (non-Javadoc)
* @see org.alfresco.repo.audit.hibernate.AuditDate#getQuarter()
*/
public int getQuarter()
{
return quarter;
@@ -225,9 +201,6 @@ public class AuditDateImpl implements AuditDate
this.quarter = quarter;
}
/* (non-Javadoc)
* @see org.alfresco.repo.audit.hibernate.AuditDate#getWeekOfMonth()
*/
public int getWeekOfMonth()
{
return weekOfMonth;
@@ -238,9 +211,6 @@ public class AuditDateImpl implements AuditDate
this.weekOfMonth = weekOfMonth;
}
/* (non-Javadoc)
* @see org.alfresco.repo.audit.hibernate.AuditDate#getWeekOfYear()
*/
public int getWeekOfYear()
{
return weekOfYear;
@@ -251,17 +221,14 @@ public class AuditDateImpl implements AuditDate
this.weekOfYear = weekOfYear;
}
/* (non-Javadoc)
* @see org.alfresco.repo.audit.hibernate.AuditDate#getYear()
*/
public int getYear()
public int getFullYear()
{
return year;
return fullYear;
}
protected void setYear(int year)
protected void setFullYear(int year)
{
this.year = year;
this.fullYear = year;
}
@Override