diff --git a/ccm-core/build-hooks.xml b/ccm-core/build-hooks.xml
index 49866db41..43684ca26 100755
--- a/ccm-core/build-hooks.xml
+++ b/ccm-core/build-hooks.xml
@@ -57,7 +57,7 @@
     <copy todir="${this.deploy.dir}/WEB-INF/conf"
           file="${src.dir}/log4j.properties"/>
     <xslt style="${ccm.tools.xsl.dir}/build-version.xsl" 
-          in="${ccm.project.dir}/project.xml"
+          in="${ccm.bundle.folder}/cfg/project.xml"
           out="${build.classes.dir}/ccm-version.properties" 
           classpathref="ccm.tools.classpath" force="yes" />
   </target>
diff --git a/ccm-core/src/com/arsdigita/domain/AbstractDomainObjectObserver.java b/ccm-core/src/com/arsdigita/domain/AbstractDomainObjectObserver.java
index 9fdb5fcd1..07b34ea54 100755
--- a/ccm-core/src/com/arsdigita/domain/AbstractDomainObjectObserver.java
+++ b/ccm-core/src/com/arsdigita/domain/AbstractDomainObjectObserver.java
@@ -25,7 +25,7 @@ import com.arsdigita.persistence.DataObject;
  * Abstract implementation of <code>DomainObjectObserver</code>.
  *
  * @author Justin Ross
- * @version $Id: AbstractDomainObjectObserver.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: AbstractDomainObjectObserver.java 2089 2010-04-17 07:55:43Z pboy $
  */
 public abstract class AbstractDomainObjectObserver
         implements DomainObjectObserver {
diff --git a/ccm-core/src/com/arsdigita/domain/DataObjectNotFoundException.java b/ccm-core/src/com/arsdigita/domain/DataObjectNotFoundException.java
index 89ee315a6..423220ca0 100755
--- a/ccm-core/src/com/arsdigita/domain/DataObjectNotFoundException.java
+++ b/ccm-core/src/com/arsdigita/domain/DataObjectNotFoundException.java
@@ -23,7 +23,7 @@ package com.arsdigita.domain;
  * cannot be found.
  *
  * @author Oumi Mehrota
- * @version $Id: DataObjectNotFoundException.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: DataObjectNotFoundException.java 2089 2010-04-17 07:55:43Z pboy $
  */
 public class DataObjectNotFoundException extends RuntimeException {
 
diff --git a/ccm-core/src/com/arsdigita/domain/DomainCollection.java b/ccm-core/src/com/arsdigita/domain/DomainCollection.java
index 2408f92aa..668b04900 100755
--- a/ccm-core/src/com/arsdigita/domain/DomainCollection.java
+++ b/ccm-core/src/com/arsdigita/domain/DomainCollection.java
@@ -29,7 +29,7 @@ import com.arsdigita.persistence.DataCollection;
  * @see com.arsdigita.persistence.DataCollection
  *
  * @author Phong Nguyen
- * @version $Id: DomainCollection.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: DomainCollection.java 2089 2010-04-17 07:55:43Z pboy $
  */
 public class DomainCollection extends DomainQuery {
 
diff --git a/ccm-core/src/com/arsdigita/domain/DomainException.java b/ccm-core/src/com/arsdigita/domain/DomainException.java
index e047abb6d..b12a2bb52 100755
--- a/ccm-core/src/com/arsdigita/domain/DomainException.java
+++ b/ccm-core/src/com/arsdigita/domain/DomainException.java
@@ -21,7 +21,7 @@ package com.arsdigita.domain;
 /**
  * DomainException
  *
- * @version $Id: DomainException.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: DomainException.java 2089 2010-04-17 07:55:43Z pboy $
  */
 
 public class DomainException extends Exception {
diff --git a/ccm-core/src/com/arsdigita/domain/DomainObject.java b/ccm-core/src/com/arsdigita/domain/DomainObject.java
index 5ab538618..3a2b340f5 100755
--- a/ccm-core/src/com/arsdigita/domain/DomainObject.java
+++ b/ccm-core/src/com/arsdigita/domain/DomainObject.java
@@ -40,7 +40,7 @@ import org.apache.log4j.Logger;
  * @see com.arsdigita.persistence.DataObject
  *
  * @version 1.0
- * @version $Id: DomainObject.java 738 2005-09-01 12:36:52Z sskracic $
+ * @version $Id: DomainObject.java 2089 2010-04-17 07:55:43Z pboy $
  */
 public abstract class DomainObject {
 
diff --git a/ccm-core/src/com/arsdigita/domain/DomainObjectFactory.java b/ccm-core/src/com/arsdigita/domain/DomainObjectFactory.java
index bb98aa130..d297fd1c1 100755
--- a/ccm-core/src/com/arsdigita/domain/DomainObjectFactory.java
+++ b/ccm-core/src/com/arsdigita/domain/DomainObjectFactory.java
@@ -69,7 +69,7 @@ import org.apache.log4j.Logger;
  *
  * @author Oumi Mehrotra
  * @version 1.0
- * @version $Id: DomainObjectFactory.java 738 2005-09-01 12:36:52Z sskracic $
+ * @version $Id: DomainObjectFactory.java 2170 2011-06-19 22:23:08Z pboy $
  **/
 public class DomainObjectFactory {
 
diff --git a/ccm-core/src/com/arsdigita/domain/DomainObjectInstantiator.java b/ccm-core/src/com/arsdigita/domain/DomainObjectInstantiator.java
index ef6166f95..fe9d86aa3 100755
--- a/ccm-core/src/com/arsdigita/domain/DomainObjectInstantiator.java
+++ b/ccm-core/src/com/arsdigita/domain/DomainObjectInstantiator.java
@@ -66,7 +66,7 @@ import com.arsdigita.persistence.DataObject;
  *
  * @author Oumi Mehrotra
  * @version 1.0
- * @version $Id: DomainObjectInstantiator.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: DomainObjectInstantiator.java 2089 2010-04-17 07:55:43Z pboy $
  **/
 public abstract class DomainObjectInstantiator {
 
diff --git a/ccm-core/src/com/arsdigita/domain/DomainObjectObserver.java b/ccm-core/src/com/arsdigita/domain/DomainObjectObserver.java
index 96f17676d..fb7682b72 100755
--- a/ccm-core/src/com/arsdigita/domain/DomainObjectObserver.java
+++ b/ccm-core/src/com/arsdigita/domain/DomainObjectObserver.java
@@ -28,7 +28,7 @@ import com.arsdigita.persistence.DataObject;
  * multiple domain objects that wrap the same data object.
  *
  * @author Joseph Bank
- * @version $Id: DomainObjectObserver.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: DomainObjectObserver.java 2089 2010-04-17 07:55:43Z pboy $
  */
 public interface DomainObjectObserver {
 
diff --git a/ccm-core/src/com/arsdigita/domain/DomainObjectXMLRenderer.java b/ccm-core/src/com/arsdigita/domain/DomainObjectXMLRenderer.java
index 0ec2e250d..fe07274c9 100755
--- a/ccm-core/src/com/arsdigita/domain/DomainObjectXMLRenderer.java
+++ b/ccm-core/src/com/arsdigita/domain/DomainObjectXMLRenderer.java
@@ -41,7 +41,7 @@ import org.apache.log4j.Logger;
  * can be controlled using the various setWrapXXX methods detailed
  * below.
  *
- * @version $Id: DomainObjectXMLRenderer.java 2071 2010-01-28 18:24:06Z pboy $
+ * @version $Id: DomainObjectXMLRenderer.java 2141 2011-01-16 12:17:15Z pboy $
  */
 public class DomainObjectXMLRenderer extends DomainObjectTraversal {
 
diff --git a/ccm-core/src/com/arsdigita/domain/DomainQuery.java b/ccm-core/src/com/arsdigita/domain/DomainQuery.java
index 288d65953..5283f3a8c 100755
--- a/ccm-core/src/com/arsdigita/domain/DomainQuery.java
+++ b/ccm-core/src/com/arsdigita/domain/DomainQuery.java
@@ -34,7 +34,7 @@ import java.util.Map;
  *
  * @author Oumi Mehrotra
  * @author Matthew Booth
- * @version $Id: DomainQuery.java 1045 2005-12-09 13:41:22Z sskracic $
+ * @version $Id: DomainQuery.java 2089 2010-04-17 07:55:43Z pboy $
  */
 public abstract class DomainQuery implements DataQuery {
 
diff --git a/ccm-core/src/com/arsdigita/domain/DomainService.java b/ccm-core/src/com/arsdigita/domain/DomainService.java
index 27dbb0b6a..c7023f237 100755
--- a/ccm-core/src/com/arsdigita/domain/DomainService.java
+++ b/ccm-core/src/com/arsdigita/domain/DomainService.java
@@ -30,7 +30,7 @@ import com.arsdigita.persistence.DataCollection;
  * @see com.arsdigita.persistence.DataObject
  *
  * @author Oumi Mehrotra
- * @version $Id: DomainService.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: DomainService.java 2089 2010-04-17 07:55:43Z pboy $
  */
 public abstract class DomainService {
 
diff --git a/ccm-core/src/com/arsdigita/domain/DomainServiceInterfaceExposer.java b/ccm-core/src/com/arsdigita/domain/DomainServiceInterfaceExposer.java
index bb7392680..e3934a304 100755
--- a/ccm-core/src/com/arsdigita/domain/DomainServiceInterfaceExposer.java
+++ b/ccm-core/src/com/arsdigita/domain/DomainServiceInterfaceExposer.java
@@ -26,7 +26,7 @@ import com.arsdigita.persistence.DataObject;
  *
  * @author Stanislav Freidin
  * @author Gavin Doughtie
- * @version $Id: DomainServiceInterfaceExposer.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: DomainServiceInterfaceExposer.java 1940 2009-05-29 07:15:05Z terry $
  */
 
 public class DomainServiceInterfaceExposer extends DomainService {
diff --git a/ccm-core/src/com/arsdigita/domain/GlobalObserver.java b/ccm-core/src/com/arsdigita/domain/GlobalObserver.java
index 2a5c1abd9..8094563a9 100755
--- a/ccm-core/src/com/arsdigita/domain/GlobalObserver.java
+++ b/ccm-core/src/com/arsdigita/domain/GlobalObserver.java
@@ -28,7 +28,7 @@ package com.arsdigita.domain;
  * robust.
  *
  * @author <a href="mailto:rhs@mit.edu">rhs@mit.edu</a>
- * @version $Id: GlobalObserver.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: GlobalObserver.java 2089 2010-04-17 07:55:43Z pboy $
  */
 
 public interface GlobalObserver extends DomainObjectObserver {
diff --git a/ccm-core/src/com/arsdigita/domain/GlobalObserverManager.java b/ccm-core/src/com/arsdigita/domain/GlobalObserverManager.java
index 9c35b1423..02d5b66f4 100755
--- a/ccm-core/src/com/arsdigita/domain/GlobalObserverManager.java
+++ b/ccm-core/src/com/arsdigita/domain/GlobalObserverManager.java
@@ -34,7 +34,7 @@ import org.apache.log4j.Logger;
  * to select which objects to observe.
  * 
  * @author <a href="mailto:rhs@mit.edu">rhs@mit.edu</a>
- * @version $Id: GlobalObserverManager.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: GlobalObserverManager.java 2070 2010-01-28 08:47:41Z pboy $
  */
 
 public class GlobalObserverManager {
diff --git a/ccm-core/src/com/arsdigita/domain/InstantiatorNotFoundException.java b/ccm-core/src/com/arsdigita/domain/InstantiatorNotFoundException.java
index be3659720..c849a2003 100755
--- a/ccm-core/src/com/arsdigita/domain/InstantiatorNotFoundException.java
+++ b/ccm-core/src/com/arsdigita/domain/InstantiatorNotFoundException.java
@@ -25,7 +25,7 @@ import com.arsdigita.persistence.PersistenceException;
  * it is unable to find an instantiator for a given <code>DataObject</code>.
  *
  * @author Stanislav Freidin 
- * @version $Id: InstantiatorNotFoundException.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: InstantiatorNotFoundException.java 2089 2010-04-17 07:55:43Z pboy $
  */
 
 public class InstantiatorNotFoundException extends PersistenceException {
diff --git a/ccm-core/src/com/arsdigita/domain/ObservableDomainObject.java b/ccm-core/src/com/arsdigita/domain/ObservableDomainObject.java
index d95739f96..e475cbb76 100755
--- a/ccm-core/src/com/arsdigita/domain/ObservableDomainObject.java
+++ b/ccm-core/src/com/arsdigita/domain/ObservableDomainObject.java
@@ -36,7 +36,7 @@ import java.util.ArrayList;
  * operations.
  *
  * @author Joseph Bank
- * @version $Id: ObservableDomainObject.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: ObservableDomainObject.java 2089 2010-04-17 07:55:43Z pboy $
  **/
 public abstract class ObservableDomainObject extends DomainObject {
 
diff --git a/ccm-core/src/com/arsdigita/domain/ReflectionInstantiator.java b/ccm-core/src/com/arsdigita/domain/ReflectionInstantiator.java
index 4d3203808..52028a9ff 100755
--- a/ccm-core/src/com/arsdigita/domain/ReflectionInstantiator.java
+++ b/ccm-core/src/com/arsdigita/domain/ReflectionInstantiator.java
@@ -33,7 +33,7 @@ import org.apache.log4j.Logger;
  * (such as ACSObjectInstantiator) to provide the default behavior
  * of instiating a domain class using reflection.
  * 
- * @version $Id: ReflectionInstantiator.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: ReflectionInstantiator.java 2089 2010-04-17 07:55:43Z pboy $
  */
 public class ReflectionInstantiator extends DomainObjectInstantiator {
 
diff --git a/ccm-core/src/com/arsdigita/domain/xml/TraversalHandler.java b/ccm-core/src/com/arsdigita/domain/xml/TraversalHandler.java
index 8e4377c79..ec7f39ee0 100755
--- a/ccm-core/src/com/arsdigita/domain/xml/TraversalHandler.java
+++ b/ccm-core/src/com/arsdigita/domain/xml/TraversalHandler.java
@@ -41,7 +41,7 @@ import java.util.HashMap;
  * TraversalHandler
  *
  * @author Rafael H. Schloming &lt;rhs@mit.edu&gt;
- * @version $Id: TraversalHandler.java 1534 2007-03-23 12:08:00Z chrisgilbert23 $
+ * @version $Id: TraversalHandler.java 2089 2010-04-17 07:55:43Z pboy $
  **/
 
 public class TraversalHandler extends DefaultHandler {