diff --git a/Build/build/build.xml b/Build/build/build.xml
index dd1b7bb26b7..ab3fd8b6d98 100644
--- a/Build/build/build.xml
+++ b/Build/build/build.xml
@@ -151,8 +151,8 @@
        </antcall>
     </target>
 
-  <target name="ERIUI.all">
-      <antcall target="global.framework.${build.action}" >
+    <target name="ERIUI.all">
+        <antcall target="global.framework.${build.action}" >
           <param name="project.principal.class" value="er.iui.ERIUI" />
           <param name="project.name" value="ERIUI" />
           <param name="project.dir" value="Frameworks/Ajax/ERIUI" />
@@ -285,6 +285,35 @@
        </antcall>
     </target>
 
+    <target name="ERXPartialBaseModel.all">
+        <antcall target="global.framework.${build.action}" >
+            <param name="project.name" value="ERXPartialBaseModel" />
+            <param name="project.principal.class" value="" />
+            <param name="project.dir" value="Examples/ERXPartials/ERXPartialBaseModel" />
+            <param name="wo.external.root.bundles" value="${frameworks.wonder.core}" />
+       </antcall>
+    </target>
+
+    <target name="ERXPartialsExampleModel.all">
+        <antcall target="global.framework.${build.action}" >
+            <param name="project.name" value="ERXPartialsExampleModel" />
+            <param name="project.principal.class" value="" />
+            <param name="project.dir" value="Examples/ERXPartials/ERXPartialsExampleModel" />
+            <param name="wo.external.root.bundles" value="${frameworks.wonder.core}/ERXPartialBaseModel" />
+       </antcall>
+    </target>
+
+    <target name="ERXPartialsExampleApp.all">
+        <antcall target="global.application.${build.action}" >
+            <param name="project.type" value="application" />
+            <param name="project.principal.class" value="er.example.erxpartials.Application" />
+            <param name="project.name" value="ERXPartialsExampleApp" />
+            <param name="project.dir" value="Examples/ERXPartials/ERXPartialsExampleApp" />
+            <param name="wo.external.root.bundles" value="${frameworks.wonder.d2w}/ERXPartialBaseModel/ERXPartialBaseModel" />
+            <param name="wo.system.root.bundles" value="${frameworks.system.d2w}" />
+        </antcall>
+    </target>
+
     <target name="ERXTest.all">
         <antcall target="global.application.${build.action}" >
             <param name="project.type" value="application" />
@@ -821,6 +850,7 @@
             <param name="wo.external.root.bundles" value="${frameworks.wonder.core}/EROpenID" />
         </antcall>
     </target>
+
     <target name="JavaRESTAdaptorExample.all">
         <antcall target="global.application.${build.action}" >
             <param name="project.type" value="application" />
@@ -831,6 +861,7 @@
             <param name="wo.external.root.bundles" value="${frameworks.wonder.core}/JavaRESTAdaptor" />
         </antcall>
     </target>
+
     <target name="AjaxExample.all" depends="examples.embed.check">
     	<property name="wonder.examples.embed.jars" value="false" />
         <antcall target="global.application.${build.action}" >
@@ -844,6 +875,7 @@
       		<param name="wo.system.root.bundles.embed" value="${wonder.examples.embed.jars}" />            
         </antcall>
     </target>
+
     <target name="AjaxExample2.all" depends="examples.embed.check">
     	<property name="wonder.examples.embed.jars" value="false" />
 	      <antcall target="global.application.${build.action}" >
@@ -857,6 +889,7 @@
       		<param name="wo.system.root.bundles.embed" value="${wonder.examples.embed.jars}" />            
 	      </antcall>
 	  </target>
+
     <target name="ERIUIExample.all">
       <antcall target="global.application.${build.action}" >
           <param name="project.type" value="application" />
@@ -883,6 +916,7 @@
       		<param name="before.build" value="Ajax.pre.build" />
         </antcall>
     </target>
+
     <target name="YUIExample.all">
         <antcall target="global.application.${build.action}" >
             <param name="project.type" value="application" />
@@ -893,6 +927,7 @@
             <param name="wo.external.root.bundles" value="${frameworks.wonder.core}/Ajax/YUI" />
         </antcall>
     </target>
+
     <target name="YUI.all">
         <antcall target="global.framework.${build.action}" >
             <param name="project.type" value="framework" />
@@ -1149,6 +1184,7 @@
             <param name="project.dir" value="Frameworks/PlugIns/PostgresqlPlugIn" />
         </antcall>
     </target>
+
     <target name="DerbyPlugIn.all">
         <antcall target="global.framework.${build.action}" >
             <param name="project.principal.class" value="com.webobjects.jdbcadaptor.DerbyPlugIn" />
@@ -1156,6 +1192,7 @@
             <param name="project.dir" value="Frameworks/PlugIns/DerbyPlugIn" />
         </antcall>
     </target>
+
     <target name="FrontBasePlugIn.all">
         <antcall target="global.framework.${build.action}" >
             <param name="project.principal.class" value="com.frontbase.FrontBasePlugInPrincipal" />
@@ -1163,6 +1200,7 @@
             <param name="project.dir" value="Frameworks/PlugIns/FrontBasePlugIn" />
         </antcall>
     </target>
+
 	<target name="H2PlugIn.all">
         <antcall target="global.framework.${build.action}" >
             <param name="project.principal.class" value="er.h2.ERH2PlugInPrincipal" />
@@ -1170,6 +1208,7 @@
             <param name="project.dir" value="Frameworks/PlugIns/H2PlugIn" />
         </antcall>
     </target>
+
 	<target name="DB2PlugIn.all">
         <antcall target="global.framework.${build.action}" >
             <param name="project.principal.class" value="com.webobjects.jdbcadaptor.DB2PlugIn" />
@@ -1177,6 +1216,7 @@
             <param name="project.dir" value="Frameworks/PlugIns/DB2PlugIn" />
         </antcall>
     </target>
+
     <target name="MySQLPlugIn.all">
         <antcall target="global.framework.${build.action}" >
             <param name="project.principal.class" value="com.webobjects.jdbcadaptor.MySQLPlugIn" />
@@ -1184,6 +1224,7 @@
             <param name="project.dir" value="Frameworks/PlugIns/MySQLPlugIn" />
         </antcall>
     </target>
+
     <target name="MooTools.all">
         <antcall target="global.framework.${build.action}" >
             <param name="project.principal.class" value="er.ajax.Ajax" />
@@ -1192,6 +1233,7 @@
             <param name="wo.external.root.bundles" value="${frameworks.wonder.core}/Ajax/ERAttachment" />
         </antcall>
     </target>
+
     <target name="MooToolsExample.all" depends="examples.embed.check">
     	<property name="wonder.examples.embed.jars" value="false" />
         <antcall target="global.application.${build.action}" >
@@ -1205,6 +1247,7 @@
       		<param name="wo.system.root.bundles.embed" value="${wonder.examples.embed.jars}" />            
         </antcall>
     </target>    
+
     <target name="ERJQueryMobile.all">
         <antcall target="global.framework.${build.action}" >
             <param name="project.principal.class" value="er.jquerymobile.ERJQueryMobile" />
@@ -1213,6 +1256,7 @@
             <param name="wo.external.root.bundles" value="${frameworks.wonder.core}/Ajax/ERAttachment" />
         </antcall>
     </target>    
+
     <target name="JqueryMobileExample.all" depends="examples.embed.check">
     	<property name="wonder.examples.embed.jars" value="false" />
         <antcall target="global.application.${build.action}" >
@@ -1226,6 +1270,7 @@
       		<param name="wo.system.root.bundles.embed" value="${wonder.examples.embed.jars}" />            
         </antcall>
     </target>
+
     <target name="ERQuartzScheduler.all">
         <antcall target="global.framework.${build.action}" >
             <param name="project.principal.class" value="" />
@@ -1234,6 +1279,7 @@
             <param name="wo.external.root.bundles" value="${frameworks.wonder.core}/ERJavaMail" />
         </antcall>
     </target>        
+
     <target name="ERXiss.all">
         <antcall target="global.framework.${build.action}" >
             <param name="project.principal.class" value="" />
@@ -1243,7 +1289,7 @@
         </antcall>
     </target>
     
-     <target name="deployment.embed.check" if="deployment.standalone">
+    <target name="deployment.embed.check" if="deployment.standalone">
         <property name="wonder.deployment.embed.jars" value="true" />
     </target>
     
@@ -1329,11 +1375,11 @@
         to add your own, add a target definition above and choose the correct group below
      -->
 
-    <target name="common.frameworks.all" depends="ERJars.all, JavaWOExtensions.all, ERExtensions.all, Ajax.all, ERDirectToWeb.all, ERNeutralLook.all, ERSelenium.all, WOOgnl.all, ERPrototypes.all, ERPlot.all, ERIndexing.all, ERChronic.all, ERCaptcha.all, ERProfiling.all, EROpenID.all, ERPDFGeneration.all, ERJGroupsSynchronizer.all, ERRest.all, ERAttachment.all, ERTaggable.all, ERJavaMail.all, ERCoreBusinessLogic.all, ERChangeNotificationJMS.all, ERCalendar.all, ERExcelLook.all, BTBusinessLogic.all, JavaMemoryAdaptor.all, JavaNeo4JAdaptor.all, JavaFSAdaptor.all, JavaERJDBCAdaptor.all, WOLips.all, WOJRebel.all, ERMoviesLogic.all, SnapshotExplorer.all, ERJasperReports.all, ERAttributeExtension.all, ERWOAdaptor.all, ERCayenne.all, ERCayenne.all, ERDistribution.all, MooTools.all, ERJQueryMobile.all, ERPersistentSessionStorage.all, ERQuartzScheduler.all, ERXiss.all, ERFirebug.all" />
+    <target name="common.frameworks.all" depends="ERJars.all, JavaWOExtensions.all, ERExtensions.all, Ajax.all, ERDirectToWeb.all, ERNeutralLook.all, ERSelenium.all, WOOgnl.all, ERPrototypes.all, ERPlot.all, ERIndexing.all, ERChronic.all, ERCaptcha.all, ERProfiling.all, EROpenID.all, ERPDFGeneration.all, ERJGroupsSynchronizer.all, ERRest.all, ERAttachment.all, ERTaggable.all, ERJavaMail.all, ERCoreBusinessLogic.all, ERChangeNotificationJMS.all, ERCalendar.all, ERExcelLook.all, BTBusinessLogic.all, JavaMemoryAdaptor.all, JavaNeo4JAdaptor.all, JavaFSAdaptor.all, JavaERJDBCAdaptor.all, WOLips.all, WOJRebel.all, ERMoviesLogic.all, SnapshotExplorer.all, ERJasperReports.all, ERAttributeExtension.all, ERWOAdaptor.all, ERCayenne.all, ERCayenne.all, ERDistribution.all, MooTools.all, ERJQueryMobile.all, ERPersistentSessionStorage.all, ERQuartzScheduler.all, ERXiss.all, ERFirebug.all, ERXPartialBaseModel.all, ERXPartialsExampleModel.all" />
 
     <target name="common.applications.all" depends="BugTracker.all, ERMailer.all, Uber.all, SecretPal.all, ERXTest.all, PluginTest.all, WOTested.all" />
     
-	<target name="common.examples.all" depends="ERSeleniumExample.all, ERIndexingExample.all, ERMovies.all, D2WComponentTour.all, AjaxExample.all, AjaxExample2.all, TickTockMan.all, ERComponentTour.all, ERRestRouteExample.all, Movies.all, ERWebSocketExample.all, ERJasperReportsExample.all, BackgroundTasks.all, ERCayenneExample.all, ERDistributionExampleModel.all, ERDistributionExampleServer.all, ERDistributionExampleClient.all, MooToolsExample.all, ERPDFExamples.all, JqueryMobileExample.all, TextSearchDemo.all" />
+	<target name="common.examples.all" depends="ERSeleniumExample.all, ERIndexingExample.all, ERMovies.all, D2WComponentTour.all, AjaxExample.all, AjaxExample2.all, TickTockMan.all, ERComponentTour.all, ERRestRouteExample.all, Movies.all, ERWebSocketExample.all, ERJasperReportsExample.all, BackgroundTasks.all, ERCayenneExample.all, ERDistributionExampleModel.all, ERDistributionExampleServer.all, ERDistributionExampleClient.all, MooToolsExample.all, ERPDFExamples.all, JqueryMobileExample.all, TextSearchDemo.all, ERXPartialsExampleApp.all" />
 
     <target name="dynareporting.frameworks.all" depends="DRGrouping.all, WRReporting.all" />
     <target name="dynareporting.examples.all" depends="DocsByExample.all, DynaReporter.all" />
diff --git a/Examples/ERXPartials/ERXPartialBaseModel/.classpath b/Examples/ERXPartials/ERXPartialBaseModel/.classpath
index 16fd1aa6e38..7249d87099d 100644
--- a/Examples/ERXPartials/ERXPartialBaseModel/.classpath
+++ b/Examples/ERXPartials/ERXPartialBaseModel/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="Sources"/>
-	<classpathentry kind="src" path="GeneratedEOs"/>
 	<classpathentry kind="con" path="WOFramework/ERExtensions"/>
 	<classpathentry kind="con" path="WOFramework/ERJars"/>
 	<classpathentry kind="con" path="WOFramework/ERPrototypes"/>
diff --git a/Examples/ERXPartials/ERXPartialBaseModel/GeneratedEOs/er/example/erxpartials/model/_GenderType.java b/Examples/ERXPartials/ERXPartialBaseModel/Sources/er/example/erxpartials/model/_GenderType.java
similarity index 81%
rename from Examples/ERXPartials/ERXPartialBaseModel/GeneratedEOs/er/example/erxpartials/model/_GenderType.java
rename to Examples/ERXPartials/ERXPartialBaseModel/Sources/er/example/erxpartials/model/_GenderType.java
index 95d215f88f7..67fd985348d 100644
--- a/Examples/ERXPartials/ERXPartialBaseModel/GeneratedEOs/er/example/erxpartials/model/_GenderType.java
+++ b/Examples/ERXPartials/ERXPartialBaseModel/Sources/er/example/erxpartials/model/_GenderType.java
@@ -1,4 +1,4 @@
-// $LastChangedRevision: 4733 $ DO NOT EDIT.  Make changes to GenderType.java instead.
+// DO NOT EDIT.  Make changes to GenderType.java instead.
 package er.example.erxpartials.model;
 
 import com.webobjects.eoaccess.*;
@@ -36,18 +36,18 @@ public GenderType localInstanceIn(EOEditingContext editingContext) {
   }
 
   public String name() {
-    return (String) storedValueForKey("name");
+    return (String) storedValueForKey(_GenderType.NAME_KEY);
   }
 
   public void setName(String value) {
     if (_GenderType.LOG.isDebugEnabled()) {
     	_GenderType.LOG.debug( "updating name from " + name() + " to " + value);
     }
-    takeStoredValueForKey(value, "name");
+    takeStoredValueForKey(value, _GenderType.NAME_KEY);
   }
 
   public NSArray<er.example.erxpartials.model.Person> persons() {
-    return (NSArray<er.example.erxpartials.model.Person>)storedValueForKey("persons");
+    return (NSArray<er.example.erxpartials.model.Person>)storedValueForKey(_GenderType.PERSONS_KEY);
   }
 
   public NSArray<er.example.erxpartials.model.Person> persons(EOQualifier qualifier) {
@@ -68,7 +68,7 @@ public NSArray<er.example.erxpartials.model.Person> persons(EOQualifier qualifie
         fullQualifier = inverseQualifier;
       }
       else {
-        NSMutableArray qualifiers = new NSMutableArray();
+        NSMutableArray<EOQualifier> qualifiers = new NSMutableArray<EOQualifier>();
         qualifiers.addObject(qualifier);
         qualifiers.addObject(inverseQualifier);
         fullQualifier = new EOAndQualifier(qualifiers);
@@ -89,11 +89,11 @@ public NSArray<er.example.erxpartials.model.Person> persons(EOQualifier qualifie
   }
   
   public void addToPersons(er.example.erxpartials.model.Person object) {
-    includeObjectIntoPropertyWithKey(object, "persons");
+    includeObjectIntoPropertyWithKey(object, _GenderType.PERSONS_KEY);
   }
 
   public void removeFromPersons(er.example.erxpartials.model.Person object) {
-    excludeObjectFromPropertyWithKey(object, "persons");
+    excludeObjectFromPropertyWithKey(object, _GenderType.PERSONS_KEY);
   }
 
   public void addToPersonsRelationship(er.example.erxpartials.model.Person object) {
@@ -104,7 +104,7 @@ public void addToPersonsRelationship(er.example.erxpartials.model.Person object)
     	addToPersons(object);
     }
     else {
-    	addObjectToBothSidesOfRelationshipWithKey(object, "persons");
+    	addObjectToBothSidesOfRelationshipWithKey(object, _GenderType.PERSONS_KEY);
     }
   }
 
@@ -116,27 +116,27 @@ public void removeFromPersonsRelationship(er.example.erxpartials.model.Person ob
     	removeFromPersons(object);
     }
     else {
-    	removeObjectFromBothSidesOfRelationshipWithKey(object, "persons");
+    	removeObjectFromBothSidesOfRelationshipWithKey(object, _GenderType.PERSONS_KEY);
     }
   }
 
   public er.example.erxpartials.model.Person createPersonsRelationship() {
-    EOClassDescription eoClassDesc = EOClassDescription.classDescriptionForEntityName("Person");
+    EOClassDescription eoClassDesc = EOClassDescription.classDescriptionForEntityName( er.example.erxpartials.model.Person.ENTITY_NAME );
     EOEnterpriseObject eo = eoClassDesc.createInstanceWithEditingContext(editingContext(), null);
     editingContext().insertObject(eo);
-    addObjectToBothSidesOfRelationshipWithKey(eo, "persons");
+    addObjectToBothSidesOfRelationshipWithKey(eo, _GenderType.PERSONS_KEY);
     return (er.example.erxpartials.model.Person) eo;
   }
 
   public void deletePersonsRelationship(er.example.erxpartials.model.Person object) {
-    removeObjectFromBothSidesOfRelationshipWithKey(object, "persons");
+    removeObjectFromBothSidesOfRelationshipWithKey(object, _GenderType.PERSONS_KEY);
     editingContext().deleteObject(object);
   }
 
   public void deleteAllPersonsRelationships() {
-    Enumeration objects = persons().immutableClone().objectEnumerator();
+    Enumeration<er.example.erxpartials.model.Person> objects = persons().immutableClone().objectEnumerator();
     while (objects.hasMoreElements()) {
-      deletePersonsRelationship((er.example.erxpartials.model.Person)objects.nextElement());
+      deletePersonsRelationship(objects.nextElement());
     }
   }
 
@@ -148,6 +148,10 @@ public static GenderType createGenderType(EOEditingContext editingContext, Strin
     return eo;
   }
 
+  public static ERXFetchSpecification<GenderType> fetchSpec() {
+    return new ERXFetchSpecification<GenderType>(_GenderType.ENTITY_NAME, null, null, false, true, null);
+  }
+
   public static NSArray<GenderType> fetchAllGenderTypes(EOEditingContext editingContext) {
     return _GenderType.fetchAllGenderTypes(editingContext, null);
   }
@@ -157,9 +161,9 @@ public static NSArray<GenderType> fetchAllGenderTypes(EOEditingContext editingCo
   }
 
   public static NSArray<GenderType> fetchGenderTypes(EOEditingContext editingContext, EOQualifier qualifier, NSArray<EOSortOrdering> sortOrderings) {
-    EOFetchSpecification fetchSpec = new EOFetchSpecification(_GenderType.ENTITY_NAME, qualifier, sortOrderings);
+    ERXFetchSpecification<GenderType> fetchSpec = new ERXFetchSpecification<GenderType>(_GenderType.ENTITY_NAME, qualifier, sortOrderings);
     fetchSpec.setIsDeep(true);
-    NSArray<GenderType> eoObjects = (NSArray<GenderType>)editingContext.objectsWithFetchSpecification(fetchSpec);
+    NSArray<GenderType> eoObjects = fetchSpec.fetchObjects(editingContext);
     return eoObjects;
   }
 
@@ -175,7 +179,7 @@ public static GenderType fetchGenderType(EOEditingContext editingContext, EOQual
       eoObject = null;
     }
     else if (count == 1) {
-      eoObject = (GenderType)eoObjects.objectAtIndex(0);
+      eoObject = eoObjects.objectAtIndex(0);
     }
     else {
       throw new IllegalStateException("There was more than one GenderType that matched the qualifier '" + qualifier + "'.");
@@ -196,7 +200,7 @@ public static GenderType fetchRequiredGenderType(EOEditingContext editingContext
   }
 
   public static GenderType localInstanceIn(EOEditingContext editingContext, GenderType eo) {
-    GenderType localInstance = (eo == null) ? null : (GenderType)EOUtilities.localInstanceOfObject(editingContext, eo);
+    GenderType localInstance = (eo == null) ? null : ERXEOControlUtilities.localInstanceOfObject(editingContext, eo);
     if (localInstance == null && eo != null) {
       throw new IllegalStateException("You attempted to localInstance " + eo + ", which has not yet committed.");
     }
diff --git a/Examples/ERXPartials/ERXPartialBaseModel/GeneratedEOs/er/example/erxpartials/model/_Person.java b/Examples/ERXPartials/ERXPartialBaseModel/Sources/er/example/erxpartials/model/_Person.java
similarity index 82%
rename from Examples/ERXPartials/ERXPartialBaseModel/GeneratedEOs/er/example/erxpartials/model/_Person.java
rename to Examples/ERXPartials/ERXPartialBaseModel/Sources/er/example/erxpartials/model/_Person.java
index 21d5c503c73..e1af5279f5a 100644
--- a/Examples/ERXPartials/ERXPartialBaseModel/GeneratedEOs/er/example/erxpartials/model/_Person.java
+++ b/Examples/ERXPartials/ERXPartialBaseModel/Sources/er/example/erxpartials/model/_Person.java
@@ -1,4 +1,4 @@
-// $LastChangedRevision: 4733 $ DO NOT EDIT.  Make changes to Person.java instead.
+// DO NOT EDIT.  Make changes to Person.java instead.
 package er.example.erxpartials.model;
 
 import com.webobjects.eoaccess.*;
@@ -38,33 +38,33 @@ public Person localInstanceIn(EOEditingContext editingContext) {
   }
 
   public String firstName() {
-    return (String) storedValueForKey("firstName");
+    return (String) storedValueForKey(_Person.FIRST_NAME_KEY);
   }
 
   public void setFirstName(String value) {
     if (_Person.LOG.isDebugEnabled()) {
     	_Person.LOG.debug( "updating firstName from " + firstName() + " to " + value);
     }
-    takeStoredValueForKey(value, "firstName");
+    takeStoredValueForKey(value, _Person.FIRST_NAME_KEY);
   }
 
   public String lastName() {
-    return (String) storedValueForKey("lastName");
+    return (String) storedValueForKey(_Person.LAST_NAME_KEY);
   }
 
   public void setLastName(String value) {
     if (_Person.LOG.isDebugEnabled()) {
     	_Person.LOG.debug( "updating lastName from " + lastName() + " to " + value);
     }
-    takeStoredValueForKey(value, "lastName");
+    takeStoredValueForKey(value, _Person.LAST_NAME_KEY);
   }
 
   public er.example.erxpartials.model.GenderType genderType() {
-    return (er.example.erxpartials.model.GenderType)storedValueForKey("genderType");
+    return (er.example.erxpartials.model.GenderType)storedValueForKey(_Person.GENDER_TYPE_KEY);
   }
   
   public void setGenderType(er.example.erxpartials.model.GenderType value) {
-    takeStoredValueForKey(value, "genderType");
+    takeStoredValueForKey(value, _Person.GENDER_TYPE_KEY);
   }
 
   public void setGenderTypeRelationship(er.example.erxpartials.model.GenderType value) {
@@ -77,10 +77,10 @@ public void setGenderTypeRelationship(er.example.erxpartials.model.GenderType va
     else if (value == null) {
     	er.example.erxpartials.model.GenderType oldValue = genderType();
     	if (oldValue != null) {
-    		removeObjectFromBothSidesOfRelationshipWithKey(oldValue, "genderType");
+    		removeObjectFromBothSidesOfRelationshipWithKey(oldValue, _Person.GENDER_TYPE_KEY);
       }
     } else {
-    	addObjectToBothSidesOfRelationshipWithKey(value, "genderType");
+    	addObjectToBothSidesOfRelationshipWithKey(value, _Person.GENDER_TYPE_KEY);
     }
   }
   
@@ -95,6 +95,10 @@ public static Person createPerson(EOEditingContext editingContext, String firstN
     return eo;
   }
 
+  public static ERXFetchSpecification<Person> fetchSpec() {
+    return new ERXFetchSpecification<Person>(_Person.ENTITY_NAME, null, null, false, true, null);
+  }
+
   public static NSArray<Person> fetchAllPersons(EOEditingContext editingContext) {
     return _Person.fetchAllPersons(editingContext, null);
   }
@@ -104,9 +108,9 @@ public static NSArray<Person> fetchAllPersons(EOEditingContext editingContext, N
   }
 
   public static NSArray<Person> fetchPersons(EOEditingContext editingContext, EOQualifier qualifier, NSArray<EOSortOrdering> sortOrderings) {
-    EOFetchSpecification fetchSpec = new EOFetchSpecification(_Person.ENTITY_NAME, qualifier, sortOrderings);
+    ERXFetchSpecification<Person> fetchSpec = new ERXFetchSpecification<Person>(_Person.ENTITY_NAME, qualifier, sortOrderings);
     fetchSpec.setIsDeep(true);
-    NSArray<Person> eoObjects = (NSArray<Person>)editingContext.objectsWithFetchSpecification(fetchSpec);
+    NSArray<Person> eoObjects = fetchSpec.fetchObjects(editingContext);
     return eoObjects;
   }
 
@@ -122,7 +126,7 @@ public static Person fetchPerson(EOEditingContext editingContext, EOQualifier qu
       eoObject = null;
     }
     else if (count == 1) {
-      eoObject = (Person)eoObjects.objectAtIndex(0);
+      eoObject = eoObjects.objectAtIndex(0);
     }
     else {
       throw new IllegalStateException("There was more than one Person that matched the qualifier '" + qualifier + "'.");
@@ -143,7 +147,7 @@ public static Person fetchRequiredPerson(EOEditingContext editingContext, EOQual
   }
 
   public static Person localInstanceIn(EOEditingContext editingContext, Person eo) {
-    Person localInstance = (eo == null) ? null : (Person)EOUtilities.localInstanceOfObject(editingContext, eo);
+    Person localInstance = (eo == null) ? null : ERXEOControlUtilities.localInstanceOfObject(editingContext, eo);
     if (localInstance == null && eo != null) {
       throw new IllegalStateException("You attempted to localInstance " + eo + ", which has not yet committed.");
     }
diff --git a/Examples/ERXPartials/ERXPartialBaseModel/build.xml b/Examples/ERXPartials/ERXPartialBaseModel/build.xml
deleted file mode 100644
index 8e832c49e6c..00000000000
--- a/Examples/ERXPartials/ERXPartialBaseModel/build.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<project name="ERXPartialBaseModel" default="build" basedir=".">
-	<target name="build" depends="init.build,build.woframework,javaclient,package" />
-
-	<target name="install" depends="init.install,build.woframework,javaclient" />
-
-	<target name="clean" depends="init.properties">
-		<delete dir="bin" />
-		<delete dir="dist" />
-	</target>
-
-    <!-- Target to to (re)create FrontBase database.  -->
-    <target name="fb.recreate"  depends="init.properties">
-        <exec executable="${frontbase.sql.tool}" dir=".">
-            <arg value="-i"/> <!-- Ignore errors -->
-            <arg file="SQL/CreateFrontBase.sql"/>
-            <arg value="${database.name}"/>
-            <arg value="${database.userid}"/>
-            <arg value="${database.password}"/>
-        </exec>
-    </target>
-
-	<!-- property determination  -->
-	<target name="init.properties">
-		<property file="build.properties" />
-
-		<property name="wolips.properties" value="${user.home}${file.separator}Library${file.separator}Application Support${file.separator}WOLips${file.separator}wolips.properties" />
-		<property file="${wolips.properties}" />
-		<condition property="wo.properties.check.failed">
-			<not>
-				<and>
-					<isset property="wo.system.frameworks" />
-					<isset property="wo.local.frameworks" />
-				</and>
-			</not>
-		</condition>
-		<fail message="The properties 'wo.system.frameworks' and 'wo.local.frameworks' must be set. Check that your ${wolips.properties} is correct." if="wo.properties.check.failed" />
-
-		<property name="wo.install.root" value="${wo.local.frameworks}" />
-		
-		<!-- property set for initializing Frontbase database -->
-		<property name="frontbase.sql.tool" value="/Library/FrontBase/bin/sql92" />
-		<property name="database.type" value="FrontBase"/>
-		<property name="database.name" value="ERXPartials"/>
-		<property name="database.userid" value="erxpartial"/>
-		<property name="database.password" value="test"/>
-
-	</target>
-
-	<!-- basic initializations  -->
-	<target name="init.install" depends="init.properties">
-		<tstamp />
-		<property name="dest.dir" value="${wo.install.root}" />
-	</target>
-
-	<target name="init.build" depends="init.properties">
-		<tstamp />
-		<property name="dest.dir" value="dist" />
-	</target>
-
-  <target name="package">
-    <tar destfile="${dest.dir}/${project.name}.tar.gz"
-        compression="gzip"
-        longfile="gnu">
-      <tarfileset dir="${dest.dir}">
-        <include name="${project.name}.framework/**"/>
-      </tarfileset>
-    </tar>
-	</target>
-
-	<!-- woproject tasks -->
-	<target name="build.woframework" depends="compile">
-		<taskdef name="woframework" classname="org.objectstyle.woproject.ant.WOFramework"/>
-
-		<woframework name="${project.name}" destDir="${dest.dir}" customInfoPListContent="${customInfoPListContent}" principalClass="${principalClass}" eoAdaptorClassName="${eoAdaptorClassName}" javaVersion="${javaVersion}" cfbundleversion="${cfBundleVersion}" cfbundleshortversion="${cfBundleShortVersion}" cfbundleID="${cfBundleID}">
-			<classes dir="${classes.dir}">
-				<includesfile name="woproject/classes.include.patternset" />
-				<excludesfile name="woproject/classes.exclude.patternset" />
-				<exclude if="javaClient" name="**/client/**/*.*"/>
-			</classes>
-
-			<wsresources dir=".">
-				<includesfile name="woproject/wsresources.include.patternset" />
-				<excludesfile name="woproject/wsresources.exclude.patternset" />
-			</wsresources>
-
-			<resources dir=".">
-				<includesfile name="woproject/resources.include.patternset" />
-				<excludesfile name="woproject/resources.exclude.patternset" />
-				<exclude if="javaClient" name="**/client/**/*.*"/>
-			</resources>
-
-			<lib dir="Libraries">
-				<include name="*.jar" />
-			</lib>
-		</woframework>
-	</target>
-	
-	<target name="javaclient" if="javaClient" depends="build.woframework">
-		<mkdir dir="${dest.dir}/${project.name}.framework/WebServerResources/Java" />
-		<jar basedir="${classes.dir}" excludes="**/server/**/*.*, **/server/**/" jarfile="${dest.dir}/${project.name}.framework/WebServerResources/Java/${project.name}.jar"/>
-	</target>
-
-	<target name="compile" depends="init.build">
-		<taskdef name="wocompile" classname="org.objectstyle.woproject.ant.WOCompile" />
-
-		<mkdir dir="bin" />
-		<wocompile srcdir="Sources" destdir="bin">
-			<frameworks root="ProjectLocal" embed="false" eclipse="true" />
-			<frameworks root="External" embed="false" eclipse="true" />
-			<frameworks root="Local" embed="false" eclipse="true" />
-			<frameworks root="User" embed="false" eclipse="true" />
-			<frameworks root="System" embed="false" eclipse="true" />
-			<frameworks root="Network" embed="false" eclipse="true" />
-			<classpath>
-				<fileset dir="Libraries">
-					<include name="*.jar" />
-				</fileset>
-				<fileset dir="${wo.extensions}">
-					<include name="*.jar" />
-				</fileset>
-			</classpath>
-		</wocompile>
-	</target>
-</project>
diff --git a/Examples/ERXPartials/ERXPartialBaseModel/build.xml b/Examples/ERXPartials/ERXPartialBaseModel/build.xml
new file mode 120000
index 00000000000..0f8b528f5ed
--- /dev/null
+++ b/Examples/ERXPartials/ERXPartialBaseModel/build.xml
@@ -0,0 +1 @@
+../../../Build/build/build-framework-template.xml
\ No newline at end of file
diff --git a/Examples/ERXPartials/ERXPartialsExampleApp/.classpath b/Examples/ERXPartials/ERXPartialsExampleApp/.classpath
index aa288cb2893..15f2796c838 100644
--- a/Examples/ERXPartials/ERXPartialsExampleApp/.classpath
+++ b/Examples/ERXPartials/ERXPartialsExampleApp/.classpath
@@ -18,15 +18,14 @@
 	<classpathentry kind="con" path="WOFramework/WOOgnl"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="WOFramework/Ajax"/>
-	<classpathentry kind="con" path="WOFramework/ERXPartialBaseModel"/>
-	<classpathentry kind="con" path="WOFramework/ERXPartialsExampleModel"/>
 	<classpathentry kind="con" path="WOFramework/WOLips"/>
-	<classpathentry kind="con" path="WOFramework/ERDirectToRest"/>
 	<classpathentry kind="con" path="WOFramework/ERModernLook"/>
 	<classpathentry kind="con" path="WOFramework/ERModernDefaultSkin"/>
 	<classpathentry kind="con" path="WOFramework/ERCoolComponents"/>
 	<classpathentry kind="con" path="WOFramework/ERRest"/>
 	<classpathentry kind="con" path="WOFramework/ERModernDirectToWeb"/>
 	<classpathentry kind="con" path="WOFramework/H2PlugIn"/>
+	<classpathentry kind="con" path="WOFramework/ERXPartialsExampleModel"/>
+	<classpathentry kind="con" path="WOFramework/ERXPartialBaseModel"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Examples/ERXPartials/ERXPartialsExampleApp/build.xml b/Examples/ERXPartials/ERXPartialsExampleApp/build.xml
deleted file mode 100644
index 9c6a21cd4ed..00000000000
--- a/Examples/ERXPartials/ERXPartialsExampleApp/build.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<project name="ERXPartialsExampleApp" default="build" basedir=".">
-	<target name="build" depends="init.build,build.woapp,javaclient,ssdd,war,split,package" />
-
-	<target name="install" depends="init.install,build.woapp,javaclient,ssdd,war,split,package" />
-
-	<target name="clean" depends="init.properties">
-		<delete dir="bin" />
-		<delete dir="dist" />
-	</target>
-
-	<!-- basic initializations  -->
-	<target name="init.install" depends="init.properties">
-		<tstamp />
-		<property name="dest.dir" value="${wo.apps.root}" />
-	</target>
-
-	<target name="init.build" depends="init.properties">
-		<tstamp />
-		<property name="dest.dir" value="dist" />
-	</target>
-	
-	<!-- property determination  -->
-	<target name="init.properties">
-		<property file="build.properties" />
-
-		<property name="wolips.properties" value="${user.home}${file.separator}Library${file.separator}Application Support${file.separator}WOLips${file.separator}wolips.properties" />
-		<property file="${wolips.properties}" />
-		<condition property="wo.properties.check.failed">
-			<not>
-				<and>
-					<isset property="wo.system.frameworks" />
-					<isset property="wo.local.frameworks" />
-				</and>
-			</not>
-		</condition>
-		<fail message="The properties 'wo.system.frameworks' and 'wo.local.frameworks' must be set. Check that your ${wolips.properties} is correct." if="wo.properties.check.failed" />
-
-		<property name="build.app.name" value="${project.name}" />
-		<property name="build.app.name.lowercase" value="${project.name.lowercase}" />
-	</target>
-
-	<!-- This copies webserver resources from app.woa's embedded frameworks into split install bundle -->
-	<target name="split" description="Adds embedded framework webserver resources to the split install bundle by copying from deployment build bundle" unless="servletDeployment">
-		<property name="wsdest.dir" value="${dest.dir}/Split" />
-		<mkdir dir="${wsdest.dir}"/>
-		<copy todir="${wsdest.dir}/WebObjects/${build.app.name}.woa" verbose="true">
-			<fileset dir="${dest.dir}/${build.app.name}.woa/Contents">
-				<include name="Frameworks/*.framework/WebServerResources/**"/>
-			</fileset>
-			<fileset dir="${dest.dir}/${build.app.name}.woa">
-				<include name="Contents/WebServerResources/**"/>
-			</fileset>
-		</copy>
-	</target>
-
-  <target name="package" unless="servletDeployment">
-    <tar destfile="${dest.dir}/${build.app.name}-Application.tar.gz"
-        compression="gzip"
-        longfile="gnu">
-      <tarfileset dir="${dest.dir}" mode="750">
-        <include name="${build.app.name}.woa/${build.app.name}"/>
-      </tarfileset>
-      <tarfileset dir="${dest.dir}">
-        <exclude name="${build.app.name}.woa/${build.app.name}"/>
-        <include name="${build.app.name}.woa/**"/>
-      </tarfileset>
-    </tar>
-    <tar destfile="${dest.dir}/${build.app.name}-WebServerResources.tar.gz"
-        compression="gzip"
-        basedir="${wsdest.dir}/WebObjects"
-        longfile="gnu"
-        includes="${build.app.name}.woa/**">
-    </tar>
-	</target>
-
-	<!-- woproject tasks -->
-	<target name="build.woapp" depends="compile">
-		<taskdef name="woapplication" classname="org.objectstyle.woproject.ant.WOApplication"/>
-
-		<woapplication name="${build.app.name}" frameworksBaseURL="/WebObjects/${project.name}.woa/Frameworks" destDir="${dest.dir}" customInfoPListContent="${customInfoPListContent}" principalClass="${principalClass}" webXML="${webXML}" webXML_CustomContent="${webXML_CustomContent}" servletAdaptor="er.extensions.jspservlet.ERXServletAdaptor">
-			<classes dir="${classes.dir}">
-				<includesfile name="woproject/classes.include.patternset" />
-				<excludesfile name="woproject/classes.exclude.patternset" />
-			</classes>
-
-			<wsresources dir=".">
-				<includesfile name="woproject/wsresources.include.patternset" />
-				<excludesfile name="woproject/wsresources.exclude.patternset" />
-			</wsresources>
-
-			<resources dir=".">
-				<includesfile name="woproject/resources.include.patternset" />
-				<excludesfile name="woproject/resources.exclude.patternset" />
-			</resources>
-
-			<frameworks root="ProjectLocal" embed="${embed.ProjectLocal}" eclipse="true" />
-			<frameworks root="External" embed="${embed.External}" eclipse="true" />
-			<frameworks root="Local" embed="${embed.Local}" eclipse="true" />
-			<frameworks root="User" embed="${embed.User}" eclipse="true" />
-			<frameworks root="System" embed="${embed.System}" eclipse="true" />
-			<frameworks root="Network" embed="${embed.Network}" eclipse="true" />
-
-			<lib dir="Libraries">
-				<include name="*.jar" />
-			</lib>
-		</woapplication>
-	</target>
-	
-	<target name="javaclient" if="javaClient" depends="build.woapp">
-		<mkdir dir="${dest.dir}/${build.app.name}.woa/Contents/WebServerResources/Java" />
-		<jar basedir="${classes.dir}" includes="**/client/**/*.class,**/common/**/*.class" jarfile="${dest.dir}/${build.app.name}.woa/Contents/WebServerResources/Java/${build.app.name}.jar"/>
-
-		<!-- project user.d2wmodel file (D2JC only) -->
-		<copy file="user.d2wmodel" tofile="${dest.dir}/${build.app.name}.woa/Contents/Resources/user.d2wmodel"/>
-	</target>
-
-	<target name="war" if="servletDeployment" depends="ssdd">
-		<war destfile="${dest.dir}/${build.app.name}.war" webxml="${dest.dir}/${build.app.name}/WEB-INF/web.xml">
-			<fileset dir="${dest.dir}/${build.app.name}">
-				<include name="**" />
-			</fileset>
-		</war>
-	</target>
-
-	<!-- To use this target
-    	1) create the LICENSE in your project directory
-    	2) add JavaWOJSPServlet in your WOFrameworks build path
-    	3) set servlet deployment to true in WOLips Properties
-    -->
-	<target name="ssdd" if="servletDeployment" depends="build.woapp">
-		<mkdir dir="${dest.dir}/${build.app.name}/WEB-INF/classes" />
-		<mkdir dir="${dest.dir}/${build.app.name}/WEB-INF/tlds" />
-		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/">
-			<fileset dir="${dest.dir}/${build.app.name}.woa/Contents/">
-				<include name="web.xml" />
-			</fileset>
-		</copy>
-		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/">
-			<fileset dir="..">
-				<include name="LICENSE" />
-			</fileset>
-		</copy>
-		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/">
-			<fileset dir="${dest.dir}">
-				<include name="${build.app.name}.woa/**" />
-			</fileset>
-		</copy>
-		<!-- copy the frameworks to the WEBINFROOT/Library directory -->
-		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/">
-			<fileset dir="${dest.dir}/${build.app.name}.woa/Contents">
-				<include name="Library/**" />
-			</fileset>
-		</copy>
-		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/">
-			<fileset dir="${dest.dir}/${build.app.name}.woa">
-				<include name="Resources/**" />
-			</fileset>
-		</copy>
-		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/lib/">
-			<fileset dir="${dest.dir}/${build.app.name}/WEB-INF">
-				<include name="**/Resources/**/*.jar" />
-			</fileset>
-			<mapper type="flatten" />
-		</copy>
-
-		<!--  Get the necessary Frameworks from the webobjects system root instead of the project wrapper -->
-		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/lib" file="${wo.system.frameworks}/JavaWOJSPServlet.framework/WebServerResources/Java/JavaWOJSPServlet_client.jar" />
-
-		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/tlds">
-			<fileset dir="${wo.system.frameworks}/JavaWOJSPServlet.framework/Resources/">
-				<include name="WOtaglib_1_0.tld" />
-			</fileset>
-		</copy>
-
-		<!-- the WebObject Extensions -->
-		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/lib">
-			<fileset dir="${wo.extensions}">
-				<include name="*.jar" />
-				<exclude name="servlet.jar" />
-			</fileset>
-			<mapper type="flatten" />
-		</copy>
-		
-		<!-- the Java Client Client-Side Classes 	  -->
-		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/${build.app.name}.woa/Contents/WebServerResources/Java">
-			<fileset dir="${wo.local.frameworks}"> 
-				<include name="**/WebServerResources/Java/*.jar"/> 
-			</fileset> 
-			<mapper type="flatten"/>
-		</copy>
-		
-		<!-- fix the Macos*ClassPath.txt files  -->
-		<replaceregexp file="${dest.dir}/${build.app.name}/WEB-INF/${build.app.name}.woa/Contents/MacOS/MacOSClassPath.txt" match="APPROOT/Resources/Java/${build.app.name.lowercase}.jar" replace="APPROOT/${build.app.name}.woa/Contents/Resources/Java/${build.app.name.lowercase}.jar" byline="true" />
-		<replaceregexp file="${dest.dir}/${build.app.name}/WEB-INF/${build.app.name}.woa/Contents/MacOS/MacOSXServerClassPath.txt" match="APPROOT/Resources/Java/${build.app.name.lowercase}.jar" replace="APPROOT/${build.app.name}.woa/Contents/Resources/Java/${build.app.name.lowercase}.jar" byline="true" />
-
-		<!-- fix the web.xml file:  the app itself needs build.app.name/Contents -->
-		<replaceregexp file="${dest.dir}/${build.app.name}/WEB-INF/web.xml" match="WEBINFROOT/Resources/Java/${build.app.name.lowercase}.jar" replace="WEBINFROOT/${build.app.name}.woa/Contents/Resources/Java/${build.app.name.lowercase}.jar" byline="true" />
-
-		<!-- fix the web.xml file to remove the extra Frameworks/ directory level for the frameworks -->
-		<replaceregexp file="${dest.dir}/${build.app.name}/WEB-INF/web.xml" match="WEBINFROOT/Frameworks//" replace="WEBINFROOT/" byline="true" />
-	</target>
-
-	<target name="compile" depends="init.properties">
-		<taskdef name="wocompile" classname="org.objectstyle.woproject.ant.WOCompile" />
-
-		<mkdir dir="bin" />
-		<wocompile srcdir="Sources" destdir="bin">
-			<frameworks root="ProjectLocal" embed="false" eclipse="true" />
-			<frameworks root="External" embed="false" eclipse="true" />
-			<frameworks root="Local" embed="false" eclipse="true" />
-			<frameworks root="User" embed="false" eclipse="true" />
-			<frameworks root="System" embed="false" eclipse="true" />
-			<frameworks root="Network" embed="false" eclipse="true" />
-			<classpath>
-				<fileset dir="Libraries">
-					<include name="*.jar" />
-				</fileset>
-				<fileset dir="${wo.extensions}">
-					<include name="*.jar" />
-				</fileset>
-			</classpath>
-		</wocompile>
-	</target>
-</project>
diff --git a/Examples/ERXPartials/ERXPartialsExampleApp/build.xml b/Examples/ERXPartials/ERXPartialsExampleApp/build.xml
new file mode 120000
index 00000000000..99b811acf26
--- /dev/null
+++ b/Examples/ERXPartials/ERXPartialsExampleApp/build.xml
@@ -0,0 +1 @@
+../../../Build/build/build-examples-template.xml
\ No newline at end of file
diff --git a/Examples/ERXPartials/ERXPartialsExampleModel/.classpath b/Examples/ERXPartials/ERXPartialsExampleModel/.classpath
index 6d733851ded..85d7723fdf2 100644
--- a/Examples/ERXPartials/ERXPartialsExampleModel/.classpath
+++ b/Examples/ERXPartials/ERXPartialsExampleModel/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="Sources"/>
-	<classpathentry kind="src" path="GeneratedEOs"/>
 	<classpathentry kind="con" path="WOFramework/ERExtensions"/>
 	<classpathentry kind="con" path="WOFramework/ERJars"/>
 	<classpathentry kind="con" path="WOFramework/ERPrototypes"/>
diff --git a/Examples/ERXPartials/ERXPartialsExampleModel/GeneratedEOs/er/example/erxpartials/model/_Company.java b/Examples/ERXPartials/ERXPartialsExampleModel/Sources/er/example/erxpartials/model/_Company.java
similarity index 100%
rename from Examples/ERXPartials/ERXPartialsExampleModel/GeneratedEOs/er/example/erxpartials/model/_Company.java
rename to Examples/ERXPartials/ERXPartialsExampleModel/Sources/er/example/erxpartials/model/_Company.java
diff --git a/Examples/ERXPartials/ERXPartialsExampleModel/GeneratedEOs/er/example/erxpartials/model/_Department.java b/Examples/ERXPartials/ERXPartialsExampleModel/Sources/er/example/erxpartials/model/_Department.java
similarity index 100%
rename from Examples/ERXPartials/ERXPartialsExampleModel/GeneratedEOs/er/example/erxpartials/model/_Department.java
rename to Examples/ERXPartials/ERXPartialsExampleModel/Sources/er/example/erxpartials/model/_Department.java
diff --git a/Examples/ERXPartials/ERXPartialsExampleModel/GeneratedEOs/er/example/erxpartials/model/_EmployeeType.java b/Examples/ERXPartials/ERXPartialsExampleModel/Sources/er/example/erxpartials/model/_EmployeeType.java
similarity index 100%
rename from Examples/ERXPartials/ERXPartialsExampleModel/GeneratedEOs/er/example/erxpartials/model/_EmployeeType.java
rename to Examples/ERXPartials/ERXPartialsExampleModel/Sources/er/example/erxpartials/model/_EmployeeType.java
diff --git a/Examples/ERXPartials/ERXPartialsExampleModel/GeneratedEOs/er/example/erxpartials/model/_Partial_AuthenticatedPerson.java b/Examples/ERXPartials/ERXPartialsExampleModel/Sources/er/example/erxpartials/model/_Partial_AuthenticatedPerson.java
similarity index 100%
rename from Examples/ERXPartials/ERXPartialsExampleModel/GeneratedEOs/er/example/erxpartials/model/_Partial_AuthenticatedPerson.java
rename to Examples/ERXPartials/ERXPartialsExampleModel/Sources/er/example/erxpartials/model/_Partial_AuthenticatedPerson.java
diff --git a/Examples/ERXPartials/ERXPartialsExampleModel/GeneratedEOs/er/example/erxpartials/model/_Partial_EmployeePerson.java b/Examples/ERXPartials/ERXPartialsExampleModel/Sources/er/example/erxpartials/model/_Partial_EmployeePerson.java
similarity index 100%
rename from Examples/ERXPartials/ERXPartialsExampleModel/GeneratedEOs/er/example/erxpartials/model/_Partial_EmployeePerson.java
rename to Examples/ERXPartials/ERXPartialsExampleModel/Sources/er/example/erxpartials/model/_Partial_EmployeePerson.java
diff --git a/Examples/ERXPartials/ERXPartialsExampleModel/build.xml b/Examples/ERXPartials/ERXPartialsExampleModel/build.xml
deleted file mode 100644
index 6b9f43fa1c8..00000000000
--- a/Examples/ERXPartials/ERXPartialsExampleModel/build.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<project name="ERXPartialsExampleModel" default="build" basedir=".">
-	<target name="build" depends="init.build,build.woframework,javaclient,package" />
-
-	<target name="install" depends="init.install,build.woframework,javaclient" />
-
-	<target name="clean" depends="init.properties">
-		<delete dir="bin" />
-		<delete dir="dist" />
-	</target>
-
-	<!-- property determination  -->
-	<target name="init.properties">
-		<property file="build.properties" />
-
-		<property name="wolips.properties" value="${user.home}${file.separator}Library${file.separator}Application Support${file.separator}WOLips${file.separator}wolips.properties" />
-		<property file="${wolips.properties}" />
-		<condition property="wo.properties.check.failed">
-			<not>
-				<and>
-					<isset property="wo.system.frameworks" />
-					<isset property="wo.local.frameworks" />
-				</and>
-			</not>
-		</condition>
-		<fail message="The properties 'wo.system.frameworks' and 'wo.local.frameworks' must be set. Check that your ${wolips.properties} is correct." if="wo.properties.check.failed" />
-
-		<property name="wo.install.root" value="${wo.local.frameworks}" />
-	</target>
-
-	<!-- basic initializations  -->
-	<target name="init.install" depends="init.properties">
-		<tstamp />
-		<property name="dest.dir" value="${wo.install.root}" />
-	</target>
-
-	<target name="init.build" depends="init.properties">
-		<tstamp />
-		<property name="dest.dir" value="dist" />
-	</target>
-
-  <target name="package">
-    <tar destfile="${dest.dir}/${project.name}.tar.gz"
-        compression="gzip"
-        longfile="gnu">
-      <tarfileset dir="${dest.dir}">
-        <include name="${project.name}.framework/**"/>
-      </tarfileset>
-    </tar>
-	</target>
-
-	<!-- woproject tasks -->
-	<target name="build.woframework" depends="compile">
-		<taskdef name="woframework" classname="org.objectstyle.woproject.ant.WOFramework"/>
-
-		<woframework name="${project.name}" destDir="${dest.dir}" customInfoPListContent="${customInfoPListContent}" principalClass="${principalClass}" eoAdaptorClassName="${eoAdaptorClassName}" javaVersion="${javaVersion}" cfbundleversion="${cfBundleVersion}" cfbundleshortversion="${cfBundleShortVersion}" cfbundleID="${cfBundleID}">
-			<classes dir="${classes.dir}">
-				<includesfile name="woproject/classes.include.patternset" />
-				<excludesfile name="woproject/classes.exclude.patternset" />
-				<exclude if="javaClient" name="**/client/**/*.*"/>
-			</classes>
-
-			<wsresources dir=".">
-				<includesfile name="woproject/wsresources.include.patternset" />
-				<excludesfile name="woproject/wsresources.exclude.patternset" />
-			</wsresources>
-
-			<resources dir=".">
-				<includesfile name="woproject/resources.include.patternset" />
-				<excludesfile name="woproject/resources.exclude.patternset" />
-				<exclude if="javaClient" name="**/client/**/*.*"/>
-			</resources>
-
-			<lib dir="Libraries">
-				<include name="*.jar" />
-			</lib>
-		</woframework>
-	</target>
-	
-	<target name="javaclient" if="javaClient" depends="build.woframework">
-		<mkdir dir="${dest.dir}/${project.name}.framework/WebServerResources/Java" />
-		<jar basedir="${classes.dir}" excludes="**/server/**/*.*, **/server/**/" jarfile="${dest.dir}/${project.name}.framework/WebServerResources/Java/${project.name}.jar"/>
-	</target>
-
-	<target name="compile" depends="init.build">
-		<taskdef name="wocompile" classname="org.objectstyle.woproject.ant.WOCompile" />
-
-		<mkdir dir="bin" />
-		<wocompile srcdir="Sources" destdir="bin">
-			<frameworks root="ProjectLocal" embed="false" eclipse="true" />
-			<frameworks root="External" embed="false" eclipse="true" />
-			<frameworks root="Local" embed="false" eclipse="true" />
-			<frameworks root="User" embed="false" eclipse="true" />
-			<frameworks root="System" embed="false" eclipse="true" />
-			<frameworks root="Network" embed="false" eclipse="true" />
-			<classpath>
-				<fileset dir="Libraries">
-					<include name="*.jar" />
-				</fileset>
-				<fileset dir="${wo.extensions}">
-					<include name="*.jar" />
-				</fileset>
-			</classpath>
-		</wocompile>
-	</target>
-</project>
diff --git a/Examples/ERXPartials/ERXPartialsExampleModel/build.xml b/Examples/ERXPartials/ERXPartialsExampleModel/build.xml
new file mode 120000
index 00000000000..0f8b528f5ed
--- /dev/null
+++ b/Examples/ERXPartials/ERXPartialsExampleModel/build.xml
@@ -0,0 +1 @@
+../../../Build/build/build-framework-template.xml
\ No newline at end of file