Project WONDER

Update of /cvsroot/wonder/Wonder/Build/build
In directory sc8-pr-cvs1:/tmp/cvs-serv1444

Modified Files:
	generic.xml 
Log Message:
fixed several typos.

gee, just who came up with the name woognl...

Index: generic.xml
===================================================================
RCS file: /cvsroot/wonder/Wonder/Build/build/generic.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** generic.xml	28 Apr 2003 16:31:02 -0000	1.20
--- generic.xml	29 Apr 2003 20:56:24 -0000	1.21
***************
*** 34,38 ****
  		-Duse.svgobjects=true \
  		-Duse.validity=true \
! 		-Duse.woogln=true \
  		-Duse.grouping=true \
  		-Duse.reporting=true \
--- 34,38 ----
  		-Duse.svgobjects=true \
  		-Duse.validity=true \
! 		-Duse.woognl=true \
  		-Duse.grouping=true \
  		-Duse.reporting=true \
***************
*** 122,126 ****
  
              <!-- set this if you want to use WOOgnl, or leave out if not -->
!             <param name="use.woogln" value="true" />
  
              <!-- set this if you want to use MySQL, or leave out if not -->
--- 122,126 ----
  
              <!-- set this if you want to use WOOgnl, or leave out if not -->
!             <param name="use.woognl" value="true" />
  
              <!-- set this if you want to use MySQL, or leave out if not -->
***************
*** 241,245 ****
              </frameworks>
              <frameworks root="${wonder.lib.root}" if="use.woognl"> 
!                 <include name="WOOngl.framework" />
              </frameworks>
              <frameworks root="${wonder.lib.root}" if="use.grouping"> 
--- 241,245 ----
              </frameworks>
              <frameworks root="${wonder.lib.root}" if="use.woognl"> 
!                 <include name="WOOgnl.framework" />
              </frameworks>
              <frameworks root="${wonder.lib.root}" if="use.grouping"> 
***************
*** 398,402 ****
              </frameworks>
              <frameworks root="${wonder.lib.root}" if="use.woognl"> 
!                 <include name="WOOngl.framework" />
              </frameworks>
              <frameworks root="${wonder.lib.root}" if="use.grouping"> 
--- 398,402 ----
              </frameworks>
              <frameworks root="${wonder.lib.root}" if="use.woognl"> 
!                 <include name="WOOgnl.framework" />
              </frameworks>
              <frameworks root="${wonder.lib.root}" if="use.grouping"> 
***************
*** 645,650 ****
--- 645,652 ----
              <param name="use.wonder.d2w" value="true" />
              <param name="use.wonder.logic" value="true" />
+             <param name="use.woognl" value="true" />
              <param name="use.mysql" value="true" />
              <param name="use.additional.framework.1" value="BTBusinessLogic.framework" />
+             <param name="use.additional.framework.2" value="C9Extensions.framework" />
          </antcall>
      </target>

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/com/webobjects/directtoweb
In directory sc8-pr-cvs1:/tmp/cvs-serv28709

Modified Files:
	ERD2WUtilities.java 
Log Message:
- fixed a problem when you want to edit an object that is *not* shared.
- renamed and changed scope of local methods, added ERDEditButton and ERDInspectPage to use method
- now uses d2w key "useNestedContext" so embedded components can be told to use nested contexts (>wo 5.21)


Index: ERD2WUtilities.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/com/webobjects/directtoweb/ERD2WUtilities.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ERD2WUtilities.java	28 Apr 2003 08:15:03 -0000	1.6
--- ERD2WUtilities.java	29 Apr 2003 19:38:21 -0000	1.7
***************
*** 89,115 ****
      */
      public static EOEnterpriseObject localInstanceFromObjectWithD2WContext(EOEnterpriseObject eo, D2WContext d2wContext) {
!         if (eo.editingContext() == null) {
!             throw new NullPointerException("localInstanceFromObjectWithD2WContext: the argument eo must have a valid EOEditingContext: eo.editingContext() != null");
!         }
          EOEnterpriseObject localObject = eo;
!         if (ERXExtensions.isNewObject(eo)) {
!             //do nothing, a newObject cannot be faulted into another EC!
!         } else if ("edit".equals(d2wContext.valueForKey("task"))) {
!             //create a new nested EC and fault the object into it
!             EOEditingContext ec = ERXEC.newEditingContext(eo.editingContext());
!             //FIXME: we cannot use childEc's because if the EO is not saved to the DB
!             //then the EO is not displayed as EO if one uses for example a ERD2WEditToOneRelationship
!             //component: the new EO will not be displayed in the list
!             //EOEditingContext ec = ERXEC.newEditingContext();
!             ec.setSharedEditingContext(null);
!             localObject = EOUtilities.localInstanceOfObject(ec, eo);
          } else {
!             //create a new Peer EC and fault the object into it
!             //this is done regardeless if the object's editingContext is
!             //a sharedec or not.
!             EOEditingContext ec = ERXEC.newEditingContext();
!             ec.setSharedEditingContext(null);
!             localObject = EOUtilities.localInstanceOfObject(ec, eo);
          }
          return localObject;
      }
--- 89,106 ----
      */
      public static EOEnterpriseObject localInstanceFromObjectWithD2WContext(EOEnterpriseObject eo, D2WContext d2wContext) {
!         EOEditingContext ec = eo.editingContext();
!         if(ec == null) throw new IllegalStateException("EC can't be null in localinstance");
          EOEnterpriseObject localObject = eo;
!         if(ERXProperties.webObjectsVersionAsDouble() < 5.21d && ERXExtensions.isNewObject(localObject)) {
!             // do nothing as we can't localInstance anything here
          } else {
!             boolean nest = d2wContext != null && ERXValueUtilities.booleanValue(d2wContext.valueForKey("useNestedEditingContext"));
!             EOEditingContext newEc = ERXEC.newEditingContext(nest ? ec : ec.parentObjectStore());
!             if(ec instanceof EOSharedEditingContext) {
!                 newEc.setSharedEditingContext(null);
!             }
!             localObject = EOUtilities.localInstanceOfObject(newEc, eo);
          }
+ 
          return localObject;
      }

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb
In directory sc8-pr-cvs1:/tmp/cvs-serv28549

Modified Files:
	ERD2WInspectPage.java ERD2WListPage.java ERDEditButton.java 
Log Message:
- fixed a problem when you want to edit an object that is *not* shared.
- renamed and changed scope of local methods, added ERDEditButton and ERDInspectPage to use method
- now uses d2w key "useNestedContext" so embedded components can be told to use nested contexts (>wo 5.21)


Index: ERD2WInspectPage.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb/ERD2WInspectPage.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ERD2WInspectPage.java	28 Apr 2003 06:05:53 -0000	1.21
--- ERD2WInspectPage.java	29 Apr 2003 19:38:05 -0000	1.22
***************
*** 60,64 ****
          if (previousPage() == null) {
              EditPageInterface editPage=D2W.factory().editPageForEntityNamed(object().entityName(),session());
!             editPage.setObject(object());
              editPage.setNextPage(nextPage());
              returnPage = (WOComponent)editPage;
--- 60,64 ----
          if (previousPage() == null) {
              EditPageInterface editPage=D2W.factory().editPageForEntityNamed(object().entityName(),session());
!             editPage.setObject(ERD2WUtilities.localInstanceFromObjectWithD2WContext(object(), d2wContext()));
              editPage.setNextPage(nextPage());
              returnPage = (WOComponent)editPage;

Index: ERD2WListPage.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb/ERD2WListPage.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ERD2WListPage.java	28 Apr 2003 06:08:56 -0000	1.18
--- ERD2WListPage.java	29 Apr 2003 19:38:05 -0000	1.19
***************
*** 254,263 ****
              EditPageInterface epi=(EditPageInterface)D2W.factory().pageForConfigurationNamed(editConfigurationName,session());
  
!             epi.setObject(localInstance());
              epi.setNextPage(context().page());
              result = (WOComponent)epi;
          } else {
!             EditPageInterface editpageinterface = D2W.factory().editPageForEntityNamed(localInstance().entityName(), session());
!             editpageinterface.setObject(localInstance());
              editpageinterface.setNextPage(context().page());
              result = (WOComponent)editpageinterface;
--- 254,263 ----
              EditPageInterface epi=(EditPageInterface)D2W.factory().pageForConfigurationNamed(editConfigurationName,session());
  
!             epi.setObject(localInstanceOfObject());
              epi.setNextPage(context().page());
              result = (WOComponent)epi;
          } else {
!             EditPageInterface editpageinterface = D2W.factory().editPageForEntityNamed(object().entityName(), session());            
!             editpageinterface.setObject(localInstanceOfObject());
              editpageinterface.setNextPage(context().page());
              result = (WOComponent)editpageinterface;
***************
*** 272,281 ****
          if(inspectConfigurationName!=null) {
              InspectPageInterface ipi=(InspectPageInterface)D2W.factory().pageForConfigurationNamed(inspectConfigurationName,session());
!             ipi.setObject(localInstance());
              ipi.setNextPage(context().page());
              return (WOComponent)ipi;
          } else {
!             InspectPageInterface inspectpageinterface = D2W.factory().inspectPageForEntityNamed(localInstance().entityName(), session());
!             inspectpageinterface.setObject(localInstance());
              inspectpageinterface.setNextPage(context().page());
              return (WOComponent)inspectpageinterface;
--- 272,281 ----
          if(inspectConfigurationName!=null) {
              InspectPageInterface ipi=(InspectPageInterface)D2W.factory().pageForConfigurationNamed(inspectConfigurationName,session());
!             ipi.setObject(object());
              ipi.setNextPage(context().page());
              return (WOComponent)ipi;
          } else {
!             InspectPageInterface inspectpageinterface = D2W.factory().inspectPageForEntityNamed(object().entityName(), session());
!             inspectpageinterface.setObject(object());
              inspectpageinterface.setNextPage(context().page());
              return (WOComponent)inspectpageinterface;
***************
*** 283,287 ****
      }
  
!     private EOEnterpriseObject localInstance() {
          return ERD2WUtilities.localInstanceFromObjectWithD2WContext(object(), d2wContext());
      }
--- 283,287 ----
      }
  
!     protected EOEnterpriseObject localInstanceOfObject() {
          return ERD2WUtilities.localInstanceFromObjectWithD2WContext(object(), d2wContext());
      }
***************
*** 299,306 ****
      public String formTargetJavaScriptUrl() {
          if (_formTargetJavaScriptUrl==null) {
!             _formTargetJavaScriptUrl= application().resourceManager().urlForResourceNamed("formTarget.js",
!                                                                                           "ERDirectToWeb",
!                                                                                           null,
!                                                                                           context().request());
          }
          return _formTargetJavaScriptUrl;
--- 299,303 ----
      public String formTargetJavaScriptUrl() {
          if (_formTargetJavaScriptUrl==null) {
!             _formTargetJavaScriptUrl= application().resourceManager().urlForResourceNamed("formTarget.js", "ERDirectToWeb", null, context().request());
          }
          return _formTargetJavaScriptUrl;

Index: ERDEditButton.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb/ERDEditButton.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ERDEditButton.java	7 Mar 2003 18:48:02 -0000	1.3
--- ERDEditButton.java	29 Apr 2003 19:38:06 -0000	1.4
***************
*** 25,33 ****
  
      public D2WContext d2wContext() { return (D2WContext)valueForBinding("d2wContext"); }
      
      // Assuming that object() is the eo
      public WOComponent edit() {
!         EOEditingContext context = er.extensions.ERXExtensions.newEditingContext();
!         EOEnterpriseObject localObject = EOUtilities.localInstanceOfObject(context, object());
          String configuration = (String)d2wContext().valueForKey("editConfigurationNameForEntity");
          if(log.isDebugEnabled()){
--- 25,37 ----
  
      public D2WContext d2wContext() { return (D2WContext)valueForBinding("d2wContext"); }
+ 
+ 
+     protected EOEnterpriseObject localInstanceOfObject() {
+         return ERD2WUtilities.localInstanceFromObjectWithD2WContext(object(), d2wContext());
+     }
      
      // Assuming that object() is the eo
      public WOComponent edit() {
!         EOEnterpriseObject localObject = localInstanceOfObject();
          String configuration = (String)d2wContext().valueForKey("editConfigurationNameForEntity");
          if(log.isDebugEnabled()){
***************
*** 37,41 ****
          epi.setObject(localObject);
          epi.setNextPage(context().page());
!         context.hasChanges(); // Ensuring it survives.
          return (WOComponent)epi;
      }
--- 41,45 ----
          epi.setObject(localObject);
          epi.setNextPage(context().page());
!         localObject.editingContext().hasChanges(); // Ensuring it survives.
          return (WOComponent)epi;
      }

Update of /cvsroot/wonder/Wonder/Build/build
In directory sc8-pr-cvs1:/tmp/cvs-serv9268

Modified Files:
	generic.xml 
Log Message:
Resorting the loading order of EOPrototypes. This framework *must* come before any other that makes use of it in the loading order, else for example the prefs-handling fails in very obscure ways.


Index: generic.xml
===================================================================
RCS file: /cvsroot/wonder/Wonder/Build/build/generic.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** generic.xml	13 Mar 2003 07:37:56 -0000	1.19
--- generic.xml	28 Apr 2003 16:31:02 -0000	1.20
***************
*** 103,110 ****
  
              <!-- set this if you want to use Wonder's DynaGrouping, or leave out if not -->
!             <param name="use.wonder.grouping" value="true" />
  
              <!-- set this if you want to use Wonder's DynaReporting, or leave out if not -->
!             <param name="use.wonder.reporting" value="true" />
  
              <!-- set this if you want to use your own built frameworks, or leave out if not -->
--- 103,110 ----
  
              <!-- set this if you want to use Wonder's DynaGrouping, or leave out if not -->
!             <param name="use.grouping" value="true" />
  
              <!-- set this if you want to use Wonder's DynaReporting, or leave out if not -->
!             <param name="use.reporting" value="true" />
  
              <!-- set this if you want to use your own built frameworks, or leave out if not -->
***************
*** 380,383 ****
--- 380,386 ----
              </frameworks>
              <frameworks root="${wonder.lib.root}" if="use.wonder.logic"> 
+                 <include name="ERPrototypes.framework" />
+             </frameworks>
+             <frameworks root="${wonder.lib.root}" if="use.wonder.logic"> 
                  <include name="ERCoreBusinessLogic.framework" />
              </frameworks>
***************
*** 559,562 ****
--- 562,575 ----
      </target>
      
+     <target name="ERPrototypes.all">
+         <antcall target="global.framework" >
+             <param name="project.principal.class" value="" />
+             <param name="project.name" value="ERPrototypes" />
+             <param name="project.dir" value="Common/Frameworks/ERPrototypes" />
+ 
+             <param name="use.wonder.core" value="true" />
+         </antcall>
+     </target>
+ 
      <target name="ERCoreBusinessLogic.all">
          <antcall target="global.framework" >
***************
*** 902,906 ****
  
      <target name="core.all" depends="ERJars.all, JavaWOExtensions.all, ERExtensions.all, ERDirectToWeb.all" />
!     <target name="frameworks.all" depends="core.all, ERNeutralLook.all, WOOgnl.all, ERCoreBusinessLogic.all, ERJavaMail.all, ERChangeNotificationJMS.all, ERCalendar.all" />
      <target name="bugtracker.all" depends="frameworks.all, BTBusinessLogic.all, BugTracker.all" />
      <target name="applications.all" depends="frameworks.all, bugtracker.all, ERMailer.all" />
--- 915,919 ----
  
      <target name="core.all" depends="ERJars.all, JavaWOExtensions.all, ERExtensions.all, ERDirectToWeb.all" />
!     <target name="frameworks.all" depends="core.all, ERNeutralLook.all, WOOgnl.all, ERPrototypes.all, ERCoreBusinessLogic.all, ERJavaMail.all, ERChangeNotificationJMS.all, ERCalendar.all" />
      <target name="bugtracker.all" depends="frameworks.all, BTBusinessLogic.all, BugTracker.all" />
      <target name="applications.all" depends="frameworks.all, bugtracker.all, ERMailer.all" />
***************
*** 936,939 ****
--- 949,955 ----
          </antcall>
          <antcall target="global.clean.framework" >
+             <param name="project.name" value="ERPrototypes" />
+         </antcall>
+         <antcall target="global.clean.framework" >
              <param name="project.name" value="ERCoreBusinessLogic" />
          </antcall>
***************
*** 1047,1050 ****
--- 1063,1069 ----
          </antcall>
          <antcall target="global.web.framework" >
+             <param name="project.name" value="ERPrototypes" />
+         </antcall>
+         <antcall target="global.web.framework" >
              <param name="project.name" value="ERCoreBusinessLogic" />
          </antcall>
***************
*** 1154,1157 ****
--- 1173,1179 ----
          <antcall target="global.install.framework" >
              <param name="project.name" value="ERDirectToWeb" />
+         </antcall>
+         <antcall target="global.install.framework" >
+             <param name="project.name" value="ERPrototypes" />
          </antcall>
          <antcall target="global.install.framework" >

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/com/webobjects/directtoweb
In directory sc8-pr-cvs1:/tmp/cvs-serv5223

Modified Files:
	ERD2WUtilities.java 
Log Message:
This method faults the provied EOEnterpriseObject into a new EOEditingContext based on the current state. This method should be used whenever one creates and returns a new EditPage or InspectPage to ensure that nested EC's and EOSharedEC's are respected as well as new, not yet saved EO's. see javadoc for more info.


Index: ERD2WUtilities.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/com/webobjects/directtoweb/ERD2WUtilities.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ERD2WUtilities.java	22 Jul 2002 16:42:32 -0000	1.5
--- ERD2WUtilities.java	28 Apr 2003 08:15:03 -0000	1.6
***************
*** 8,11 ****
--- 8,14 ----
  
  import com.webobjects.foundation.*;
+ import com.webobjects.eoaccess.*;
+ import com.webobjects.eocontrol.*;
+ import er.extensions.*;
  
  // This is needed because pageFinalized is a protected method.
***************
*** 59,61 ****
--- 62,118 ----
          return result;
      }
+ 
+     /** This method faults the provied <code>EOEnterpriseObject</code> into a new <code>EOEditingContext</code>
+     * based on the current state:<br>
+     * 1. the <code>EOEnterpriseObject</code> is new: simply returns the <code>EOEnterpriseObject</code>,
+     * a new <code>EOEnterpriseObject</code> cannot be faulted into another <code>EOEditingContext</code><br>
+     *
+     * 2. if the d2wContext's task is 'edit' it creates a new -nested- <code>EOEditingContext</code> and
+     * faults the <code>EOEnterpriseObject</code> into it. Calls <code>setSharedEditingContext(false)</code> on
+     * the ec to ensure that this also works if one uses EOSharedEditingContexts.
+     * 
+     * 3. otherwise it creates a new PeerEditingContext and faults the <code>EOEnterpriseObject</code> into it.
+     * Calls <code>setSharedEditingContext(false)</code> on the ec to ensure that this also works if
+     * one uses EOSharedEditingContexts.
+     *
+     * This method should be called whenever on returns a new Page for a D2W action. It should simply behave like
+     * one assumes and not like the WO implementation: no nested EC's, no SharedEditingContext support.
+     *
+     * @param eo The <code>EOEnterpriseObject</code> that should be faulted. If the current page is
+     * a List page then it would mostly be current list object. If the current page is a Edit page then
+     * it would be object() and NOT the relationship object or whatever. object() because its the main object
+     * that needs to be faulted, then one must not care about relationships and so on.
+     * 
+     * @param d2wContext the current d2wContext
+     *
+     * @return
+     */
+     public static EOEnterpriseObject localInstanceFromObjectWithD2WContext(EOEnterpriseObject eo, D2WContext d2wContext) {
+         if (eo.editingContext() == null) {
+             throw new NullPointerException("localInstanceFromObjectWithD2WContext: the argument eo must have a valid EOEditingContext: eo.editingContext() != null");
+         }
+         EOEnterpriseObject localObject = eo;
+         if (ERXExtensions.isNewObject(eo)) {
+             //do nothing, a newObject cannot be faulted into another EC!
+         } else if ("edit".equals(d2wContext.valueForKey("task"))) {
+             //create a new nested EC and fault the object into it
+             EOEditingContext ec = ERXEC.newEditingContext(eo.editingContext());
+             //FIXME: we cannot use childEc's because if the EO is not saved to the DB
+             //then the EO is not displayed as EO if one uses for example a ERD2WEditToOneRelationship
+             //component: the new EO will not be displayed in the list
+             //EOEditingContext ec = ERXEC.newEditingContext();
+             ec.setSharedEditingContext(null);
+             localObject = EOUtilities.localInstanceOfObject(ec, eo);
+         } else {
+             //create a new Peer EC and fault the object into it
+             //this is done regardeless if the object's editingContext is
+             //a sharedec or not.
+             EOEditingContext ec = ERXEC.newEditingContext();
+             ec.setSharedEditingContext(null);
+             localObject = EOUtilities.localInstanceOfObject(ec, eo);
+         }
+         return localObject;
+     }
+ 
+     
  }

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb
In directory sc8-pr-cvs1:/tmp/cvs-serv26588

Modified Files:
	ERD2WListPage.java 
Log Message:
calling localInstanceFromObjectWithD2WContext in ERD2WUtilities.java to receive a correct local instance.


Index: ERD2WListPage.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb/ERD2WListPage.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ERD2WListPage.java	21 Feb 2003 09:27:07 -0000	1.17
--- ERD2WListPage.java	28 Apr 2003 06:08:56 -0000	1.18
***************
*** 141,145 ****
      
      public void setLocalContext(D2WContext newValue) {
!         if (ERXExtensions.safeDifferent(newValue,localContext())) {
              _hasBeenInitialized=false;
              _batchSize=null;
--- 141,145 ----
      
      public void setLocalContext(D2WContext newValue) {
!         if (ERXExtensions.safeDifferent(newValue,d2wContext())) {
              _hasBeenInitialized=false;
              _batchSize=null;
***************
*** 250,259 ****
          WOComponent result = null;
          String editConfigurationName=(String)d2wContext().valueForKey("editConfigurationName");
!         if(editConfigurationName!=null){
              EditPageInterface epi=(EditPageInterface)D2W.factory().pageForConfigurationNamed(editConfigurationName,session());
!             epi.setObject(object());
              epi.setNextPage(context().page());
!             return (WOComponent)epi;
!         }else{result = super.editObjectAction();}
          return result;
      }
--- 250,266 ----
          WOComponent result = null;
          String editConfigurationName=(String)d2wContext().valueForKey("editConfigurationName");
! 
!         if(editConfigurationName != null){
              EditPageInterface epi=(EditPageInterface)D2W.factory().pageForConfigurationNamed(editConfigurationName,session());
! 
!             epi.setObject(localInstance());
              epi.setNextPage(context().page());
!             result = (WOComponent)epi;
!         } else {
!             EditPageInterface editpageinterface = D2W.factory().editPageForEntityNamed(localInstance().entityName(), session());
!             editpageinterface.setObject(localInstance());
!             editpageinterface.setNextPage(context().page());
!             result = (WOComponent)editpageinterface;
!         }
          return result;
      }
***************
*** 262,274 ****
          WOComponent result = null;
          String inspectConfigurationName=(String)d2wContext().valueForKey("inspectConfigurationName");
!         if(inspectConfigurationName!=null){
              InspectPageInterface ipi=(InspectPageInterface)D2W.factory().pageForConfigurationNamed(inspectConfigurationName,session());
!             ipi.setObject(object());
              ipi.setNextPage(context().page());
              return (WOComponent)ipi;
!         }else{result = super.inspectObjectAction();}
!         return result;
      }
  
      public boolean showCancel() { return nextPage()!=null; }
  
--- 269,290 ----
          WOComponent result = null;
          String inspectConfigurationName=(String)d2wContext().valueForKey("inspectConfigurationName");
! 
!         if(inspectConfigurationName!=null) {
              InspectPageInterface ipi=(InspectPageInterface)D2W.factory().pageForConfigurationNamed(inspectConfigurationName,session());
!             ipi.setObject(localInstance());
              ipi.setNextPage(context().page());
              return (WOComponent)ipi;
!         } else {
!             InspectPageInterface inspectpageinterface = D2W.factory().inspectPageForEntityNamed(localInstance().entityName(), session());
!             inspectpageinterface.setObject(localInstance());
!             inspectpageinterface.setNextPage(context().page());
!             return (WOComponent)inspectpageinterface;
!         }
      }
  
+     private EOEnterpriseObject localInstance() {
+         return ERD2WUtilities.localInstanceFromObjectWithD2WContext(object(), d2wContext());
+     }
+     
      public boolean showCancel() { return nextPage()!=null; }

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb
In directory sc8-pr-cvs1:/tmp/cvs-serv26228

Modified Files:
	ERD2WInspectPage.java 
Log Message:
enabled locking of EC for MT apps


Index: ERD2WInspectPage.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb/ERD2WInspectPage.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ERD2WInspectPage.java	2 Apr 2003 05:36:19 -0000	1.20
--- ERD2WInspectPage.java	28 Apr 2003 06:05:53 -0000	1.21
***************
*** 90,94 ****
      public boolean doesNotHaveForm() { return !ERXUtilities.booleanValue(d2wContext().valueForKey("hasForm")); }
  
-     /* those are only needed when running MT -
      public void awake() {
          super.awake();
--- 90,93 ----
***************
*** 99,103 ****
      
      public void sleep() {
-         System.out.println("D2WInspectPage.sleep");
      	if (_context!=null) {
              _context.unlock();
--- 98,101 ----
***************
*** 119,124 ****
      }
  
! */    
! 
      /*
  
--- 117,126 ----
      }
  
!     public void setObject(EOEnterpriseObject eoenterpriseobject) {
!         EOEditingContext eoeditingcontext = eoenterpriseobject == null ? null : eoenterpriseobject.editingContext();
!         setEditingContext(eoeditingcontext);
!         super.setObject(eoenterpriseobject);
!     }
!     
      /*

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions
In directory sc8-pr-cvs1:/tmp/cvs-serv23468

Modified Files:
	ERXToOneRelationship.java 
Log Message:
Now makes sure that the value on the EO is in this list. This may not be the case if one just created a new relationship in a childEc. Therefore we also must set _privateList to null in awake, caching cannot work here.



Index: ERXToOneRelationship.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXToOneRelationship.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ERXToOneRelationship.java	6 Sep 2002 21:35:14 -0000	1.10
--- ERXToOneRelationship.java	28 Apr 2003 06:00:12 -0000	1.11
***************
*** 248,252 ****
--- 248,270 ----
                  aSortedArray=localArray;
              }
+             
+             // dt: we also must ensure that the value on the EO is in this list. This may not be the case if
+             // one just created a new relationship in a childEc. Therefore we also must set _privateList to null
+             // in awake, caching cannot work here
+             if (_localSourceObject() instanceof EOEnterpriseObject) {
+                 EOEnterpriseObject lso = (EOEnterpriseObject)_localSourceObject();
+                 EOEnterpriseObject relObject = (EOEnterpriseObject)lso.valueForKeyPath(_localRelationshipKey());
+                 if (relObject != null) {
  
+                     if (!aSortedArray.containsObject(relObject)) {
+                         aSortedArray.addObject(relObject);
+                         log.info("adding missing relationship object to list "+relObject);
+                         if (_localSortKey()!=null && _localSortKey().length() > 0) {
+                             ERXUtilities.sortEOsUsingSingleKey(aSortedArray, _localSortKey());
+                         }
+                     }
+                 }
+             }
+             
              if (!_localIsMandatory()) {
                  if(noSelectionString() != null)
***************
*** 263,266 ****
--- 281,290 ----
          }
          return super.theCurrentValue();
+     }
+ 
+     public void awake() {
+         super.awake();
+         // dt: see theList() method for an explanation
+         set_privateList(null);
      }
  }

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions
In directory sc8-pr-cvs1:/tmp/cvs-serv23082

Modified Files:
	ERXToManyRelationship.java 
Log Message:
cleaned up a little bit


Index: ERXToManyRelationship.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXToManyRelationship.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ERXToManyRelationship.java	21 Nov 2002 19:46:45 -0000	1.6
--- ERXToManyRelationship.java	28 Apr 2003 05:58:35 -0000	1.7
***************
*** 52,93 ****
          return destinationSortKey();
      }
      
      protected EODataSource _localDataSource() {
          if (null==dataSource()) {
              setDataSource((EODatabaseDataSource)valueForBinding("dataSource"));
              if (dataSource() == null) {
-                 String anEntityName = _localSourceEntityName();
-                 // FIXME (msanchez, 08/00, 2520053): use modelGroup on ObjectStoreCoordinator of our editingContext
-                 EOModelGroup aModelGroup = EOModelGroup.defaultGroup();
-                 EOEntity anEntity = aModelGroup.entityNamed(anEntityName);
- 
-                 if (anEntity == null) {
-                     throw new IllegalStateException("<" + getClass().getName() + " could not find entity named " + anEntityName + ">");
-                 }
-                 EOEntity destinationEntity = null;
                  EOEditingContext anEditingContext = null;
!                 Object _source = _localSourceObject();                
                  if (_source instanceof EOEnterpriseObject) {
-                     EORelationship relationship = ERXUtilities.relationshipWithObjectAndKeyPath((EOEnterpriseObject)_source,
-                                                                                                _localRelationshipKey());
-                     if(relationship!=null){
-                         destinationEntity = relationship.destinationEntity();
-                     }
                      anEditingContext = ((EOEnterpriseObject)_source).editingContext();
                  }
!                 if (destinationEntity == null)
!                     destinationEntity = entityWithEntityAndKeyPath(anEntity, _localRelationshipKey());
                  if (anEditingContext == null) {
                      anEditingContext = session().defaultEditingContext() ;
                  }
                  NSArray possibleChoices = (NSArray)valueForBinding("possibleChoices");
                  if (possibleChoices != null) {
!                     EOArrayDataSource ads = new EOArrayDataSource(destinationEntity.classDescriptionForInstances(), anEditingContext);
                      ads.setArray(possibleChoices);
                      setDataSource(ads);
                  } else {
!                     EODatabaseDataSource aDatabaseDataSource = new EODatabaseDataSource(anEditingContext, destinationEntity.name());
!                     if (hasBinding("qualifier"))
                          aDatabaseDataSource.setAuxiliaryQualifier((EOQualifier)valueForBinding("qualifier"));
                      setDataSource(aDatabaseDataSource);
                  }
--- 52,112 ----
          return destinationSortKey();
      }
+ 
+     protected EOEntity destinationEntity() {
+         String anEntityName = _localSourceEntityName();
+         // FIXME (msanchez, 08/00, 2520053): use modelGroup on ObjectStoreCoordinator of our editingContext
+         EOModelGroup aModelGroup = EOModelGroup.defaultGroup();
+         EOEntity anEntity = aModelGroup.entityNamed(anEntityName);
+ 
+         if (anEntity == null) {
+             throw new IllegalStateException("<" + getClass().getName() + " could not find entity named " + anEntityName + ">");
+         }
+         EOEntity destinationEntity = null;
+ 
+         Object _source = _localSourceObject();
+ 
+         if (_source instanceof EOEnterpriseObject) {
+             EORelationship relationship = ERXUtilities.relationshipWithObjectAndKeyPath((EOEnterpriseObject)_source,
+                                                                                         _localRelationshipKey());
+             if(relationship!=null) {
+                 destinationEntity = relationship.destinationEntity();
+             }
+         }
+         if (destinationEntity == null) {
+             destinationEntity = entityWithEntityAndKeyPath(anEntity, _localRelationshipKey());
+         }
+ 
+         return destinationEntity;
+     }
+ 
      
+ 
      protected EODataSource _localDataSource() {
          if (null==dataSource()) {
              setDataSource((EODatabaseDataSource)valueForBinding("dataSource"));
              if (dataSource() == null) {
                  EOEditingContext anEditingContext = null;
!                 Object _source = _localSourceObject();
! 
                  if (_source instanceof EOEnterpriseObject) {
                      anEditingContext = ((EOEnterpriseObject)_source).editingContext();
                  }
!                 
                  if (anEditingContext == null) {
                      anEditingContext = session().defaultEditingContext() ;
                  }
+ 
                  NSArray possibleChoices = (NSArray)valueForBinding("possibleChoices");
+ 
                  if (possibleChoices != null) {
!                     EOArrayDataSource ads = new EOArrayDataSource(destinationEntity().classDescriptionForInstances(), anEditingContext);
                      ads.setArray(possibleChoices);
                      setDataSource(ads);
                  } else {
!                     EODatabaseDataSource aDatabaseDataSource = new EODatabaseDataSource(anEditingContext, destinationEntity().name());
! 
!                     if (hasBinding("qualifier")) {
                          aDatabaseDataSource.setAuxiliaryQualifier((EOQualifier)valueForBinding("qualifier"));
+                     }
                      setDataSource(aDatabaseDataSource);
                  }

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions
In directory sc8-pr-cvs1:/tmp/cvs-serv20127

Modified Files:
	ERXFrameworkPrincipal.java 
Log Message:
ERXRetainer should be obsolete with Java


Index: ERXFrameworkPrincipal.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXFrameworkPrincipal.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ERXFrameworkPrincipal.java	24 Sep 2002 17:08:33 -0000	1.6
--- ERXFrameworkPrincipal.java	28 Apr 2003 05:48:45 -0000	1.7
***************
*** 47,51 ****
                  log.debug("Starting up: " + c.getName());
                  ERXFrameworkPrincipal principal = (ERXFrameworkPrincipal)c.newInstance();
!                 ERXRetainer.retain(principal);
                  NSNotificationCenter center = NSNotificationCenter.defaultCenter();
                  center.addObserver(principal,
--- 47,51 ----
                  log.debug("Starting up: " + c.getName());
                  ERXFrameworkPrincipal principal = (ERXFrameworkPrincipal)c.newInstance();
!                 //ERXRetainer.retain(principal);
                  NSNotificationCenter center = NSNotificationCenter.defaultCenter();
                  center.addObserver(principal,
***************
*** 72,76 ****
      public final void finishInitialization(NSNotification n) {
          NSNotificationCenter.defaultCenter().removeObserver(this);
!         ERXRetainer.release(this);
          finishInitialization();
      }
--- 72,76 ----
      public final void finishInitialization(NSNotification n) {
          NSNotificationCenter.defaultCenter().removeObserver(this);
!         //ERXRetainer.release(this);
          finishInitialization();
      }

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Components
In directory sc8-pr-cvs1:/tmp/cvs-serv19602

Modified Files:
	ERXCheckboxMatrix.api 
Log Message:
additional bindings relationshipName, relationshpOwner


Index: ERXCheckboxMatrix.api
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Components/ERXCheckboxMatrix.api,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ERXCheckboxMatrix.api	26 Feb 2003 14:15:08 -0000	1.4
--- ERXCheckboxMatrix.api	28 Apr 2003 05:46:40 -0000	1.5
***************
*** 17,20 ****
--- 17,22 ----
  		<binding name="cellspacing"/>
  		<binding name="cellWidth"/>
+ 		<binding name="relationshipName"/>
+ 		<binding name="relationshipOwner"/>
  		<binding name="tableOtherTagString"/>

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions
In directory sc8-pr-cvs1:/tmp/cvs-serv18854

Modified Files:
	ERXCheckboxMatrix.java 
Log Message:
sublist can be used now, too. The previous version was incompatible with sublists: if one uses only some objects as list for the checkboxes the component did delete the old values completely.



Index: ERXCheckboxMatrix.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXCheckboxMatrix.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ERXCheckboxMatrix.java	22 Dec 2002 16:28:42 -0000	1.3
--- ERXCheckboxMatrix.java	28 Apr 2003 05:44:15 -0000	1.4
***************
*** 12,15 ****
--- 12,16 ----
  import com.webobjects.appserver.*;
  import java.util.*;
+ import java.lang.reflect.*;
  
  // ported from WebScript - Corrected nil context problem.
***************
*** 43,46 ****
--- 44,56 ----
      }
  
+     public EOEnterpriseObject getRelationshipOwner() {
+         return (EOEnterpriseObject)valueForBinding("relationshipOwner");
+     }
+ 
+     public String getRelationshipName() {
+         Object o = valueForBinding("relationshipName");
+         return o == null ? null : o.toString();
+     }
+     
      public NSArray selections() {
          if (_selections==null) {
***************
*** 50,54 ****
      }
  
!     public void setSelections(NSArray aFormValuesArray) {
          // ** This is where we accept the formValues.  Kind of weird.
          NSMutableArray aSelectionsArray = new NSMutableArray();
--- 60,86 ----
      }
  
!     public void setSelections(Vector v) throws IllegalAccessException, InvocationTargetException {
!         NSRange r = new NSRange(0, v.size());
!         setSelections(new NSArray(v, r, true));
!     }
! 
!     public void takeValueForKey(Object value, String key)
!     {
!         try {
!             super.takeValueForKey(value, key);
!         } catch (java.lang.IllegalArgumentException e) {
!             if (value instanceof Vector) {
!                 //convert the vector
!                 NSRange r = new NSRange(0, ((Vector)value).size());
!                 NSMutableArray a = new NSMutableArray((Vector)value, r, true);
!                 super.takeValueForKey(a, key);
!                 NSLog.out.appendln("done");
!             } else {
!                 throw e;
!             }
!         }
!     }
!     
!     public void setSelections(NSArray aFormValuesArray) throws IllegalAccessException, InvocationTargetException {
          // ** This is where we accept the formValues.  Kind of weird.
          NSMutableArray aSelectionsArray = new NSMutableArray();
***************
*** 67,71 ****
              }
          }
!         setValueForBinding(aSelectionsArray, "selections");
          _selections = null;
      }
--- 99,120 ----
              }
          }
!         // dt: this can be used with a subset as array for the checkboxes.
!         if (getRelationshipName() != null && getRelationshipName().length() > 0 && getRelationshipOwner() != null) {
!             NSSet objectsToRemove = new NSSet(_selections).setBySubtractingSet(new NSSet(aSelectionsArray));
!             NSSet objectsToAdd = new NSSet(aSelectionsArray).setBySubtractingSet(new NSSet(_selections));
!             EOEnterpriseObject owner = getRelationshipOwner();
!             String relname = getRelationshipName();
!             for (Enumeration e = objectsToRemove.objectEnumerator(); e.hasMoreElements();) {
!                 EOEnterpriseObject eo = (EOEnterpriseObject)e.nextElement();
!                 owner.removeObjectFromBothSidesOfRelationshipWithKey(eo, relname);
!             }
!             for (Enumeration e = objectsToAdd.objectEnumerator(); e.hasMoreElements();) {
!                 EOEnterpriseObject eo = (EOEnterpriseObject)e.nextElement();
!                 owner.addObjectToBothSidesOfRelationshipWithKey(eo, relname);
!             }
!             
!         } else {
!             setValueForBinding(aSelectionsArray, "selections");
!         }
          _selections = null;
      }

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions
In directory sc8-pr-cvs1:/tmp/cvs-serv13185

Modified Files:
	ERXDatabaseContextDelegate.java 
Log Message:
ERXRetainer should not be necessary with Java


Index: ERXDatabaseContextDelegate.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXDatabaseContextDelegate.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ERXDatabaseContextDelegate.java	6 Sep 2002 21:35:14 -0000	1.8
--- ERXDatabaseContextDelegate.java	28 Apr 2003 05:22:46 -0000	1.9
***************
*** 34,38 ****
              _defaultDelegate = new ERXDatabaseContextDelegate();
              log.info("Created default delegate");
!             ERXRetainer.retain(_defaultDelegate); // Retaining the delegate on the ObjC side.  This might not be necessary.
          }
          return _defaultDelegate;
--- 34,38 ----
              _defaultDelegate = new ERXDatabaseContextDelegate();
              log.info("Created default delegate");
!             //ERXRetainer.retain(_defaultDelegate); // Retaining the delegate on the ObjC side.  This might not be necessary.
          }
          return _defaultDelegate;

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions
In directory sc8-pr-cvs1:/tmp/cvs-serv8847

Modified Files:
	ERXExtensions.java 
Log Message:
isNewObject now uses EOGlobalID.isTemporary to determine if the eo is present in the db or not.


Index: ERXExtensions.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXExtensions.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** ERXExtensions.java	21 Mar 2003 01:17:07 -0000	1.51
--- ERXExtensions.java	27 Apr 2003 16:28:13 -0000	1.52
***************
*** 30,34 ****
   */
  public class ERXExtensions {
! 
      /** Notification name, posted before object will change in an editing context */
      public final static String objectsWillChangeInEditingContext= "ObjectsWillChangeInEditingContext";
--- 30,35 ----
   */
  public class ERXExtensions {
!     public static Observer observer;
!     
      /** Notification name, posted before object will change in an editing context */
      public final static String objectsWillChangeInEditingContext= "ObjectsWillChangeInEditingContext";
***************
*** 157,162 ****
              }
  
!             Observer observer = new Observer();
!             ERXRetainer.retain(observer); // has to be retained
  
              try {
--- 158,162 ----
              }
  
!             observer = new Observer();
  
              try {
***************
*** 659,667 ****
       *		new object.
       */
-     // ENHANCEME: Should be able to differentiate between a deleted eo and a new eo by looking
-     //		  at the EOGlobalID
      // MOVEME: ERXEOFUtilities (when we have them)
      public static boolean isNewObject(EOEnterpriseObject eo) {
!         return eo.editingContext()==null || eo.editingContext().insertedObjects().containsObject(eo);
      }
  
--- 659,668 ----
       *		new object.
       */
      // MOVEME: ERXEOFUtilities (when we have them)
      public static boolean isNewObject(EOEnterpriseObject eo) {
!         if (eo.editingContext() == null) return true;
!         
!         EOGlobalID gid = eo.editingContext().globalIDForObject(eo);
!         return gid.isTemporary();
      }
  
***************
*** 1263,1269 ****
      // FIXME: Should check to make sure that the key 'r' isn't already present in the url.
      public static String randomizeDirectActionURL(String daURL) {
!         int r=_random.nextInt();
!         char c=daURL.indexOf('?')==-1 ? '?' : '&';
!         return  daURL+c+"r="+r;
      }
      /**
--- 1264,1272 ----
      // FIXME: Should check to make sure that the key 'r' isn't already present in the url.
      public static String randomizeDirectActionURL(String daURL) {
! 	synchronized(_random) {
! 	    int r=_random.nextInt();
! 	    char c=daURL.indexOf('?')==-1 ? '?' : '&';
! 	    return  daURL+c+"r="+r;
! 	}
      }
      /**
***************
*** 1276,1289 ****
      // FIXME: Should check to make sure that the key 'r' isn't already present in the url.
      public static void addRandomizeDirectActionURL(StringBuffer daURL) {
!         int r=_random.nextInt();
!         char c='?';
!         for (int i=0; i<daURL.length(); i++) {
!             if (daURL.charAt(i)=='?') {
!                 c='&'; break;
!             }
!         }
!         daURL.append(c);
!         daURL.append("r=");
!         daURL.append(r);
      }
      /**
--- 1279,1294 ----
      // FIXME: Should check to make sure that the key 'r' isn't already present in the url.
      public static void addRandomizeDirectActionURL(StringBuffer daURL) {
! 	synchronized(_random) {
! 	    int r=_random.nextInt();
! 	    char c='?';
! 	    for (int i=0; i<daURL.length(); i++) {
! 		if (daURL.charAt(i)=='?') {
! 		    c='&'; break;
! 		}
! 	    }
! 	    daURL.append(c);
! 	    daURL.append("r=");
! 	    daURL.append(r);
! 	}
      }
      /**

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WConfirmPageTemplate.wo
In directory sc8-pr-cvs1:/tmp/cvs-serv614/ERD2WConfirmPageTemplate.wo

Modified Files:
	ERD2WConfirmPageTemplate.html 
Log Message:
the form on the page comprises the explanation component as well

Index: ERD2WConfirmPageTemplate.html
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WConfirmPageTemplate.wo/ERD2WConfirmPageTemplate.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ERD2WConfirmPageTemplate.html	5 Feb 2002 20:13:42 -0000	1.1.1.1
--- ERD2WConfirmPageTemplate.html	27 Apr 2003 08:21:53 -0000	1.2
***************
*** 4,9 ****
  		<TR>
  			<TD VALIGN=TOP ALIGN=RIGHT WIDTH=100 ROWSPAN=4 ATTRIBUTE1=Value CLASS="Headline">?&nbsp;</TD>
! 			<TD class=Alert>Please Confirm
! 				<HR>
  				<WEBOBJECT NAME=Errors></WEBOBJECT></TD>
  		</TR>
--- 4,8 ----
  		<TR>
  			<TD VALIGN=TOP ALIGN=RIGHT WIDTH=100 ROWSPAN=4 ATTRIBUTE1=Value CLASS="Headline">?&nbsp;</TD>
! 			<TD class=Alert>Please Confirm<HR>
  				<WEBOBJECT NAME=Errors></WEBOBJECT></TD>
  		</TR>
***************
*** 15,18 ****
--- 14,19 ----
  			</TR>
  		</WEBOBJECT>
+ 
+ 		<WEBOBJECT NAME=Form2>
  		<WEBOBJECT NAME=Conditional3>
  			<TR>
***************
*** 20,24 ****
  			</TR>
  		</WEBOBJECT>
- 		<WEBOBJECT NAME=Form2>
  			<WEBOBJECT NAME=Conditional4>
  				<TR>
--- 21,24 ----

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WConfirmPageTemplate.wo
In directory sc8-pr-cvs1:/tmp/cvs-serv32221/Components/Nonlocalized.lproj/ERD2WConfirmPageTemplate.wo

Modified Files:
      Tag: Wonder_1_0_1_Branch
	ERD2WConfirmPageTemplate.html 
Log Message:
the form comprises the explanation component now

Index: ERD2WConfirmPageTemplate.html
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WConfirmPageTemplate.wo/ERD2WConfirmPageTemplate.html,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.4.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.4.1
*** ERD2WConfirmPageTemplate.html	5 Feb 2002 20:13:42 -0000	1.1.1.1
--- ERD2WConfirmPageTemplate.html	27 Apr 2003 08:20:32 -0000	1.1.1.1.4.1
***************
*** 4,9 ****
  		<TR>
  			<TD VALIGN=TOP ALIGN=RIGHT WIDTH=100 ROWSPAN=4 ATTRIBUTE1=Value CLASS="Headline">?&nbsp;</TD>
! 			<TD class=Alert>Please Confirm
! 				<HR>
  				<WEBOBJECT NAME=Errors></WEBOBJECT></TD>
  		</TR>
--- 4,8 ----
  		<TR>
  			<TD VALIGN=TOP ALIGN=RIGHT WIDTH=100 ROWSPAN=4 ATTRIBUTE1=Value CLASS="Headline">?&nbsp;</TD>
! 			<TD class=Alert>Please Confirm<HR>
  				<WEBOBJECT NAME=Errors></WEBOBJECT></TD>
  		</TR>
***************
*** 15,18 ****
--- 14,19 ----
  			</TR>
  		</WEBOBJECT>
+ 
+ 		<WEBOBJECT NAME=Form2>
  		<WEBOBJECT NAME=Conditional3>
  			<TR>
***************
*** 20,24 ****
  			</TR>
  		</WEBOBJECT>
- 		<WEBOBJECT NAME=Form2>
  			<WEBOBJECT NAME=Conditional4>
  				<TR>
--- 21,24 ----

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions
In directory sc8-pr-cvs1:/tmp/cvs-serv18986

Modified Files:
	ERXGenericRecord.java 
Log Message:
was checking for wrong array count

Index: ERXGenericRecord.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXGenericRecord.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** ERXGenericRecord.java	25 Apr 2003 21:22:15 -0000	1.47
--- ERXGenericRecord.java	26 Apr 2003 14:10:28 -0000	1.48
***************
*** 448,452 ****
              NSArray primaryKeyAttributeNames=primaryKeyAttributeNames();
              result = ERXArrayUtilities.valuesForKeyPaths(pk, primaryKeyAttributeNames);
!             if(((NSArray)result).count() == 0) result = ((NSArray)result).lastObject();
          }
          return result;
--- 448,452 ----
              NSArray primaryKeyAttributeNames=primaryKeyAttributeNames();
              result = ERXArrayUtilities.valuesForKeyPaths(pk, primaryKeyAttributeNames);
!             if(((NSArray)result).count() == 1) result = ((NSArray)result).lastObject();
          }
          return result;

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions
In directory sc8-pr-cvs1:/tmp/cvs-serv19693

Modified Files:
	ERXGenericRecord.java 
Log Message:
first take on PK generation, it attempts to fix: 

- compound PK generation
- using ERXEOControl instead of ERXUtilities
- compound PK strings, encryption 
- greatly reduced indirection of calls
- PK generation via class properties

As this is a very core thing, it would be great if everyone would look over it...

Index: ERXGenericRecord.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXGenericRecord.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** ERXGenericRecord.java	12 Apr 2003 01:42:24 -0000	1.46
--- ERXGenericRecord.java	25 Apr 2003 21:22:15 -0000	1.47
***************
*** 429,433 ****
       */
      public String primaryKey() {
!         return ERXExtensions.primaryKeyForObject(this);
      }
  
--- 429,433 ----
       */
      public String primaryKey() {
!         return ERXEOControlUtilities.primaryKeyStringForObject(this);
      }
  
***************
*** 446,454 ****
          if (result == null) {
              NSDictionary pk = primaryKeyDictionary(false);
-             if (log.isDebugEnabled()) log.debug("pk: " + pk);
              NSArray primaryKeyAttributeNames=primaryKeyAttributeNames();
!             if (primaryKeyAttributeNames.count()>1)
!                 throw new RuntimeException("rawPrimaryKeyInTransaction does not support compound primary keys");
!             result=pk.objectForKey(primaryKeyAttributeNames.lastObject());
          }
          return result;
--- 446,452 ----
          if (result == null) {
              NSDictionary pk = primaryKeyDictionary(false);
              NSArray primaryKeyAttributeNames=primaryKeyAttributeNames();
!             result = ERXArrayUtilities.valuesForKeyPaths(pk, primaryKeyAttributeNames);
!             if(((NSArray)result).count() == 0) result = ((NSArray)result).lastObject();
          }
          return result;
***************
*** 457,461 ****
      /**
       * Calling this method will return the primary key of the
!      * given enterprise object or if one has not been asigned
       * to it yet, then it will have the adaptor channel generate
       * one for it, cache it and then use that primary key when it
--- 455,459 ----
      /**
       * Calling this method will return the primary key of the
!      * given enterprise object or if one has not been assigned
       * to it yet, then it will have the adaptor channel generate
       * one for it, cache it and then use that primary key when it
***************
*** 468,473 ****
       */
      public String primaryKeyInTransaction() {
!         Object rpk=rawPrimaryKeyInTransaction();
!         return rpk!=null ? rpk.toString() : null;
      }
  
--- 466,476 ----
       */
      public String primaryKeyInTransaction() {
!         Object pk=rawPrimaryKeyInTransaction();
!         if(pk == null)
!             return null;
!         if(pk instanceof String || pk instanceof Number) {
!             return pk.toString();
!         }
!         return NSPropertyListSerialization.stringFromPropertyList(pk);
      }
  
***************
*** 477,481 ****
       * @return the raw primary key of this object.
       */
!     public Object rawPrimaryKey() { return ERXExtensions.rawPrimaryKeyForObject(this); }
  
      /**
--- 480,486 ----
       * @return the raw primary key of this object.
       */
!     public Object rawPrimaryKey() {
!         return ERXEOControlUtilities.primaryKeyObjectForObject(this);
!     }
  
      /**
***************
*** 485,489 ****
       */
      public String encryptedPrimaryKey() {
!         String pk = ERXExtensions.primaryKeyForObject(this);
          return pk==null ? null : ERXCrypto.blowfishEncode(pk);
      }
--- 490,494 ----
       */
      public String encryptedPrimaryKey() {
!         String pk = ERXEOControlUtilities.primaryKeyStringForObject(this);
          return pk==null ? null : ERXCrypto.blowfishEncode(pk);
      }
***************
*** 529,552 ****
       *		a new primary key dictionary is created, cached and returned.
       */
-     // FIXME: This should work for compound pks as well, ie don't try to gen a new pk
-     //		if they have a compound pk.
      // FIXME: this method is really misnamed; it should be called rawPrimaryKeyDictionary
      public NSDictionary primaryKeyDictionary(boolean inTransaction) {
          if(_primaryKeyDictionary == null) {
              if (!inTransaction) {
!                 NSArray primaryKeyAttributeNames=primaryKeyAttributeNames();
!                 if (primaryKeyAttributeNames.count()>1) {
!                     if(true) // ak:testing
!                         return null;
!                     else
!                         throw new RuntimeException("primaryKeyDictionary does not support compound primary keys");
!                 }
!                 if (rawPrimaryKey() != null) {
!                     if (log.isDebugEnabled()) log.debug("Got raw key: "+ rawPrimaryKey());
!                    //FIXME: Should be getting primaryKey name from the entity of the enterprise object.
!                     _primaryKeyDictionary = new NSDictionary(rawPrimaryKey(), primaryKeyAttributeNames.lastObject());
!                 } else
                      if (log.isDebugEnabled()) log.debug("No raw key, trying single key");
!                     _primaryKeyDictionary = ERXUtilities.primaryKeyDictionaryForEntity(editingContext(), entityName());
              }
          }
--- 534,550 ----
       *		a new primary key dictionary is created, cached and returned.
       */
      // FIXME: this method is really misnamed; it should be called rawPrimaryKeyDictionary
      public NSDictionary primaryKeyDictionary(boolean inTransaction) {
          if(_primaryKeyDictionary == null) {
              if (!inTransaction) {
!                 Object rawPK = rawPrimaryKey();
!                 if (rawPK != null) {
!                     if (log.isDebugEnabled()) log.debug("Got raw key: "+ rawPK);
!                     NSArray primaryKeyAttributeNames=primaryKeyAttributeNames();
!                     _primaryKeyDictionary = new NSDictionary(rawPK instanceof NSArray ? (NSArray)rawPK : new NSArray(rawPK), primaryKeyAttributeNames);
!                 } else {
                      if (log.isDebugEnabled()) log.debug("No raw key, trying single key");
!                     _primaryKeyDictionary = ERXEOControlUtilities.newPrimaryKeyDictionaryForObject(this);
!                 }
              }
          }

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions
In directory sc8-pr-cvs1:/tmp/cvs-serv17905

Modified Files:
	ERXEOControlUtilities.java 
Log Message:
first take on fixed PK generation

Index: ERXEOControlUtilities.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXEOControlUtilities.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ERXEOControlUtilities.java	16 Apr 2003 07:21:19 -0000	1.8
--- ERXEOControlUtilities.java	25 Apr 2003 21:16:32 -0000	1.9
***************
*** 11,14 ****
--- 11,16 ----
  import com.webobjects.eoaccess.EOAttribute;
  import com.webobjects.eoaccess.EOEntity;
+ import com.webobjects.eoaccess.EODatabaseContext;
+ import com.webobjects.eoaccess.EOAdaptorChannel;
  import com.webobjects.eoaccess.EOModelGroup;
  import com.webobjects.eoaccess.EOUtilities;
***************
*** 18,21 ****
--- 20,24 ----
  import com.webobjects.eocontrol.EOFetchSpecification;
  import com.webobjects.eocontrol.EOGlobalID;
+ import com.webobjects.eocontrol.EOKeyGlobalID;
  import com.webobjects.eocontrol.EOKeyValueQualifier;
  import com.webobjects.eocontrol.EOObjectStoreCoordinator;
***************
*** 25,29 ****
--- 28,34 ----
  import com.webobjects.foundation.NSArray;
  import com.webobjects.foundation.NSDictionary;
+ import com.webobjects.foundation.NSMutableDictionary;
  import com.webobjects.foundation.NSMutableArray;
+ import com.webobjects.foundation.NSPropertyListSerialization;
  
  /**
***************
*** 244,247 ****
--- 249,384 ----
          return fetchSpec != null && bindings != null ?
              fetchSpec.fetchSpecificationWithQualifierBindings(bindings) : fetchSpec;
+     }
+ 
+     /**
+      * Utility method to generate a new primary key dictionary using
+      * the objects class properties. Use it when your PKs are class properties.
+      * @param eo object in question
+      * @returns new primary key dictionary or null if one of the properties is
+      * null or one of the primary key attributes is not a class property.
+      */
+ 
+     public static NSDictionary newPrimaryKeyDictionaryForObjectFromClassProperties(EOEnterpriseObject eo) {
+         EOEditingContext ec = eo.editingContext();
+         EOEntity entity = EOUtilities.entityNamed(ec, eo.entityName());
+         NSArray pkAttributes = entity.primaryKeyAttributeNames();
+         int count = pkAttributes.count();
+         NSMutableDictionary nsmutabledictionary = new NSMutableDictionary(count);
+         NSArray classPropertyNames = entity.classPropertyNames();
+         while (count-- != 0) {
+             String key = (String)pkAttributes.objectAtIndex(count);
+             if(!classPropertyNames.containsObject(key))
+                 return null;
+             Object value = eo.valueForKey(key);
+             if(value == null)
+                 return null;
+             nsmutabledictionary.setObjectForKey(value, key);
+         }
+         return nsmutabledictionary;
+     }
+ 
+ 
+     /**
+      * Utility method to generate a new primary key for an object. Calls
+      * {@link newPrimaryKeyForObjectFromClassProperties(EOEnterpriseObject)} and if that returns null,
+      * {@link newPrimaryKeyDictionaryForEntityNamed(EOEditingContext, String)}
+      * @returns new primary key dictionary or null if a failure occured.
+      */
+ 
+     public static NSDictionary newPrimaryKeyDictionaryForObject(EOEnterpriseObject eo) {
+         NSDictionary dict = newPrimaryKeyDictionaryForObjectFromClassProperties(eo);
+         if(dict == null) {
+             dict = newPrimaryKeyDictionaryForEntityNamed(eo.editingContext(), eo.entityName());
+         }
+         return dict;
+     }
+ 
+ 
+     /**
+      * Utility method to generate a new primary key dictionary using
+      * the adaptor for a given entity. This is can be handy if you
+      * need to have a primary key for an object before it is saved to
+      * the database. This method uses the same method that EOF uses
+      * by default for generating primary keys. See
+      * {@link ERXGeneratesPrimaryKeyInterface} for more information
+      * about using a newly created dictionary as the primary key for
+      * an enterprise object.
+      * @param ec editing context
+      * @param entityName name of the entity to generate the primary
+      *		key dictionary for.
+      * @returns a dictionary containing a new primary key for the given
+      *		entity.
+      */
+     public static NSDictionary newPrimaryKeyDictionaryForEntityNamed(EOEditingContext ec, String entityName) {
+         EOEntity entity = EOUtilities.entityNamed(ec, entityName);
+         EODatabaseContext dbContext = EODatabaseContext.registeredDatabaseContextForModel(entity.model(), ec);
+         NSDictionary primaryKey = null;
+         try {
+             dbContext.lock();
+             EOAdaptorChannel adaptorChannel = dbContext.availableChannel().adaptorChannel();
+             if (!adaptorChannel.isOpen())
+                 adaptorChannel.openChannel();
+             NSArray arr = adaptorChannel.primaryKeysForNewRowsWithEntity(1, entity);
+             if(arr != null)
+                 primaryKey = (NSDictionary)arr.lastObject();
+             else
+                 log.warn("Could not get primary key for entity: " + entityName + " exception");
+             dbContext.unlock();
+         } catch (Exception e) {
+             dbContext.unlock();
+             log.error("Caught exception when generating primary key for entity: " + entityName + " exception: " + e, e);
+         }
+         return primaryKey;
+     }
+ 
+     /**
+      * Returns the propertylist-encoded string representation of the primary key for
+      * a given object.
+      * @param eo object to get the primary key for.
+      * @returns string representation of the primary key of the
+      *		object.
+      */
+     public static String primaryKeyStringForObject(EOEnterpriseObject eo) {
+         Object pk=primaryKeyObjectForObject(eo);
+         if(pk == null)
+             return null;
+         if(pk instanceof String || pk instanceof Number) {
+             return pk.toString();
+         }
+         return NSPropertyListSerialization.stringFromPropertyList(pk);
+     }
+ 
+     /**
+      * Returns either the single object the PK consist of or the NSArray of its values if the key is compound.
+      * @param eo object to get the primary key for.
+      * @returns single object or NSArray
+      */
+     public static Object primaryKeyObjectForObject(EOEnterpriseObject eo) {
+         NSArray arr=primaryKeyArrayForObject(eo);
+         if(arr != null && arr.count() == 1) return arr.lastObject();
+         return arr;
+     }
+ 
+     /**
+      * Gives the primary key array for a given enterprise
+      * object. This has the advantage of not firing the
+      * fault of the object, unlike the method in
+      * {@link com.webobjects.eoaccess.EOUtilities EOUtilities}.
+      * @param obj enterprise object to get the primary key array from.
+      * @return array of all the primary key values for the object.
+      */
+     public static NSArray primaryKeyArrayForObject(EOEnterpriseObject obj) {
+         EOEditingContext ec = obj.editingContext();
+         if (ec == null) {
+             //you don't have an EC! Bad EO. We can do nothing.
+             return null;
+         }
+         EOGlobalID gid = ec.globalIDForObject(obj);
+         if (gid.isTemporary()) {
+             //no pk yet assigned
+             return null;
+         }
+         EOKeyGlobalID kGid = (EOKeyGlobalID) gid;
+         return kGid.keyValuesArray();
      }
  }

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions
In directory sc8-pr-cvs1:/tmp/cvs-serv17595

Modified Files:
	ERXArrayUtilities.java 
Log Message:
loosening requirements for KVC parameter.

Index: ERXArrayUtilities.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXArrayUtilities.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ERXArrayUtilities.java	26 Mar 2003 20:34:06 -0000	1.28
--- ERXArrayUtilities.java	25 Apr 2003 21:15:30 -0000	1.29
***************
*** 357,366 ****
       *         every keypath.
       */
!     public static NSArray valuesForKeyPaths(NSArray array, NSArray paths) {
          NSMutableArray result = new NSMutableArray();
  
          Enumeration e = paths.objectEnumerator();
          while(e.hasMoreElements()) {
!             result.addObject((NSArray)array.valueForKeyPath((String)e.nextElement()));
          }
          return result;
--- 357,366 ----
       *         every keypath.
       */
!     public static NSArray valuesForKeyPaths(Object array, NSArray paths) {
          NSMutableArray result = new NSMutableArray();
  
          Enumeration e = paths.objectEnumerator();
          while(e.hasMoreElements()) {
!             result.addObject(NSKeyValueCodingAdditions.Utility.valueForKeyPath(array, (String)e.nextElement()));
          }
          return result;

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERJars/ERJars.pbproj
In directory sc8-pr-cvs1:/tmp/cvs-serv22654/ERJars.pbproj

Modified Files:
	project.pbxproj 
Log Message:
Added Sun's JavaMail 1.3 to the ERJars framework


Index: project.pbxproj
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERJars/ERJars.pbproj/project.pbxproj,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** project.pbxproj	27 Feb 2003 22:55:24 -0000	1.8
--- project.pbxproj	23 Apr 2003 19:23:22 -0000	1.9
***************
*** 124,127 ****
--- 124,128 ----
  				6685560A01E84B5800CD2930,
  				504840DE040C01DE00CF0E76,
+ 				D777C4ED04571EB800000064,
  			);
  			isa = PBXFrameworksBuildPhase;
***************
*** 521,524 ****
--- 522,526 ----
  				6685560801E84B5700CD2930,
  				504840DD040C01DE00CF0E76,
+ 				D777C4EC04571EB800000064,
  			);
  			isa = PBXGroup;
***************
*** 615,618 ****
--- 617,646 ----
  //663
  //664
+ //D70
+ //D71
+ //D72
+ //D73
+ //D74
+ 		D777C4EC04571EB800000064 = {
+ 			includeInIndex = 1;
+ 			isa = PBXZipArchiveReference;
+ 			name = mail.jar;
+ 			path = Libraries/mail.jar;
+ 			refType = 4;
+ 		};
+ 		D777C4ED04571EB800000064 = {
+ 			fileRef = D777C4EC04571EB800000064;
+ 			isa = PBXBuildFile;
+ 			settings = {
+ 				ATTRIBUTES = (
+ 					Merge,
+ 				);
+ 			};
+ 		};
+ //D70
+ //D71
+ //D72
+ //D73
+ //D74
  //F60
  //F61

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERJars/Libraries
In directory sc8-pr-cvs1:/tmp/cvs-serv22654/Libraries

Added Files:
	mail.jar 
Log Message:
Added Sun's JavaMail 1.3 to the ERJars framework


--- NEW FILE: mail.jar ---
PK
 A›Ù°;HH/mˆEì;é×ÄRQ™U€r^2Ê£~}9~ÜIÙ-â0h»ßŽAÓÆeñŸoðïÐ?ÿ!äUäAѹÝô͈üófxq{?³â.þóMtï®ìÆÙ¿,ùßßHMøÆm|+¾ýôæ¿þ۟qÙ±Š·¯SÜ|‚L&Èñ÷|ýç?è&p»Àÿz¼¿ùwèۿ̾ø&Ç^S¶¶òö›Px¿ÿ{æì…_6¿	þ¾yeþ{ÛoùÏ·¿"þŸwÈ¿úÅ»iÚüM`þóíÿýëÿûíwxû
~ÏÃÿÿŽ}ƒ6 „€0úÏüó?ü–àÛ{À6p/Í÷¿¬ É÷2·m'È=	ÿÆÄ·é¢þóí‘Q”]Ãå~–óÅ=ªÛ,EÍ.ÿï,¬9˜›^>;zAõöK̉ãè6+UpSÛª<•^Ƈ€'#‚“? ûî
¿ôÒ ã‚΋‚fùt`
­Û½ˆžÄ;ì
ÀÞ%¾¬t	¹Í»
4eK³·h«²éf‘#«»<Ÿ)ÍÉ÷»³£c{Öwþ(ï %äØ­@#˜ ‹6Ø»…Ÿ-Zk½Šw\ôY9Þ·œ
ži#&6¹`çnrÒüPºþâmKk§ýÃcDñŠ'ŠñW]	óˆÚ„1”Oö]4yë§Îb“c¬ßI‘´l1jz=·04¶ø
°ç±ƒû„ÒeQÞê!ž¼¸X89êb_˜«©Ç;NÊ·$çuø.]C—ƒ¶uo>]öEǾ}g¼ÜРÛö^X’znz|ܱ-ðtÑïâ|ºÄª)»Ò+3;¼9_q-ššì2¥	ìf±üãâT‰Ù®º´Î^9]ãǕÎBwwW9ƒÔ•á6áÆxev8¼¸Áoø¼I⢚"è@²õâXí»ªïVð3(MÂâ}ÃÕwÄqKŠu[¤gùÁIÊù[Ìe²8¤–ô8ìîBRa.êD[ÎJT^»Å¯\¾Âª°å'êvß0¤6ñ¨ñÎÈÂêړ±ãî1©èMö[:ÃAZ ë¾y©€Ú®³ŸéS)»ÅÜI$l%?w@...”¼Kª¾k('Ŗ"ݍÝwÖ]ÏlXKªGŸ¶ÒRQŽuéÑÍ"žÆ-°}á_o§
ÖÏ*€Y£yìœä«uõ$(D-]Z
i½ä¼6¨iq^MÆÔëdcx}¿dþyðŠ­»E(‚´IG9újþ1â[Ôµ³q–nä …읩åɧÕ`H»Ô¬
êì-~‹Ž€–áÎéϊÄ,	f¹yÒñ$ÔYàn_6Þo´Â*Ó ˜>`>¿÷A2BüLzÅeáðP:º¡’Ä,D5éûÍäÀ³`ÎîhR~"ËN§+Ò1#%'¼%šÙÜc/øÏ_>åÕ×ÞÎX]‘Ör¯åÆÎ|ۭߐ “ÚgÍg²»+êÉ$ç#ꂤæ%Ïܗ+Ï{ˆ'»ºÙzl‰î
ëˆ>.r÷¶  ¸‹]xŽ\àë¶Þ:!fjX¸²ÉÝùps0¿@?ƒ|™â’†Î%QShÿx’«Ñ0U
/xÉN´ï6ºItÈàJMb^äärÒÂß	é»U·àiÊ1Vm­>·ʣ Í¦'Úã¢ÕßoÛLð*–uP$ïX½¡ëÝð8乙…„ƒ)-6ïØ´qà^Ú¥Bà=&Ü i¸<ljÿzÏÓà½UðC\¼6:Q!ICx98CK
4&
²î\qF[÷©Dϑ+L{Íæü^ýI“„5­BèܝÆßSáñÜ$–Õù£°ß:ãBÿ§ÏìºKÕ3B¹ß¢V<ªÆ‘»t»æh¿H_Zx-·šà
‚ÚÕ\üˆKÊø²xՓ½å«ÅvúˆuÈLJ8ë+é]ðk
®û&^k¯ªÜR¼,ùºÖ«ÕpÓSá¢\‘ûÅ1¬"³Äœô½ó+¹ôÍÊk±ÓePoÈûU¢+ pïÂvP—ú’;|!ðîW¼ÏÛp Ge>^ähK™wHl…ìÉr˜îñOe}½Æȇ£*Ú<ã–5¦q¦¶ÃÙy"1m,Üã_DÙUÝþÒºv‹Oš”T”ôøbÏM5òx áõ®ûË	ßÐë‹zô‹>>Q}˜»JÑbvú³¾|d§ÿ6¡‡o6³ð>Ä.DƒíÑpe±5/Mx(“Ëö‰ÿÚá?if0y{±À»ÍXf§;’(Ué4˜!«ŒÑ;ëÊâDO‚øøo©j1{N!WÚ!@«mÃ6ÒEÜZä‰Ó…a½*|qŸR+ÌTäx¿WØÍov8}>ÔüЕ
«…姨`Ðhï1­OïàgBâœÜœ¬1¥•ō¡+kCFW^¨`<ªáõ&i®ý2:ߔøÿŽù|ÏzÛP4M­á$µcªxä´ðb[-ÿ‹}åç-šÁ¼ßA¹vmŒ”vúÃ&˜±,oϋ
òÇ<Ï|E¬…ωy¾ÙÚRÈ!Ÿ—™áx+o,•7ÏìÖ\‰ÌÀ뛩šš}µ84¯‹\nàÎú£&à>®(
4•¯kpoÞ¸‹î“QOÔÉ-_AÜÅ2àV‚·Ö§ºöºUî&>‘;¥êQyԕ¶œÒèp[÷ÈÂ_ô:¦M™öA¨*ºúCì£f³Ç£ k‹#”/3¼Ñ¡Å¦Ö`à+Ô4û;®¥¥ÅC@...·†AS×òQ°åm‡HX8&ِDˆ–M;X.D¬’Ž¶v~‰öðeÜ»<º¼Aò³‡}ÿc @—y>–ùº÷ìmäà^]áC–jñ`jù‚Wüu¿(›n>û”&WÀ³Ësê÷Gô¤cs¾,ò€÷˜µ)Æùzz2€IãHCìŒÄ…€	–÷–þû´q•A¦à¢ã=I9-
ÿzásfß]z&Ä~¶®Ž=¢[$,_«Ž/2B ¨˜4TŽ
Nr>@–n|…~.,þ¢ìÝâp¹áô)6¾(ÒÉ­±Û-muv­‹eú«Ä{Š¶Õ+#„Klïû[!h²µo>^Ágâ©õ0ž¯+Ÿdb>¨Ã;&JÞYqO’¬µ@©=Üìæ%©1!-rÞV’…Oé zHbfbT\À®ë+¨[âXJiöïY㽫Z–˜qϘï_÷ŠSÓ^‚#˜Ý’ëùY¼ê‹ßæ1«ÚvzF¹$ì¹Vå
KÏ9>å	e¨¢aaŸè:òç-ݖîaÎ8,?eI0>f÷8ŽFE´Ë­öÏÌeÙäiŽqˆ¡fIÙ±zfÈC¬öíò–ìϺë<*~“Ùh6½?wr·÷´%ë^Ú-pŽ¿>E¶<3ñ¾aÒ¨¨yË׎-Þoöj^.ÜÜ'õž^.ƒö?pI£¢#Ìú€{ÒÆãf_eaA¸ýa¼³Jã>JÞÈí ȍ†(ÊÁÀ+%=2Nüg8¿]_7Jvߞ`J…êlDWÍiVòc<yÍú=T†Ü²Ÿd
®Ÿq‹0r».œ½çÏ©êµË:P‰s%3TêjõÄVwo3 q÷Ø_`BË·…íÛrñà f»Ëq0­MxÍ)aùÄoFèÊù
béÃUia>d„]}Àp£‘·ÃÂ#rŸ­âü¼Tݛ˜·¥Š‹ï7¥i(j„òxÛí†Eíø‡¨×}ŠÏžU™­‹g¨²/yîxöҞŠeÁÍÍNÍÔ¸­gŞAe¸Õá¢8ÉGàj<K¦%JwÛW©ë/•|5¯ÓúU&Få€qÊeGOR´9ˆ¥þÊ$\{-Ý°A§•ÀŽ•0gÌéø	âÇòªý?”Ü[Ûÿ‚Îú¬êœ»äHQ—ÝWA+xÕ­¿VmÖ8¾w¿Ñ»4la ¢u÷\îåÓš‘қmÞ¾7¿ÕîÈô‰eà‚xîÏØî)7Ƴ…êGÞý}Qý8_
ÝôxŠÞ.€ÿm‚º¦³´¹ÜnMyŒ±ñ¼­ ˆ‚ƒÏe¶ô‹B×Û¦eØ´eójd@...–‰(ïSmuŒlný¢žî[†y¿ÙiÖΜᎪ}âÇü
êù‘/ãùWwÓ0XtOQ½¶’XAŸIÅ׊ô2zÈWT®,ÅéÖuã=>ÄëÅuýó¾^,îi‚tH|r4IÂFU"°	S0_Õë÷%¸Õuf¬D>K• DL|Máp¦™x!§ý=
[...1128 lines suppressed...]









ª!>









Update of /cvsroot/wonder/Wonder/Applications/Vacation/Frameworks/UWComponents/UWComponents.pbproj
In directory sc8-pr-cvs1:/tmp/cvs-serv17761/Frameworks/UWComponents/UWComponents.pbproj

Modified Files:
	project.pbxproj 
Log Message:
fixed year problem with settngs page.  Add ERJars framework to UWComponents


Index: project.pbxproj
===================================================================
RCS file: /cvsroot/wonder/Wonder/Applications/Vacation/Frameworks/UWComponents/UWComponents.pbproj/project.pbxproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** project.pbxproj	31 Mar 2003 02:37:00 -0000	1.4
--- project.pbxproj	23 Apr 2003 19:13:48 -0000	1.5
***************
*** 141,144 ****
--- 141,145 ----
  				412B6592041D325700000103,
  				D7FECEA70425411B00A31932,
+ 				D777C38004570F4C00000064,
  			);
  			isa = PBXSourcesBuildPhase;
***************
*** 154,157 ****
--- 155,159 ----
  				017C7B51FFD714AF7F000001,
  				022D130C0059B6D611CD2978,
+ 				D777C38C04571CD900000064,
  			);
  			isa = PBXFrameworksBuildPhase;
***************
*** 636,639 ****
--- 638,642 ----
  				40B58291FFD5E91B7F000001,
  				40B58292FFD5E91B7F000001,
+ 				D777C38B04571CD900000064,
  			);
  			isa = PBXGroup;
***************
*** 902,905 ****
--- 905,909 ----
  				412B6589041D325700000103,
  				412B658A041D325700000103,
+ 				D777C37F04570F4C00000064,
  			);
  			isa = PBXGroup;
***************
*** 995,998 ****
--- 999,1027 ----
  //D73
  //D74
+ 		D777C37F04570F4C00000064 = {
+ 			fileEncoding = 4;
+ 			isa = PBXFileReference;
+ 			name = UWJavaMail.java;
+ 			path = Sources/UWJavaMail.java;
+ 			refType = 4;
+ 		};
+ 		D777C38004570F4C00000064 = {
+ 			fileRef = D777C37F04570F4C00000064;
+ 			isa = PBXBuildFile;
+ 			settings = {
+ 			};
+ 		};
+ 		D777C38B04571CD900000064 = {
+ 			isa = PBXFrameworkReference;
+ 			name = ERJars.framework;
+ 			path = /Library/Frameworks/ERJars.framework;
+ 			refType = 0;
+ 		};
+ 		D777C38C04571CD900000064 = {
+ 			fileRef = D777C38B04571CD900000064;
+ 			isa = PBXBuildFile;
+ 			settings = {
+ 			};
+ 		};
  		D7FECEA60425411B00A31932 = {
  			fileEncoding = 30;

Update of /cvsroot/wonder/Wonder/Applications/Vacation/Vacation.pbproj
In directory sc8-pr-cvs1:/tmp/cvs-serv17761/Vacation.pbproj

Modified Files:
	mishra.pbxuser 
Log Message:
fixed year problem with settngs page.  Add ERJars framework to UWComponents


Index: mishra.pbxuser
===================================================================
RCS file: /cvsroot/wonder/Wonder/Applications/Vacation/Vacation.pbproj/mishra.pbxuser,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mishra.pbxuser	14 Apr 2003 13:48:18 -0000	1.2
--- mishra.pbxuser	23 Apr 2003 19:13:49 -0000	1.3
***************
*** 25,38 ****
  		isa = PBXExecutableBookmark;
  	};
- 	D74912140441967D00902413 = {
- 		fRef = 412B63C0041D308300000103;
- 		isa = PBXTextBookmark;
- 		name = "VacationEvent.java: validateForSave";
- 		rLen = 0;
- 		rLoc = 1274;
- 		rType = 0;
- 		vrLen = 1230;
[...1151 lines suppressed...]
! 			D7B7D750044AF45500F5222D = D7B7D750044AF45500F5222D;
! 			D7B7D751044AF45500F5222D = D7B7D751044AF45500F5222D;
! 			D7B7D752044AF45500F5222D = D7B7D752044AF45500F5222D;
! 			D7B7D753044AF45500F5222D = D7B7D753044AF45500F5222D;
! 			D7B7D754044AF45500F5222D = D7B7D754044AF45500F5222D;
! 			D7B7D755044AF45500F5222D = D7B7D755044AF45500F5222D;
! 			D7B7D756044AF45500F5222D = D7B7D756044AF45500F5222D;
! 			D7B7D757044AF45500F5222D = D7B7D757044AF45500F5222D;
! 			D7B7D758044AF45500F5222D = D7B7D758044AF45500F5222D;
! 			D7B7D759044AF45500F5222D = D7B7D759044AF45500F5222D;
! 			D7B7D75A044AF45500F5222D = D7B7D75A044AF45500F5222D;
! 			D7B7D75B044AF45500F5222D = D7B7D75B044AF45500F5222D;
! 			D7B7D75C044AF45500F5222D = D7B7D75C044AF45500F5222D;
! 			D7B7D75D044AF45500F5222D = D7B7D75D044AF45500F5222D;
! 			D7B7D75E044AF45500F5222D = D7B7D75E044AF45500F5222D;
! 			D7B7D75F044AF45500F5222D = D7B7D75F044AF45500F5222D;
! 			D7CCA44F044C56F200F128F1 = D7CCA44F044C56F200F128F1;
! 			D7CCA451044C56F200F128F1 = D7CCA451044C56F200F128F1;
  		};
  		projectwideBuildSettings = {

Update of /cvsroot/wonder/Wonder/Applications/Vacation/Components/SettingsPage.wo
In directory sc8-pr-cvs1:/tmp/cvs-serv17761/Components/SettingsPage.wo

Modified Files:
	SettingsPage.html SettingsPage.wod SettingsPage.woo 
Log Message:
fixed year problem with settngs page.  Add ERJars framework to UWComponents


Index: SettingsPage.html
===================================================================
RCS file: /cvsroot/wonder/Wonder/Applications/Vacation/Components/SettingsPage.wo/SettingsPage.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SettingsPage.html	14 Mar 2003 20:44:51 -0000	1.1
--- SettingsPage.html	23 Apr 2003 19:13:46 -0000	1.2
***************
*** 1 ****
! <WEBOBJECT NAME=Template><B><FONT COLOR=#ff0009><WEBOBJECT NAME=String2></WEBOBJECT></FONT></B><WEBOBJECT NAME=Form1><TABLE BORDER=1><TR><TD>Start of a new year:</TD><TD><WEBOBJECT NAME=TextField1></WEBOBJECT></TD><TD><WEBOBJECT NAME=SubmitButton1></WEBOBJECT></TD></TR><TR><TD>Create new year:</TD><TD><WEBOBJECT NAME=TextField2></WEBOBJECT></TD><TD><WEBOBJECT NAME=SubmitButton3></WEBOBJECT></TD></TR></TABLE><BR></WEBOBJECT></WEBOBJECT>
\ No newline at end of file
--- 1 ----
! <WEBOBJECT NAME=Template><B><FONT COLOR=#ff0009><WEBOBJECT NAME=String2></WEBOBJECT></FONT></B><WEBOBJECT NAME=Form1><TABLE BORDER=1><TR><TD>Start of a new year:</TD><TD><WEBOBJECT NAME=TextField1></WEBOBJECT><FONT SIZE=1><BR>*only the month and day are important, year is irrelevant</FONT></TD><TD><WEBOBJECT NAME=SubmitButton1></WEBOBJECT></TD></TR><TR><TD>Create new year:</TD><TD><WEBOBJECT NAME=TextField2></WEBOBJECT></TD><TD><WEBOBJECT NAME=SubmitButton3></WEBOBJECT></TD></TR></TABLE><BR></WEBOBJECT></WEBOBJECT>
\ No newline at end of file

Index: SettingsPage.wod
===================================================================
RCS file: /cvsroot/wonder/Wonder/Applications/Vacation/Components/SettingsPage.wo/SettingsPage.wod,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SettingsPage.wod	14 Mar 2003 20:44:52 -0000	1.1
--- SettingsPage.wod	23 Apr 2003 19:13:47 -0000	1.2
***************
*** 1,8 ****
! Form1: WOForm {
! 	multipleSubmit = true;
  }
  
  String2: WOString {
  	value = message;
  }
  
--- 1,16 ----
! Template: Template {
  }
  
  String2: WOString {
  	value = message;
+ }
+ 
+ Form1: WOForm {
+ 	multipleSubmit = true;
+ }
+ 
+ TextField1: WOTextField {
+ 	dateformat = application.settings.fullCalendarDateFormat;
+ 	value = setting.archiveDate;
  }
  
***************
*** 12,32 ****
  }
  
- SubmitButton3: WOSubmitButton {
- 	action = createNewYear;
- 	value = "Add New Year";
- }
- 
- Template: Template {
- }
- 
- TextField1: WOTextField {
- 	dateformat = application.settings.shortCalendarDateFormat;
- 	value = setting.archiveDate;
- }
- 
  TextField2: WOTextField {
  	maxlength = 4;
  	size = 4;
  	value = newYear;
  }
  
--- 20,32 ----
  }
  
  TextField2: WOTextField {
  	maxlength = 4;
  	size = 4;
  	value = newYear;
+ }
+ 
+ SubmitButton3: WOSubmitButton {
+ 	action = createNewYear;
+ 	value = "Add New Year";
  }
  

Index: SettingsPage.woo
===================================================================
RCS file: /cvsroot/wonder/Wonder/Applications/Vacation/Components/SettingsPage.wo/SettingsPage.woo,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SettingsPage.woo	14 Mar 2003 20:44:53 -0000	1.1
--- SettingsPage.woo	23 Apr 2003 19:13:47 -0000	1.2
***************
*** 1,5 ****
! {
!     "WebObjects Release" = "WebObjects 5.0"; 
!     encoding = NSWindowsCP1252StringEncoding; 
!     variables = {}; 
! }
--- 1,5 ----
! {
!     "WebObjects Release" = "WebObjects 5.0"; 
!     encoding = NSWindowsCP1252StringEncoding; 
!     variables = {}; 
! }