Index: build.xml
===================================================================
--- build.xml	(revision 6275)
+++ build.xml	(working copy)
@@ -60,9 +60,18 @@
     description="Compile the Java and Groovy code in the main source.">
     <mkdir dir="${mainClassesDirectory}"/>
     <mkdir dir="${toolsClassesDirectory}"/>
+
+    <!-- compile the annotations targeting Java 5 -->
     <javac srcdir="${mainSourceDirectory}" includeantruntime="false" destdir="${mainClassesDirectory}"
-      debug="yes" source="1.4" target="1.4" fork="true" classpathref="compilePath"/>
+      debug="yes" source="5" target="5" fork="true" classpathref="compilePath">
+      <include name="groovy/lang/BoundProperty.java"/>
+    </javac>
     
+    <!-- compile the remainder targeting Java 1.4 -->
+    <javac srcdir="${mainSourceDirectory}" includeantruntime="false" destdir="${mainClassesDirectory}"
+      debug="yes" source="1.4" target="1.4" fork="true" classpathref="compilePath">
+    </javac>
+    
     <!--
     
     There seems to be a problem using the groovyc task directly.  If we use it directly as below then there
Index: src/main/org/codehaus/groovy/ast/ClassNode.java
===================================================================
--- src/main/org/codehaus/groovy/ast/ClassNode.java	(revision 6275)
+++ src/main/org/codehaus/groovy/ast/ClassNode.java	(working copy)
@@ -37,10 +37,17 @@
 import groovy.lang.GroovyObject;
 
 import org.codehaus.groovy.GroovyBugError;
+import org.codehaus.groovy.ast.expr.ArgumentListExpression;
+import org.codehaus.groovy.ast.expr.ConstructorCallExpression;
 import org.codehaus.groovy.ast.expr.Expression;
+import org.codehaus.groovy.ast.expr.FieldExpression;
+import org.codehaus.groovy.ast.expr.MethodCallExpression;
 import org.codehaus.groovy.ast.expr.TupleExpression;
+import org.codehaus.groovy.ast.expr.VariableExpression;
 import org.codehaus.groovy.ast.stmt.BlockStatement;
 import org.codehaus.groovy.ast.stmt.EmptyStatement;
+import org.codehaus.groovy.ast.stmt.ExpressionStatement;
+import org.codehaus.groovy.ast.stmt.ReturnStatement;
 import org.codehaus.groovy.ast.stmt.Statement;
 import org.objectweb.asm.Opcodes;
 
@@ -92,6 +99,7 @@
     private List methods = new ArrayList();
     private List fields = new ArrayList();
     private List properties = new ArrayList();
+    private boolean addedPropertyChangeSupport;
     private Map fieldIndex = new HashMap();
     private ModuleNode module;
     private CompileUnit compileUnit;
@@ -987,4 +995,108 @@
     public boolean isAnnotated() {
         return this.annotated;
     }
+    
+    public boolean addPropertyChangeSupport() {
+        //TODO look for this$propertyChangeSupport in parent and devline to add if present
+        if (!addedPropertyChangeSupport) {
+            System.err.println("adding property change support");
+            ClassNode pcsClassNode = ClassHelper.make(java.beans.PropertyChangeSupport.class);
+            ClassNode pclClassNode = ClassHelper.make(java.beans.PropertyChangeListener.class);
+
+            // add field protected static PropertyChangeSupport this$propertyChangeSupport = new java.beans.PropertyChangeSupport(this)
+            addField(
+                "this$propertyChangeSupport",
+                ACC_FINAL | ACC_PROTECTED | ACC_SYNTHETIC,
+                pcsClassNode,
+                new ConstructorCallExpression(pcsClassNode,
+                    new ArgumentListExpression(new Expression[] {new VariableExpression("this")})));
+                
+            
+            // add method void addPropertyChangeListener(listner) {
+            //     this$propertyChangeSupport.addPropertyChangeListner(listener)
+            //  }
+            addMethod(
+                new MethodNode(
+                    "addPropertyChangeListener",
+                    ACC_PUBLIC | ACC_SYNTHETIC,
+                    ClassHelper.VOID_TYPE,
+                    new Parameter[] { new Parameter(pclClassNode, "listener")},
+                    ClassNode.EMPTY_ARRAY,
+                    new ExpressionStatement(
+                        new MethodCallExpression(
+                            new FieldExpression(getField("this$propertyChangeSupport")),
+                            "addPropertyChangeListener",
+                            new ArgumentListExpression(
+                                new Expression[] {new VariableExpression("listener")})))));
+            // add method void addPropertyChangeListener(name, listner) {
+            //     this$propertyChangeSupport.addPropertyChangeListner(name, listener)
+            //  }
+            addMethod(
+                new MethodNode(
+                    "addPropertyChangeListener",
+                    ACC_PUBLIC | ACC_SYNTHETIC,
+                    ClassHelper.VOID_TYPE,
+                    new Parameter[] { new Parameter(ClassHelper.STRING_TYPE, "name"), new Parameter(pclClassNode, "listener")},
+                    ClassNode.EMPTY_ARRAY,
+                    new ExpressionStatement(
+                        new MethodCallExpression(
+                            new FieldExpression(getField("this$propertyChangeSupport")),
+                            "addPropertyChangeListener",
+                            new ArgumentListExpression(
+                                new Expression[] {new VariableExpression("name"), new VariableExpression("listener")})))));
+
+            // add method boolean removePropertyChangeListener(listner) {
+            //    return this$propertyChangeSupport.removePropertyChangeListener(listener);
+            // }
+            addMethod(
+                new MethodNode(
+                    "removePropertyChangeListener",
+                    ACC_PUBLIC | ACC_SYNTHETIC,
+                    ClassHelper.VOID_TYPE,
+                    new Parameter[] { new Parameter(pclClassNode, "listener")},
+                    ClassNode.EMPTY_ARRAY,
+                    new ExpressionStatement(
+                        new MethodCallExpression(
+                            new FieldExpression(getField("this$propertyChangeSupport")),
+                            "removePropertyChangeListener",
+                            new ArgumentListExpression(
+                                new Expression[] {new VariableExpression("listener")})))));
+            // add method void removePropertyChangeListener(name, listner)
+            addMethod(
+                new MethodNode(
+                    "removePropertyChangeListener",
+                    ACC_PUBLIC | ACC_SYNTHETIC,
+                    ClassHelper.VOID_TYPE,
+                    new Parameter[] { new Parameter(ClassHelper.STRING_TYPE, "name"), new Parameter(pclClassNode, "listener")},
+                    ClassNode.EMPTY_ARRAY,
+                    new ExpressionStatement(
+                        new MethodCallExpression(
+                            new FieldExpression(getField("this$propertyChangeSupport")),
+                            "removePropertyChangeListener",
+                            new ArgumentListExpression(
+                                new Expression[] {new VariableExpression("name"), new VariableExpression("listener")})))));
+            // add PropertyChangeSupport[] getPropertyChangeListeners() {
+            //   return propertyChangeSupport.getPropertyChangeListeners
+            // }
+            addMethod(
+                new MethodNode(
+                    "getPropertyChangeListeners",
+                    ACC_PUBLIC | ACC_SYNTHETIC,
+                    pclClassNode.makeArray(),
+                    Parameter.EMPTY_ARRAY,
+                    ClassNode.EMPTY_ARRAY,
+                    new ReturnStatement(
+                        new ExpressionStatement(
+                            new MethodCallExpression(
+                                new FieldExpression(getField("this$propertyChangeSupport")),
+                                "getPropertyChangeListeners",
+                                ArgumentListExpression.EMPTY_ARGUMENTS)))));
+            
+            
+            addedPropertyChangeSupport = true;
+            return true;
+        } else {
+            return false;
+        }
+    }
 }
Index: src/main/org/codehaus/groovy/classgen/Verifier.java
===================================================================
--- src/main/org/codehaus/groovy/classgen/Verifier.java	(revision 6275)
+++ src/main/org/codehaus/groovy/classgen/Verifier.java	(working copy)
@@ -52,7 +52,9 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
+import org.codehaus.groovy.ast.AnnotationNode;
 import org.codehaus.groovy.ast.ClassHelper;
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.ast.CodeVisitorSupport;
@@ -281,10 +283,10 @@
             node.addField(timeTagField);
         }
         
-        addInitialization(node);
         checkReturnInObjectInitializer(node.getObjectInitializerStatements());
         node.getObjectInitializerStatements().clear();
         node.visitContents(this);
+        addInitialization(node);
     }
     private void checkReturnInObjectInitializer(List init) {
         CodeVisitorSupport cvs = new CodeVisitorSupport() {
@@ -610,6 +612,31 @@
 
     protected Statement createSetterBlock(PropertyNode propertyNode, FieldNode field) {
         Expression expression = new FieldExpression(field);
+        
+        // getAnnotation(String) is indexed by the text in the code, not FQN, so we must iterate
+        // the problem is that the has table is created before names are fully resolved
+        for (Iterator iter = field.getAnnotations().values().iterator(); iter.hasNext(); ) {
+            AnnotationNode annotationNode = (AnnotationNode) iter.next(); 
+            if ("groovy.lang.BoundProperty".equals(annotationNode.getClassNode().getName())) {
+                // found a bound expression, output bound block
+                field.getDeclaringClass().addPropertyChangeSupport();
+                // add this$propertyChangeSupport.firePropertyChange("field", field, field = value);
+                return new ExpressionStatement(
+                    new MethodCallExpression(
+                        new FieldExpression(field.getDeclaringClass().getField("this$propertyChangeSupport")),
+                        "firePropertyChange",
+                            new ArgumentListExpression(
+                                new Expression[] {
+                                    new ConstantExpression(field.getName()), 
+                                    expression,
+                                    new BinaryExpression(
+                                        expression,
+                                        Token.newSymbol(Types.EQUAL, 0, 0), 
+                                        new VariableExpression("value"))})));
+            }
+        } 
+        
+        // did not create bound block, create unbound block
         return new ExpressionStatement(
             new BinaryExpression(expression, Token.newSymbol(Types.EQUAL, 0, 0), new VariableExpression("value")));
     }