Fix NPE in ForgotPassword. Remove company user reference and use NPO to maintain functionality

cmsWebApp/sql/CompanyUserNPO.xml

+<?xml version="1.0" encoding="UTF-8"?>
+    <!-- @AutoRun -->
+
+    <OBJECTS name="" xmlns:oneit="http://www.1iT.com.au"><NODE name="Script" factory="Vector">
+
+        <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.DefineTableOperation">
+			<tableName factory="String">it_does_not_matter</tableName>
+			<column name="object_id" type="Long" nullable="false" length="11"/>
+			<column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
+			<column name="object_created_date" type="Date" nullable="false" length="22"/>
+			<column name="" type="CLOB" nullable="true"/>
+			</NODE>
+
+        </NODE></OBJECTS>
\ No newline at end of file

cmsWebApp/sql/ms/CompanyUserNPO.sql

+
+-- DROP TABLE it_does_not_matter;
+
+
+
+CREATE TABLE it_does_not_matter (
+    object_id int NOT NULL ,
+    object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
+    object_created_date datetime DEFAULT getdate() NOT NULL
+    ,
+     text NULL
+    );
+
+
+
+ALTER TABLE it_does_not_matter ADD    
+    CONSTRAINT PK_it_does_not_matter PRIMARY KEY 
+    (
+        object_id
+    ) ;
+    
+    
+    
\ No newline at end of file

cmsWebApp/sql/oracle/CompanyUserNPO.sql

+
+-- DROP TABLE it_does_not_matter;
+
+
+
+
+CREATE TABLE it_does_not_matter (
+    object_id number(12) NOT NULL ,
+    object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
+    object_created_date date DEFAULT SYSDATE NOT NULL
+    ,
+     clob NULL
+    );
+
+
+
+ALTER TABLE it_does_not_matter ADD    
+    CONSTRAINT PK_it_does_not_matter PRIMARY KEY 
+    (
+        object_id
+    ) ;
+    
+    
+    
\ No newline at end of file

cmsWebApp/sql/postgres/CompanyUserNPO.sql

+
+-- @AutoRun
+-- drop table it_does_not_matter;
+
+
+
+CREATE TABLE it_does_not_matter (
+    object_id numeric(12) NOT NULL ,
+    object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
+    object_created_date timestamp DEFAULT NOW() NOT NULL
+    ,
+     text NULL
+    );
+
+
+
+ALTER TABLE it_does_not_matter ADD    
+    CONSTRAINT pk_it_does_not_matter PRIMARY KEY 
+    (
+        object_id
+    ) ;
+    
+    
+    
\ No newline at end of file

cmsWebApp/src/performa/form/ForgotPasswordFP.java

@@ -30,8 +30,9 @@ public class ForgotPasswordFP extends SaveFP
         HttpServletRequest  request     =   submission.getRequest();
         ObjectTransaction   objTran     =   process.getTransaction();
         Job                 job         =   (Job) process.getAttribute("Job");
-        CompanyUser         tmpComUser  =   (CompanyUser) process.getAttribute("CompanyUser");
+        CompanyUserNPO      tmpComUser  =   (CompanyUserNPO) request.getAttribute("CompanyUser");
         String              email       =   job != null ? job.getEmail() : (tmpComUser != null ? tmpComUser.getEmail() : null);
+        Map                 emailParams =   null;
 
         Debug.assertion(StringUtils.subBlanks(email) != null, "Email not avaialble");
         
@@ -55,11 +56,15 @@ public class ForgotPasswordFP extends SaveFP
         {
             LogMgr.log(LOG, LogLevel.PROCESSING1, "Inside ForgotPasswordFP for send reset pasword link mail to ", email);
 
-            Map         emailParams;
-            CompanyUser companyUser =   secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
-            
-            if(companyUser != null)
+            if(tmpComUser != null)
             {
+                CompanyUser companyUser =   secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
+
+                if(companyUser == null)
+                {
+                    throw new BusinessException("Sorry, you are not an authorised user to access admin portal.");
+                }
+                
                 if(companyUser.getForgotPasswordKey() == null)
                 {
                     String  resetCode   =   new RandomStringGen().generateHumanAlphaNum(DEFAULT_PASSWORD_LENGTH);
@@ -73,7 +78,7 @@ public class ForgotPasswordFP extends SaveFP
                                                                 + "?id=" + companyUser.getID() 
                                                                 + "&key=" + companyUser.getForgotPasswordKey()).toMap();
             }
-            else
+            else if(job != null)
             {
                 Candidate   candidate   =   secUser.getExtension(Candidate.REFERENCE_Candidate);
                 
@@ -119,12 +124,6 @@ public class ForgotPasswordFP extends SaveFP
         {
             throw new BusinessException("Sorry, we don't recognize that email address.");
         }
-        
-        //remove temporary object
-        if(tmpComUser!=null)
-        {
-            tmpComUser.delete();
-        }
             
         return super.processForm(process, submission, params);
     }
@@ -145,15 +144,15 @@ public class ForgotPasswordFP extends SaveFP
         
         HttpServletRequest  request     =   submission.getRequest();
         Job                 job         =   (Job) process.getAttribute("Job");
-        CompanyUser         companyUser =   (CompanyUser) process.getAttribute("CompanyUser");
+        CompanyUserNPO      companyUser =   (CompanyUserNPO) request.getAttribute("CompanyUser");
 
-        if(job!=null)
+        if(job != null)
         {
             BusinessObjectParser.assertFieldCondition(StringUtils.subBlanks(job.getEmail()) != null, job, Job.FIELD_Email, "mandatory", exceptions, true, request);
         }
-        else if(companyUser!=null)
+        else if(companyUser != null)
         {
-            BusinessObjectParser.assertFieldCondition(StringUtils.subBlanks(companyUser.getEmail()) != null, companyUser, CompanyUser.FIELD_Email, "mandatory", exceptions, true, request);
+            BusinessObjectParser.assertFieldCondition(StringUtils.subBlanks(companyUser.getEmail()) != null, companyUser, CompanyUserNPO.FIELD_Email, "mandatory", exceptions, true, request);
         }
     }
 }
\ No newline at end of file

cmsWebApp/src/performa/orm/BaseCompanyUserNPO.java

+/*
+ * IMPORTANT!!!! XSL Autogenerated class, DO NOT EDIT!!!!!
+ * Template: Infrastructure8.2 rev3 [oneit.objstore.BusinessObjectTemplate.xsl]
+ *
+ *   Version: 1.0
+ *   Vendor: Apache Software Foundation (Xalan XSLTC)
+ *   Vendor URL: http://xml.apache.org/xalan-j
+ */
+
+
+    package performa.orm;
+
+import java.io.*;
+import java.util.*;
+import oneit.appservices.config.*;
+import oneit.logging.*;
+import oneit.objstore.*;
+import oneit.objstore.assocs.*;
+import oneit.objstore.attributes.*;
+import oneit.objstore.rdbms.filters.*;
+import oneit.objstore.parser.*;
+import oneit.objstore.validator.*;
+import oneit.objstore.utils.*;
+import oneit.utils.*;
+import oneit.utils.filter.Filter;
+import oneit.utils.transform.*;
+import oneit.utils.parsers.FieldException;
+
+import oneit.servlets.orm.*;
+
+
+
+public abstract class BaseCompanyUserNPO extends NonPersistentBO
+{
+    // Reference instance for the object
+    public static final CompanyUserNPO REFERENCE_CompanyUserNPO = new CompanyUserNPO ();
+
+    // Reference instance for the object
+    public static final CompanyUserNPO DUMMY_CompanyUserNPO = new DummyCompanyUserNPO ();
+
+    // Static constants corresponding to field names
+    
+    public static final String FIELD_Email = "Email";
+
+    // Static constants corresponding to searches
+    
+
+    // Static constants corresponding to attribute helpers
+    private static final DefaultAttributeHelper<CompanyUserNPO> HELPER_Email = DefaultAttributeHelper.INSTANCE;
+    
+
+    // Private attributes corresponding to business object data
+    private String _Email;
+    
+
+    // Private attributes corresponding to single references
+    
+
+    // Private attributes corresponding to multiple references
+    
+
+    // Map of maps of metadata
+    private static final Map ATTRIBUTES_METADATA_CompanyUserNPO = new HashMap ();
+
+    // Arrays of validators for each attribute
+    private static final AttributeValidator[] FIELD_Email_Validators;
+    
+
+    // Arrays of behaviour decorators
+    private static final CompanyUserNPOBehaviourDecorator[] CompanyUserNPO_BehaviourDecorators;
+    
+    static
+    {
+        try
+        {
+            
+            
+            Map  validatorMapping = ((Map)ConfigMgr.getConfigObject ("CONFIG.ORMVALIDATOR", "ValidatorMapping"));
+
+            FIELD_Email_Validators = (AttributeValidator[])setupAttribMetaData_Email(validatorMapping).toArray (new AttributeValidator[0]);
+            
+
+            REFERENCE_CompanyUserNPO.initialiseReference ();
+            DUMMY_CompanyUserNPO.initialiseReference ();
+            CompanyUserNPO_BehaviourDecorators = BaseBusinessClass.getBBCBehaviours(CompanyUserNPO.class).toArray(new CompanyUserNPOBehaviourDecorator[0]);
+        }
+        catch (RuntimeException e)
+        {
+            LogMgr.log (BUSINESS_OBJECTS, LogLevel.SYSTEMERROR1, e, "Error initialising");
+            throw e;
+        }
+    }
+
+    
+    // Meta Info setup
+    private static List setupAttribMetaData_Email(Map validatorMapping)
+    {
+        Map  metaInfo   = new HashMap ();
+
+        metaInfo.put ("name", "Email");
+        metaInfo.put ("type", "String");
+        metaInfo.put ("validators", "Email");
+        
+        LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for CompanyUserNPO.Email:", metaInfo);
+        ATTRIBUTES_METADATA_CompanyUserNPO.put (FIELD_Email, Collections.unmodifiableMap (metaInfo));
+
+        List validators = BaseBusinessClass.getAttribValidators(CompanyUserNPO.class, "Email", metaInfo, validatorMapping);
+        LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for CompanyUserNPO.Email:", validators);        
+
+        return validators;
+    }
+    
+    // END OF STATIC METADATA DEFINITION    
+    
+    
+    
+    // This constructor should not be called
+    protected BaseCompanyUserNPO ()
+    {
+    }
+
+
+    protected BBCBehaviourDecorator[] getBehaviours()
+    {
+        return CompanyUserNPO_BehaviourDecorators;
+    }
+    
+    
+
+
+    
+
+
+    // Initialise the attributes
+    protected void _initialiseNewObjAttributes (ObjectTransaction transaction) throws StorageException
+    {
+        super._initialiseNewObjAttributes (transaction);
+
+        
+        _Email = (String)(HELPER_Email.initialise (_Email));
+    }
+
+
+    // Initialise the associations
+    protected void _initialiseAssociations ()
+    {
+        super._initialiseAssociations ();
+
+        
+    }
+
+
+    // Initialise the associations
+    protected BaseBusinessClass initialiseReference ()
+    {
+        super.initialiseReference ();
+        
+        
+        
+        return this;
+    }
+
+    
+
+    /**
+     * Get the attribute Email
+     */
+    public String getEmail ()
+    {
+        assertValid();
+        String valToReturn = _Email;
+
+            for (CompanyUserNPOBehaviourDecorator bhd : CompanyUserNPO_BehaviourDecorators)
+            {
+                valToReturn = bhd.getEmail ((CompanyUserNPO)this, valToReturn);
+            }
+            
+            return valToReturn;
+        
+    }
+
+
+    /**
+     * Called prior to the attribute changing.  Subclasses need not call super.  If a field exception
+     * is thrown, the attribute change will fail.  The new value is different to the old value.
+     */
+    protected void preEmailChange (String newEmail) throws FieldException
+    {
+    }
+
+
+    /**
+     * Called after the attribute changes.
+     * If a field exception is thrown, the value is still changed, however it 
+     * may lead to the TX being rolled back
+     */
+    protected void postEmailChange () throws FieldException
+    {
+    }
+
+    
+    public FieldWriteability getWriteability_Email ()
+    {
+        return getFieldWritabilityUtil (FieldWriteability.TRUE);
+    }
+
+    /**
+     * Set the attribute Email.  Checks to ensure a new value
+     * has been supplied.  If so, marks the field as altered and sets the attribute.
+     */
+    public void setEmail (String newEmail) throws FieldException
+    {
+        boolean oldAndNewIdentical = HELPER_Email.compare (_Email, newEmail);
+        
+        try
+        {
+            for (CompanyUserNPOBehaviourDecorator bhd : CompanyUserNPO_BehaviourDecorators)
+            {
+                newEmail = bhd.setEmail ((CompanyUserNPO)this, newEmail);
+                oldAndNewIdentical = HELPER_Email.compare (_Email, newEmail);
+            }
+
+            
+
+            if (FIELD_Email_Validators.length > 0)
+            {
+                Object newEmailObj = HELPER_Email.toObject (newEmail);
+
+                if (newEmailObj != null)
+                {
+                    int     loopMax = FIELD_Email_Validators.length;
+                    Map     metadata = (Map)ATTRIBUTES_METADATA_CompanyUserNPO.get (FIELD_Email);
+
+                    for (int v = 0 ; v < loopMax ; ++v)
+                    {
+                        FIELD_Email_Validators[v].checkAttribute (this, FIELD_Email, metadata, newEmailObj);
+                    }
+                }
+            }
+        }
+        catch (FieldException e)
+        {
+            if (!oldAndNewIdentical)
+            {
+                e.setWouldModify ();
+            }
+            
+            throw e;
+        }
+
+        if (!oldAndNewIdentical)
+        {
+            assertValid();
+            Debug.assertion (getWriteability_Email () != FieldWriteability.FALSE, "Field  Email is not writeable");
+            preEmailChange (newEmail);
+            markFieldChange (FIELD_Email);
+            _Email = newEmail;            
+            postFieldChange (FIELD_Email);
+            postEmailChange ();
+        }
+    }
+
+
+
+    /**
+     * A list of multi assoc names e.g. list of strings.
+     */
+    public List<String> getSingleAssocs()
+    {
+        List result = super.getSingleAssocs ();
+
+        
+
+        return result;
+    }
+    
+    
+    public BaseBusinessClass getSingleAssocReferenceInstance (String assocName)
+    {
+        if (assocName == null)
+        {
+            throw new RuntimeException ("Game over == null!");
+        }
+        
+        else
+        {
+            return super.getSingleAssocReferenceInstance (assocName);
+        }
+    }
+
+
+    public String getSingleAssocBackReference(String assocName)
+    {
+        if (assocName == null)
+        {
+            throw new RuntimeException ("Game over == null!");
+        }
+        
+        else
+        {
+            return super.getSingleAssocBackReference (assocName);
+        }
+    }
+    
+    
+    public BaseBusinessClass getSingleAssoc (String assocName) throws StorageException
+    {
+        if (assocName == null)
+        {
+            throw new RuntimeException ("Game over == null!");
+        }
+        
+        else
+        {
+            return super.getSingleAssoc (assocName);
+        }
+    }
+
+
+    public BaseBusinessClass getSingleAssoc (String assocName, Get getType) throws StorageException
+    {
+        if (assocName == null)
+        {
+            throw new RuntimeException ("Game over == null!");
+        }
+        
+        else
+        {
+            return super.getSingleAssoc (assocName, getType);
+        }
+    }
+
+
+    public Long getSingleAssocID (String assocName) throws StorageException
+    {
+        if (assocName == null)
+        {
+            throw new RuntimeException ("Game over == null!");
+        }
+        
+        else
+        {
+            return super.getSingleAssocID (assocName);
+        }
+    }
+
+
+    public void setSingleAssoc (String assocName, BaseBusinessClass newValue) throws StorageException, FieldException
+    {
+        if (assocName == null)
+        {
+            throw new RuntimeException ("Game over == null!");
+        }
+        
+        else
+        {
+            super.setSingleAssoc (assocName, newValue);
+        }
+    }
+
+
+
+    /**
+     * A list of multi assoc names e.g. list of strings.
+     */
+    public List<String> getMultiAssocs()
+    {
+        List result = super.getMultiAssocs ();
+
+        
+
+        return result;
+    }
+
+
+    /**
+     * Get the reference instance for the multi assoc name.
+     */
+    public BaseBusinessClass getMultiAssocReferenceInstance(String attribName)
+    {
+        
+
+        return super.getMultiAssocReferenceInstance(attribName);
+    }
+
+
+    public String getMultiAssocBackReference(String attribName)
+    {
+        
+
+        return super.getMultiAssocBackReference(attribName);
+    }
+
+
+    /**
+     * Get the assoc count for the multi assoc name.
+     */
+    public int getMultiAssocCount(String attribName) throws StorageException
+    {
+        
+
+        return super.getMultiAssocCount(attribName);
+    }
+
+
+    /**
+     * Get the assoc at a particular index
+     */
+    public BaseBusinessClass getMultiAssocAt(String attribName, int index) throws StorageException
+    {
+        
+
+        return super.getMultiAssocAt(attribName, index);
+    }
+
+
+    /**
+     * Add to a multi assoc by attribute name
+     */
+    public void addToMultiAssoc(String attribName, BaseBusinessClass newElement) throws StorageException
+    {
+        
+
+        super.addToMultiAssoc(attribName, newElement);
+    }
+
+    /**
+     * Remove from a multi assoc by attribute name
+     */
+    public void removeFromMultiAssoc(String attribName, BaseBusinessClass oldElement) throws StorageException
+    {
+        
+
+        super.removeFromMultiAssoc(attribName, oldElement);
+    }
+
+
+    protected void __loadMultiAssoc (String attribName, BaseBusinessClass[] elements)
+    {
+        
+
+        super.__loadMultiAssoc(attribName, elements);
+    }
+
+
+    protected boolean __isMultiAssocLoaded (String attribName)
+    {
+        
+
+        return super.__isMultiAssocLoaded(attribName);
+    }
+
+    
+
+
+
+    public void onDelete ()
+    {
+        try 
+        {
+        }
+        catch (Exception e)
+        {
+            throw NestedException.wrap(e);
+        }
+
+        super.onDelete ();
+    }
+
+
+    public CompanyUserNPO newInstance ()
+    {
+        return new CompanyUserNPO ();
+    }
+
+
+    public CompanyUserNPO referenceInstance ()
+    {
+        return REFERENCE_CompanyUserNPO;
+    }
+
+
+    public CompanyUserNPO getInTransaction (ObjectTransaction t) throws StorageException
+    {
+        return getCompanyUserNPOByID (t, getObjectID());
+    }
+    
+    
+    public BaseBusinessClass dummyInstance ()
+    {
+        return DUMMY_CompanyUserNPO;
+    }
+
+
+    public String getBaseSetName ()
+    {
+        return "it_does_not_matter";
+    }
+
+
+
+
+
+    /**
+     * This is where an object returns the Persistent sets that will
+     * store it into the database.
+     * The should be entered into allSets
+     */
+    public void getPersistentSets (PersistentSetCollection allSets)
+    {
+        ObjectStatus        myStatus = getStatus ();
+        PersistentSetStatus myPSetStatus = myStatus.getPSetStatus();
+        ObjectID            myID = getID();
+
+        super.getPersistentSets (allSets);
+
+        
+        PersistentSet   it_does_not_matterPSet = allSets.getPersistentSet (myID, "it_does_not_matter", myPSetStatus);
+
+        it_does_not_matterPSet.setAttrib (FIELD_ObjectID, myID);
+        it_does_not_matterPSet.setAttrib (FIELD_Email, HELPER_Email.toObject (_Email)); //
+        
+    }
+
+
+    /**
+     * Sets the objects state based on Persistent sets.
+     */
+    public void setFromPersistentSets (ObjectID objectID, PersistentSetCollection allSets)
+    {
+        super.setFromPersistentSets (objectID, allSets);
+
+        
+        PersistentSet   it_does_not_matterPSet = allSets.getPersistentSet (objectID, "it_does_not_matter");
+
+        _Email = (String)(HELPER_Email.fromObject (_Email, it_does_not_matterPSet.getAttrib (FIELD_Email))); //
+        
+    }
+
+
+
+
+
+    public void setAttributesFrom (BaseBusinessClass other, MultiException e)
+    {
+        super.setAttributesFrom (other, e);
+
+        if (other instanceof CompanyUserNPO)
+        {
+            CompanyUserNPO otherCompanyUserNPO = (CompanyUserNPO)other;
+            
+            try
+            {
+                setEmail (otherCompanyUserNPO.getEmail ());
+            }
+            catch (FieldException ex)
+            {
+                e.addException (ex);
+            }
+            
+        }
+    }
+
+
+    /**
+     * Set the attributes in this to copies of the attributes in source.
+     */
+    public void copyAttributesFrom (BaseBusinessClass source)
+    {
+        super.copyAttributesFrom (source);
+
+        if (source instanceof BaseCompanyUserNPO)
+        {
+            BaseCompanyUserNPO sourceCompanyUserNPO = (BaseCompanyUserNPO)(source);
+
+            _Email = sourceCompanyUserNPO._Email;
+            
+        }
+    }
+
+
+    /**
+     * Set the associations in this to copies of the attributes in source.
+     */
+    public void copySingleAssociationsFrom (BaseBusinessClass source, boolean linkToGhosts)
+    {
+        super.copySingleAssociationsFrom (source, linkToGhosts);
+
+        if (source instanceof BaseCompanyUserNPO)
+        {
+            BaseCompanyUserNPO sourceCompanyUserNPO = (BaseCompanyUserNPO)(source);
+
+            
+        }
+    }
+
+
+    /**
+     * Set the associations in this to copies of the attributes in source.
+     */
+    public void copyAssociationsFrom (BaseBusinessClass source, boolean linkToGhosts)
+    {
+        super.copyAssociationsFrom (source, linkToGhosts);
+
+        if (source instanceof BaseCompanyUserNPO)
+        {
+            BaseCompanyUserNPO sourceCompanyUserNPO = (BaseCompanyUserNPO)(source);
+
+            
+        }
+    }
+
+
+    public void validate (ValidationContext context)
+    {
+        super.validate (context);
+
+        
+    }
+
+
+    /**
+     * Subclasses must override this to read in their attributes
+     */
+    protected void readExternalData(Map<String, Object> vals) throws IOException, ClassNotFoundException
+    {
+        super.readExternalData(vals);
+
+        _Email = (String)(HELPER_Email.readExternal (_Email, vals.get(FIELD_Email))); //
+        
+    }
+
+
+    /**
+     * Subclasses must override this to write out their attributes
+     */
+    protected void writeExternalData(Map<String, Object> vals) throws IOException
+    {
+        super.writeExternalData(vals);
+
+        vals.put (FIELD_Email, HELPER_Email.writeExternal (_Email));
+        
+    }
+
+
+    public void compare (BaseBusinessClass other, AttributeChangeListener listener) throws StorageException
+    {
+        super.compare (other, listener);
+
+        if (other instanceof BaseCompanyUserNPO)
+        {
+            BaseCompanyUserNPO otherCompanyUserNPO = (BaseCompanyUserNPO)(other);
+
+            
+            if (!HELPER_Email.compare(this._Email, otherCompanyUserNPO._Email))
+            {
+                listener.notifyFieldChange(this, other, FIELD_Email, HELPER_Email.toObject(this._Email), HELPER_Email.toObject(otherCompanyUserNPO._Email));
+            }
+
+            // Compare single assocs
+            
+
+            // Compare multiple assocs
+            
+        }
+    }
+
+
+    public void visitTransients (AttributeVisitor visitor) throws StorageException
+    {
+        super.visitAttributes (visitor);
+
+        
+    }
+
+
+    public void visitAttributes (AttributeVisitor visitor) throws StorageException
+    {
+        super.visitAttributes (visitor);
+
+        visitor.visitField(this, FIELD_Email, HELPER_Email.toObject(getEmail()));
+        
+    }
+
+
+    public void visitAssociations (AssociationVisitor visitor, AssociatedScope scope) throws StorageException
+    {
+        super.visitAssociations (visitor, scope);
+
+        
+    }
+
+
+    public static CompanyUserNPO createCompanyUserNPO (ObjectTransaction transaction) throws StorageException
+    {
+        CompanyUserNPO     result = new CompanyUserNPO ();
+
+        result.initialiseNewObject (transaction);
+
+        return result;
+    }
+
+
+    public static CompanyUserNPO getCompanyUserNPOByID (ObjectTransaction transaction, Long objectID) throws StorageException
+    {
+        return (CompanyUserNPO)(transaction.getObjectByID (REFERENCE_CompanyUserNPO, objectID));
+    }
+
+    public boolean testFilter (String attribName, QueryFilter filter) throws StorageException
+    {
+        if (false)
+        {
+            throw new RuntimeException ("Game over man!!");
+        }
+        else if (attribName.equals (FIELD_Email))
+        {
+            return filter.matches (getEmail ());
+        }
+        else
+        {
+            return super.testFilter (attribName, filter);
+        }
+    }
+
+
+
+
+    public Object getAttribute (String attribName)
+    {
+        if (false)
+        {
+            throw new RuntimeException ("Game over man!!");
+        }
+        else if (attribName.equals (FIELD_Email))
+        {
+            return HELPER_Email.toObject (getEmail ());
+        }
+        else
+        {
+            return super.getAttribute (attribName);
+        }
+    }
+
+
+    public AttributeHelper getAttributeHelper (String attribName)
+    {
+        if (false)
+        {
+            throw new RuntimeException ("Game over man!!");
+        }
+        else if (attribName.equals (FIELD_Email))
+        {
+            return HELPER_Email;
+        }
+        else
+        {
+            return super.getAttributeHelper (attribName);
+        }
+    }
+
+
+    public void setAttribute (String attribName, Object attribValue) throws FieldException
+    {
+        if (false)
+        {
+            throw new RuntimeException ("Game over man!!");
+        }
+        else if (attribName.equals (FIELD_Email))
+        {
+            setEmail ((String)(HELPER_Email.fromObject (_Email, attribValue)));            
+        }
+        else
+        {
+            super.setAttribute (attribName, attribValue);
+        }
+    }
+
+
+
+    public boolean isWriteable (String fieldName)
+    {
+        return getWriteable (fieldName) == FieldWriteability.TRUE;
+    }
+
+
+    public FieldWriteability getWriteable (String fieldName)
+    {
+        if (false)
+        {
+            throw new RuntimeException ("Game over man!!");
+        }
+        else if (fieldName.equals (FIELD_Email))
+        {
+            return getWriteability_Email ();
+        }
+        else
+        {
+            return super.getWriteable (fieldName);
+        }
+    }
+
+
+    public void putUnwriteable (Set<String> fields)
+    {
+        
+            if (getWriteability_Email () != FieldWriteability.TRUE)
+            {
+                fields.add (FIELD_Email);
+            }
+        
+
+        super.putUnwriteable (fields);
+    }
+
+    public List<AbstractAttribute> getAttributes ()
+    {
+        List result = super.getAttributes ();
+
+        
+        result.add(HELPER_Email.getAttribObject (getClass (), _Email, false, FIELD_Email));
+
+        return result;
+    }
+
+
+    public Map getAttributeMetadata (String attribute)
+    {
+        if (ATTRIBUTES_METADATA_CompanyUserNPO.containsKey (attribute))
+        {
+            return (Map)ATTRIBUTES_METADATA_CompanyUserNPO.get (attribute);
+        }
+        else
+        {
+            return super.getAttributeMetadata (attribute);
+        }
+    }
+
+
+    public Object getAttributeMetadata (String attribute, String metadata)
+    {
+        if (ATTRIBUTES_METADATA_CompanyUserNPO.containsKey (attribute))
+        {
+            return ((Map)ATTRIBUTES_METADATA_CompanyUserNPO.get (attribute)).get(metadata);
+        }
+        else
+        {
+            return super.getAttributeMetadata (attribute, metadata);
+        }
+    }
+
+    public void preCommit (boolean willBeStored) throws Exception
+    {
+        super.preCommit(willBeStored);
+        
+        if(willBeStored)
+        {
+        
+        }
+    }
+
+    public oneit.servlets.objstore.binary.BinaryContentHandler getBinaryContentHandler(String attribName)
+    {
+        
+        
+        return super.getBinaryContentHandler(attribName);
+    }
+
+    public static class CompanyUserNPOBehaviourDecorator extends BaseBusinessClass.BBCBehaviourDecorator<CompanyUserNPO>
+    {
+
+    /**
+     * Get the attribute Email
+     */
+    public String getEmail (CompanyUserNPO obj, String original)
+    {
+        return original;
+    }
+
+    /**
+     * Change the value set for attribute Email.
+     * May modify the field beforehand
+     * Occurs before validation.
+     */
+    public String setEmail (CompanyUserNPO obj, String newEmail) throws FieldException
+    {
+        return newEmail;
+    }
+
+    }
+
+    
+    public ORMPipeLine pipes()
+    {
+        return new CompanyUserNPOPipeLineFactory<CompanyUserNPO, CompanyUserNPO> ((CompanyUserNPO)this);
+    }
+      
+    /**
+     * Use this instead of pipes() to get rid of type casting.
+     */  
+    public CompanyUserNPOPipeLineFactory<CompanyUserNPO, CompanyUserNPO> pipelineCompanyUserNPO()
+    {
+        return (CompanyUserNPOPipeLineFactory<CompanyUserNPO, CompanyUserNPO>) pipes();
+    }
+    
+    public static CompanyUserNPOPipeLineFactory<CompanyUserNPO, CompanyUserNPO> pipesCompanyUserNPO(Collection<CompanyUserNPO> items)
+    {
+        return REFERENCE_CompanyUserNPO.new CompanyUserNPOPipeLineFactory<CompanyUserNPO, CompanyUserNPO> (items);
+    }
+    
+    public static CompanyUserNPOPipeLineFactory<CompanyUserNPO, CompanyUserNPO> pipesCompanyUserNPO(CompanyUserNPO[] _items)
+    {
+        return pipesCompanyUserNPO(Arrays.asList (_items));
+    }
+    
+    public static CompanyUserNPOPipeLineFactory<CompanyUserNPO, CompanyUserNPO> pipesCompanyUserNPO()
+    {
+        return pipesCompanyUserNPO((Collection)null);
+    }
+    
+    
+    public class CompanyUserNPOPipeLineFactory<From extends BaseBusinessClass, Me extends CompanyUserNPO> extends NonPersistentBOPipeLineFactory<From, Me>    
+    {
+        public <Prev> CompanyUserNPOPipeLineFactory (PipeLine<From, Prev> pipeLine, Pipe<Prev, Me> nextPipe)
+        {
+            super (pipeLine, nextPipe);
+        }
+        
+        public CompanyUserNPOPipeLineFactory (From seed)
+        {
+            super(seed);
+        }
+
+        public CompanyUserNPOPipeLineFactory (Collection<From> seed)
+        {
+            super(seed);
+        }
+        
+        
+        public PipeLine<From, ? extends Object> to(String name)
+        {
+            if (name.equals ("Email"))
+            {
+                return toEmail ();
+            }                
+            
+            
+            return super.to(name);
+        }
+        
+        
+        public PipeLine<From, String> toEmail () { return pipe(new ORMAttributePipe<Me, String>(FIELD_Email));  }
+        
+    }
+    
+    public boolean isTransientAttrib(String attribName)
+    {
+        
+
+        return super.isTransientAttrib(attribName);
+    }
+
+    public boolean isTransientSingleReference(String assocName)
+    {
+        
+
+        return super.isTransientSingleReference(assocName);
+    }
+}
+
+class DummyCompanyUserNPO extends CompanyUserNPO
+{
+    // Default constructor primarily to support Externalisable
+    public DummyCompanyUserNPO()
+    {
+        super();
+    }
+
+    public void assertValid ()
+    {
+    }
+
+
+}
+
+    

cmsWebApp/src/performa/orm/CompanyUser.java

@@ -93,19 +93,6 @@ public class CompanyUser extends BaseCompanyUser
     }
     
     
-    public Boolean emailExists()
-    {
-        if(getEmail() != null)
-        {
-            SecUser user    = SecUser.searchNAME(getTransaction(), getEmail().toLowerCase());
-
-            return user != null && user.getExtension(CompanyUser.REFERENCE_CompanyUser) != null;
-        }
-        
-        return Boolean.FALSE;
-    }
-    
-    
     public String getEmailAddressFromUser()
     {
         return  StringUtils.isEmailAddress(getUser().getUserName()) ? getUser().getUserName() : getUser().getEmail();

cmsWebApp/src/performa/orm/CompanyUserNPO.java

+package performa.orm;
+
+import oneit.security.SecUser;
+
+
+public class CompanyUserNPO extends BaseCompanyUserNPO
+{
+    private static final long serialVersionUID = 0L;
+    
+    // This constructor should not be called
+    public CompanyUserNPO ()
+    {
+        // Do not add any code to this, always put it in initialiseNewObject
+    }
+    
+    public Boolean emailExists()
+    {
+        if(getEmail() != null)
+        {
+            SecUser user    = SecUser.searchNAME(getTransaction(), getEmail().toLowerCase());
+
+            return user != null && user.getExtension(CompanyUser.REFERENCE_CompanyUser) != null;
+        }
+        
+        return Boolean.FALSE;
+    }
+}
\ No newline at end of file

cmsWebApp/src/performa/orm/CompanyUserNPO.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<ROOT xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://www.oneit.com.au/schemas/5.2/BusinessObject.xsd'>
+
+    <BUSINESSCLASS  name="CompanyUserNPO"   package="performa.orm"  superclass="NonPersistentBO">
+        
+        <IMPORT value="oneit.servlets.orm.*"/>
+
+        <TABLE  name="it_does_not_matter" tablePrefix="object"    polymorphic="FALSE">
+
+            <ATTRIB name="Email"    type="String"   validators="Email"  />
+            
+        </TABLE>
+        
+    </BUSINESSCLASS>
+    
+</ROOT>
\ No newline at end of file

cmsWebApp/src/performa/orm/CompanyUserNPOPersistenceMgr.java

+
+package performa.orm;
+
+import java.io.*;
+import java.util.*;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import oneit.logging.*;
+import oneit.objstore.*;
+import oneit.objstore.assocs.*;
+import oneit.objstore.rdbms.*;
+import oneit.objstore.utils.*;
+import oneit.sql.*;
+import oneit.utils.resource.*;
+import oneit.utils.*;
+import oneit.utils.threading.*;
+import oneit.servlets.orm.*;
+
+
+
+/**
+ * IMPORTANT!!!! Autogenerated class, DO NOT EDIT!!!!!
+ * Template: Infrastructure8.2[oneit.objstore.PersistenceMgrTemplate.xsl]
+ */
+public class CompanyUserNPOPersistenceMgr extends NonPersistentBOPersistenceMgr
+{
+    private static final LoggingArea CompanyUserNPOPersistence = LoggingArea.createLoggingArea(ObjectPersistenceMgr.OBJECT_PERSISTENCE, "CompanyUserNPO");
+
+    // Private attributes corresponding to business object data
+    private String dummyEmail;
+    
+
+    // Static constants corresponding to attribute helpers
+    private static final DefaultAttributeHelper HELPER_Email = DefaultAttributeHelper.INSTANCE;
+    
+
+
+
+    public CompanyUserNPOPersistenceMgr ()
+    {
+        dummyEmail = (String)(HELPER_Email.initialise (dummyEmail));
+        
+    }
+
+    private String  SELECT_COLUMNS = "{PREFIX}it_does_not_matter.object_id as id, {PREFIX}it_does_not_matter.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}it_does_not_matter.object_CREATED_DATE as CREATED_DATE, {PREFIX}it_does_not_matter.,  1 AS commasafe ";
+    private String SELECT_JOINS = "";
+
+    public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
+    {
+        Set<BaseBusinessClass>    resultByIDs = fetchByIDs(Collections.singleton (id), allPSets, context, sqlMgr);
+
+        if (resultByIDs.isEmpty ())
+        {
+            return null;
+        }
+        else if (resultByIDs.size () > 1)
+        {
+            throw new StorageException ("Multiple results for id:" + id);
+        }
+        else
+        {
+            return resultByIDs.iterator ().next ();
+        }
+    }
+
+
+
+    public Set<BaseBusinessClass> fetchByIDs(Set<ObjectID> ids, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
+    {
+        Set<BaseBusinessClass>    results = new HashSet ();
+        Set<Long> idsToFetch = new HashSet ();
+
+        for (ObjectID id : ids)
+        {
+            if (context.containsObject(id)) // Check for cached version
+            {
+                BaseBusinessClass objectToReturn = context.getObjectToReplace(id, CompanyUserNPO.REFERENCE_CompanyUserNPO);
+
+                if (objectToReturn instanceof CompanyUserNPO)
+                {
+                    LogMgr.log (CompanyUserNPOPersistence, LogLevel.TRACE, "Cache hit for id:", id);
+                    results.add (objectToReturn);
+                }
+                else
+                {
+                    throw new StorageException ("Cache collision for id:" + id + " with object " + objectToReturn + "while fetching a CompanyUserNPO");
+                }
+            }
+
+            PersistentSet it_does_not_matterPSet = allPSets.getPersistentSet(id, "it_does_not_matter", PersistentSetStatus.FETCHED);
+            
+            
+
+             // Check for persistent sets already prefetched
+            if (false  || !it_does_not_matterPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
+                    !it_does_not_matterPSet.containsAttrib(CompanyUserNPO.FIELD_Email))
+            {
+                // We will need to retrieve it
+                idsToFetch.add (id.longValue());
+            }
+            else
+            {
+                LogMgr.log (CompanyUserNPOPersistence, LogLevel.DEBUG2, "Persistent set preloaded id:", id);
+        
+                /* Non Polymorphic */
+                CompanyUserNPO result = new CompanyUserNPO ();
+
+                result.setFromPersistentSets(id, allPSets);
+                context.addRetrievedObject(result);
+
+                results.add (result);
+            
+            }
+        }
+
+        if (idsToFetch.size () > 0)
+        {
+            String  query = "SELECT " + SELECT_COLUMNS +
+                            "FROM {PREFIX}it_does_not_matter " +
+                            "WHERE " + SELECT_JOINS + "{PREFIX}it_does_not_matter.object_id IN ?";
+
+            BaseBusinessClass[] resultsFetched = loadQuery (allPSets, sqlMgr, context, query, new Object[] { idsToFetch }, null, false);
+
+            for (BaseBusinessClass objFetched : resultsFetched)
+            {
+                results.add (objFetched);
+            }
+        }
+
+
+        return results;
+    }
+
+
+
+    public BaseBusinessClass[] getReferencedObjects(ObjectID _objectID, String refName, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
+    {
+        if (false)
+        {
+            throw new RuntimeException ();
+        }
+        else
+        {
+            throw new IllegalArgumentException ("Illegal reference type:" + refName);
+        }
+    }
+
+
+
+    public void update(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
+    {
+        EqualityResult  test = EqualityResult.compare (obj, obj.getBackup ());
+        ObjectID        objectID = obj.getID ();
+
+        if (!test.areAttributesEqual () || !test.areSingleAssocsEqual () || obj.getForcedSave())
+        {
+            PersistentSet it_does_not_matterPSet = allPSets.getPersistentSet(objectID, "it_does_not_matter");
+            
+
+            
+            if (it_does_not_matterPSet.getStatus () != PersistentSetStatus.PROCESSED &&
+                it_does_not_matterPSet.getStatus () != PersistentSetStatus.DEFERRED)
+            {
+                int rowsUpdated = executeStatement (sqlMgr, 
+                                                           "UPDATE {PREFIX}it_does_not_matter " +
+                                                           "SET  = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
+                                                                
+                                                           "WHERE it_does_not_matter.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
+                                                           CollectionUtils.listEntry (HELPER_Email.getForSQL(dummyEmail, it_does_not_matterPSet.getAttrib (CompanyUserNPO.FIELD_Email))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
+
+                if (rowsUpdated != 1)
+                {
+                    // Error, either a concurrency error or a not-exists error
+                    ResultSet r = executeQuery (sqlMgr, 
+                                                       "SELECT object_id, object_LAST_UPDATED_DATE FROM {PREFIX}it_does_not_matter WHERE object_id = ?",
+                                                       new Object[] { objectID.longID () });
+
+                    if (r.next ())
+                    {
+                        Date                d = new java.util.Date (r.getTimestamp (2).getTime());
+                        String              errorMsg = QueryBuilder.buildQueryString ("Concurrent update error:[?] for row:[?] objDate:[?] dbDate:[?]", 
+                                                                         new Object[] { "it_does_not_matter", objectID.longID (), obj.getObjectLastModified (), d },
+                                                                         sqlMgr.getPortabilityServices ());
+                                                                         
+                        LogMgr.log (CompanyUserNPOPersistence, LogLevel.BUSINESS1, errorMsg);
+                        throw new ConcurrentUpdateConflictException (obj, "it_does_not_matter");
+                    }
+                    else
+                    {
+                        String  errorMsg = "Attempt to update nonexistent row in table:it_does_not_matter for row:" + objectID + " objDate:" + obj.getObjectLastModified ();
+
+                        LogMgr.log (CompanyUserNPOPersistence, LogLevel.BUSINESS1, errorMsg);
+                        throw new RuntimeException (errorMsg);
+                    }
+                }
+
+                it_does_not_matterPSet.setStatus (PersistentSetStatus.PROCESSED);
+            }
+            
+        }
+        else
+        {
+            LogMgr.log (CompanyUserNPOPersistence, LogLevel.DEBUG1, "Skipping update since no attribs or simple assocs changed on ", objectID);
+        }
+    }
+
+
+
+    public void delete(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, ConcurrentUpdateConflictException, StorageException
+    {
+        ObjectID        objectID = obj.getID ();
+        PersistentSet it_does_not_matterPSet = allPSets.getPersistentSet(objectID, "it_does_not_matter");
+        
+
+        LogMgr.log (CompanyUserNPOPersistence, LogLevel.DEBUG2, "Deleting:", objectID);
+
+        
+        if (it_does_not_matterPSet.getStatus () != PersistentSetStatus.PROCESSED &&
+            it_does_not_matterPSet.getStatus () != PersistentSetStatus.DEFERRED)
+        {
+            int rowsDeleted = executeStatement (sqlMgr, 
+                                                       "DELETE " +
+                                                       "FROM {PREFIX}it_does_not_matter " +
+                                                       "WHERE it_does_not_matter.object_id = ? AND " + sqlMgr.getPortabilityServices ().getTruncatedTimestampColumn ("object_LAST_UPDATED_DATE") + " = " + sqlMgr.getPortabilityServices ().getTruncatedTimestampParam("?") + " ",
+                                                       new Object[] { objectID.longID(), obj.getObjectLastModified () });
+
+            if (rowsDeleted != 1)
+            {
+                // Error, either a concurrency error or a not-exists error
+                ResultSet r = executeQuery (sqlMgr, 
+                                                   "SELECT object_id FROM {PREFIX}it_does_not_matter WHERE object_id = ?",
+                                                   new Object[] { objectID.longID() });
+
+                if (r.next ())
+                {
+                    throw new ConcurrentUpdateConflictException (obj, "it_does_not_matter");
+                }
+                else
+                {
+                    String  errorMsg = "Attempt to delete nonexistent row in table:it_does_not_matter for row:" + objectID;
+
+                    LogMgr.log (CompanyUserNPOPersistence, LogLevel.SYSTEMERROR1, errorMsg);
+                    throw new RuntimeException (errorMsg);
+                }
+            }
+
+            it_does_not_matterPSet.setStatus (PersistentSetStatus.PROCESSED);
+        }
+        
+    }
+
+
+    
+
+
+
+    public BaseBusinessClass[] loadQuery (PersistentSetCollection allPSets, SQLManager sqlMgr, RDBMSPersistenceContext context, String query, Object[] params, Integer maxRows, boolean truncateExtra) throws SQLException, StorageException
+    {
+        LinkedHashMap<ObjectID, CompanyUserNPO> results = new LinkedHashMap ();
+        
+        ResultSet   r = executeQuery (sqlMgr, query, params);
+
+        while (r.next())
+        {
+            ThreadUtils.checkInterrupted ();
+            
+            ObjectID    objectID = new ObjectID (CompanyUserNPO.REFERENCE_CompanyUserNPO.getObjectIDSpace (), r.getLong ("id"));
+            CompanyUserNPO resultElement;
+
+            if (maxRows != null && !results.containsKey (objectID) && results.size () >= maxRows)
+            {
+                if (truncateExtra)
+                {
+                    break;
+                }
+                else
+                {
+                    throw new SearchRowsExceededException ("Maximum rows exceeded:" + maxRows);
+                }
+            }
+
+            if (context.containsObject(objectID))
+            {
+                BaseBusinessClass   cachedElement = context.getObjectToReplace(objectID, CompanyUserNPO.REFERENCE_CompanyUserNPO);
+
+                if (cachedElement instanceof CompanyUserNPO)
+                {
+                    LogMgr.log (CompanyUserNPOPersistence, LogLevel.TRACE, "Cache hit for id:", objectID);
+                    resultElement = (CompanyUserNPO)cachedElement;
+                }
+                else
+                {
+                    throw new StorageException ("Cache collision for id:" + objectID + " with object " + cachedElement + "while fetching a CompanyUserNPO");
+                }
+            }
+            else
+            {
+                PersistentSet it_does_not_matterPSet = allPSets.getPersistentSet(objectID, "it_does_not_matter", PersistentSetStatus.FETCHED);
+                
+                createPersistentSetFromRS(allPSets, r, objectID);
+
+                
+
+                        resultElement = new CompanyUserNPO ();
+
+                        resultElement.setFromPersistentSets(objectID, allPSets);
+                        context.addRetrievedObject(resultElement);
+
+                
+            }
+
+            results.put (objectID, resultElement);
+        }
+
+        
+
+        BaseBusinessClass[] resultsArr = new BaseBusinessClass[results.size ()];
+
+        return results.values ().toArray (resultsArr);
+    }
+
+
+
+    public BaseBusinessClass[] find(String searchType, PersistentSetCollection allPSets, Hashtable criteria, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
+    {
+        LogMgr.log (CompanyUserNPOPersistence, LogLevel.DEBUG2, "Search executing:", searchType, " criteria:", criteria);
+        String  customParamFilter = (String)criteria.get (SEARCH_CustomFilter);
+        String  customOrderBy = (String)criteria.get (SEARCH_OrderBy);
+        String  customTables = (String)criteria.get (SEARCH_CustomExtraTables);
+        Boolean  noCommaBeforeCustomExtraTables = (Boolean)criteria.get (SEARCH_CustomExtraTablesNoComma);
+
+        if (searchType.equals (SEARCH_CustomSQL))
+        {
+            Set<ObjectID>                     processedIDs = new HashSet();
+            SearchParamTransform    tx = new SearchParamTransform (criteria);
+            Object[]                searchParams;
+
+            customParamFilter = StringUtils.replaceParams (customParamFilter, tx);
+            searchParams = tx.getParamsArray();
+
+            if (customOrderBy != null) 
+            {
+                customOrderBy = " ORDER BY " + customOrderBy;
+            }
+            else
+            {
+                customOrderBy = "";
+            }
+
+
+            ResultSet   r;
+            String      concatCustomTableWith = CollectionUtils.equals(noCommaBeforeCustomExtraTables, true) ?  " " : ", ";
+            String      tables = StringUtils.subBlanks(customTables) == null ? " " : concatCustomTableWith + customTables + " ";
+
+
+            String  query = "SELECT " + SELECT_COLUMNS +
+                                    "FROM {PREFIX}it_does_not_matter " + tables +
+                                    "WHERE " + SELECT_JOINS + " " + customParamFilter + customOrderBy;
+
+            BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, null, false);
+
+            return results;
+        }
+        
+        else
+        {
+            
+                BaseBusinessClass[] resultsArray = super.find(searchType, allPSets, criteria, context, sqlMgr);
+                Vector              results = new Vector ();
+                
+                for (int x = 0 ; x < resultsArray.length ; ++x)
+                {
+                    if (resultsArray[x] instanceof CompanyUserNPO)
+                    {
+                        results.add (resultsArray[x]);
+                    }
+                    else
+                    {
+                        // Ignore
+                    }
+                }
+                
+                resultsArray = new BaseBusinessClass[results.size ()];
+                results.copyInto (resultsArray);
+
+                return resultsArray;
+            
+            
+            
+        }
+    }
+
+    private void createPersistentSetFromRS(PersistentSetCollection allPSets, ResultSet r, ObjectID objectID) throws SQLException
+    {
+        PersistentSet it_does_not_matterPSet = allPSets.getPersistentSet(objectID, "it_does_not_matter", PersistentSetStatus.FETCHED);
+        
+            // Object Modified
+            it_does_not_matterPSet.setAttrib(BaseBusinessClass.FIELD_ObjectLastModified, r.getTimestamp ("LAST_UPDATED_DATE"));
+
+            // Object Created
+            it_does_not_matterPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
+
+        it_does_not_matterPSet.setAttrib(CompanyUserNPO.FIELD_Email, HELPER_Email.getFromRS(dummyEmail, r, ""));
+        
+        
+    }
+
+
+    public void create(BaseBusinessClass obj, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
+    {
+        ObjectID    objectID = obj.getID ();
+        PersistentSet it_does_not_matterPSet = allPSets.getPersistentSet(objectID, "it_does_not_matter");
+        
+
+        
+        if (it_does_not_matterPSet.getStatus () != PersistentSetStatus.PROCESSED &&
+            it_does_not_matterPSet.getStatus () != PersistentSetStatus.DEFERRED)
+        {
+            executeStatement (sqlMgr, 
+                                     "INSERT INTO {PREFIX}it_does_not_matter " +
+                                     "  (,   object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
+                                     "VALUES " +
+                                     "  (?,    ?,  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ",  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
+                                     CollectionUtils.listEntry (HELPER_Email.getForSQL(dummyEmail, it_does_not_matterPSet.getAttrib (CompanyUserNPO.FIELD_Email)))  .listEntry (objectID.longID ()).toList().toArray());
+
+            it_does_not_matterPSet.setStatus (PersistentSetStatus.PROCESSED);
+        }
+        
+    }
+}

cmsWebApp/webroot/extensions/adminportal/forgot_password.jsp

@@ -47,16 +47,7 @@
 <%
     ORMProcessState     process     =   (ORMProcessState) ProcessDecorator.getDefaultProcess(request);
     ObjectTransaction   objTran     =   process.getTransaction ();
-    CompanyUser         companyUser =   (CompanyUser) process.getAttribute("CompanyUser");
-    
-    if(companyUser==null)
-    {
-        companyUser =   CompanyUser.createCompanyUser(objTran);
-        
-        process.setAttribute("CompanyUser", companyUser);
-        
-        %><%@include file="/saferedirect.jsp"%><%
-    }
+    CompanyUserNPO      companyUser =   CompanyUserNPO.createCompanyUserNPO(objTran);
 %>
     <oneit:form name="forgotPassword"    method="post"   enctype="multipart/form-data">
         <oneit:dynInclude   page="/extensions/applicantportal/inc/multifieldtext.jsp"   data="<%= CollectionUtils.EMPTY_MAP%>"/>