Changeset 1584

Timestamp:

06/19/08 22:13:27 (3 months ago)

Author:

lmajano

Message:

ant updates,
Interceptor service fix for not validating correct inheritance trees.

Files:

• coldbox/trunk/ant/applicationTemplate/deploy.xml (modified) (2 diffs)
• coldbox/trunk/system/services/interceptorService.cfc (modified) (1 diff)

coldbox/trunk/ant/applicationTemplate/deploy.xml

@@ -28 +28 @@
-        
-        <target name="do.archive">
-
+ preservelastmodified="true"
-                        <fileset dir="${src}" />
-                </copy>
@@ -43 +43 @@
-        <input message="Please enter fpt server password:" addproperty="ftp.password" />
-        <ftp action="send" server="${ftp.server}" userid="${ftp.username}" password="${ftp.password}" 
-
+ newer="true"
-                <fileset file="${archive}" />
-        </ftp>

coldbox/trunk/system/services/interceptorService.cfc

@@ -264 +264 @@
-                        /* Start Registering inheritances */
-                        if ( structKeyExists(arguments.metadata, "extends") and 
-or
-or
+and
+and
-                                  arguments.metadata.extends.name neq "coldbox.system.eventhandler" )
-                        ){