You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ga...@apache.org on 2005/08/16 17:07:38 UTC

svn commit: r233006 - in /incubator/roller/trunk: metadata/database/120-to-130-migration-raw.sql metadata/database/createdb-raw.sql src/org/roller/pojos/PingTargetData.java

Author: gangolli
Date: Tue Aug 16 08:07:37 2005
New Revision: 233006

URL: http://svn.apache.org/viewcvs?rev=233006&view=rev
Log:
Back out fixes for ROL-754 from trunk. DB changes are currently excluded from release 1.3.  These need to be put on the Roller 2.0 branch.  This reverses the effect of revision 232624.

Removed:
    incubator/roller/trunk/metadata/database/120-to-130-migration-raw.sql
Modified:
    incubator/roller/trunk/metadata/database/createdb-raw.sql
    incubator/roller/trunk/src/org/roller/pojos/PingTargetData.java

Modified: incubator/roller/trunk/metadata/database/createdb-raw.sql
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/createdb-raw.sql?rev=233006&r1=233005&r2=233006&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/database/createdb-raw.sql (original)
+++ incubator/roller/trunk/metadata/database/createdb-raw.sql Tue Aug 16 08:07:37 2005
@@ -187,7 +187,7 @@
     name         varchar(255) not null, -- short descriptive name of the ping target
     pingurl      varchar(255) not null,  -- URL to receive the ping
     websiteid    varchar(48) null, -- if not null, this is a custom target defined by the associated website
-    conditioncode    integer default 0 not null, -- condition code
+    condition    integer default 0 not null, -- condition code
     lastsuccess  timestamp null -- last successful use
 );
 create index pingtarget_websiteid_index on pingtarget( websiteid );

Modified: incubator/roller/trunk/src/org/roller/pojos/PingTargetData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/PingTargetData.java?rev=233006&r1=233005&r2=233006&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/PingTargetData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/PingTargetData.java Tue Aug 16 08:07:37 2005
@@ -187,7 +187,7 @@
      * @return one of the condition codes {@link #CONDITION_OK}, {@link #CONDITION_FAILING}, {@link
      *         #CONDITION_DISABLED}.
      * @ejb:persistent-field
-     * @hibernate.property column="conditioncode" not-null="true"
+     * @hibernate.property column="condition" not-null="true"
      */
     public int getConditionCode()
     {