--- obc.mine.manifest.mf	2010-09-02 11:06:42.000000000 -0400
+++ obc.theirs.manifest.mf	2010-09-02 10:54:02.000000000 -0400
@@ -1,24 +1,52 @@
 Manifest-Version: 1.0
-Export-Package: com.ateb.obc.common;uses:="com.ateb.obc.model,com.ateb
- .obc.service",com.ateb.obc.composite;uses:="com.ateb.obc.model,com.at
- eb.obc.common",com.ateb.obc.dao;uses:="com.ateb.obc.model,com.ateb.ob
- c.filter,com.ateb.obc.composite,com.ateb.atebWebAppLib.exception",com
- .ateb.obc.dao.hibernate;uses:="com.ateb.obc.model,com.ateb.obc.dao,co
- m.ateb.obc.filter,com.ateb.obc.composite,com.ateb.atebWebAppLib.excep
- tion,org.hibernate.type,com.ateb.atebWebAppLib.user.model",com.ateb.o
- bc.exception,com.ateb.obc.filter;uses:="com.ateb.obc.model,com.ateb.o
- bc.common,com.ateb.atebWebAppLib.filter",com.ateb.obc.model;uses:="co
- m.ateb.obc.composite,com.ateb.atebWebAppLib.businessEntity.model,com.
- ateb.atebWebAppLib.user.model,com.ateb.atebWebAppLib.rpt.model,com.at
- eb.obc.common",com.ateb.obc.model.primaryKeys,com.ateb.obc.service;us
- es:="com.ateb.obc.model,com.ateb.obc.dao,com.ateb.obc.filter,com.ateb
- .atebWebAppLib.exception,com.ateb.obc.composite,com.ateb.obc.exceptio
- n,com.ateb.atebWebAppLib.rpt.service,com.ateb.atebWebAppLib.rpt.model
- ",com.ateb.obc.service.impl;uses:="com.ateb.obc.service,com.ateb.obc.
- model,com.ateb.obc.dao,com.ateb.obc.filter,com.ateb.atebWebAppLib.exc
- eption,com.ateb.atebWebAppLib.businessEntity.filter,com.ateb.obc.comp
- osite,com.ateb.obc.exception,com.ateb.atebWebAppLib.rpt.model,com.ate
- b.atebWebAppLib.rpt.service",com.ateb.obc.service.scheduled
+Export-Package: com.ateb.obc.common;uses:="org.apache.commons.logging,
+ org.springframework.beans.propertyeditors,com.ateb.obc.model,com.ateb
+ .atebWebAppLib.common,javax.servlet,javax.naming,com.ateb.obc.service
+ ,com.ateb.atebWebAppLib.businessEntity.model,com.ateb.atebWebAppLib.u
+ ser.model,javax.servlet.http",com.ateb.obc.composite;uses:="org.apach
+ e.commons.logging,com.ateb.obc.model,com.ateb.atebWebAppLib.common,or
+ g.hibernate.annotations,javax.persistence,com.ateb.obc.common",com.at
+ eb.obc.dao;uses:="com.ateb.obc.model,com.ateb.obc.filter,com.ateb.ate
+ bWebAppLib.common,com.ateb.obc.composite,com.ateb.atebWebAppLib.excep
+ tion,com.ateb.atebWebAppLib.businessEntity.dao,com.ateb.atebWebAppLib
+ .user.dao,com.ateb.atebWebAppLib.dao",com.ateb.obc.dao.hibernate;uses
+ :="org.apache.commons.logging,org.springframework.orm,org.springframe
+ work.orm.hibernate3.support,com.ateb.obc.model,com.ateb.obc.dao,org.s
+ pringframework.orm.hibernate3,com.ateb.atebWebAppLib.filter,org.hiber
+ nate.type,org.hibernate,com.ateb.obc.filter,com.ateb.atebWebAppLib.co
+ mmon,org.springframework.dao,com.ateb.obc.composite,com.ateb.atebWebA
+ ppLib.businessEntity.model,com.ateb.atebWebAppLib.exception,com.ateb.
+ atebWebAppLib.businessEntity.filter,com.ateb.atebWebAppLib.dao.hibern
+ ate,com.ateb.obc.common,org.hibernate.jdbc,com.ateb.atebWebAppLib.use
+ r.model,com.ateb.atebWebAppLib.user.filter,com.ateb.atebWebAppLib.rpt
+ .filter,com.ateb.atebWebAppLib.rpt.dao,com.ateb.atebWebAppLib.rpt.mod
+ el",com.ateb.obc.exception,com.ateb.obc.filter;uses:="com.ateb.atebWe
+ bAppLib.filter,com.ateb.atebWebAppLib.common,org.apache.commons.loggi
+ ng,com.ateb.obc.model,com.ateb.obc.common",com.ateb.obc.model;uses:="
+ org.apache.commons.logging,com.ateb.atebWebAppLib.common,javax.persis
+ tence,org.hibernate.annotations,org.apache.commons.lang.builder,com.a
+ teb.obc.common,com.ateb.obc.model.primaryKeys,com.ateb.obc.composite,
+ com.ateb.atebWebAppLib.businessEntity.model,com.ateb.atebWebAppLib.us
+ er.model,com.ateb.atebWebAppLib.rpt.model",com.ateb.obc.model.primary
+ Keys;uses:="com.ateb.atebWebAppLib.common,javax.persistence",com.ateb
+ .obc.service;uses:="com.ateb.obc.model,com.ateb.obc.dao,com.ateb.obc.
+ filter,com.ateb.atebWebAppLib.common,com.ateb.atebWebAppLib.businessE
+ ntity.service,com.ateb.atebWebAppLib.exception,com.ateb.obc.composite
+ ,javax.servlet.http,com.ateb.obc.exception,com.ateb.atebWebAppLib.use
+ r.service,com.ateb.atebWebAppLib.rpt.service,com.ateb.atebWebAppLib.r
+ pt.filter,com.ateb.atebWebAppLib.rpt.model,com.ateb.atebWebAppLib.use
+ r.model",com.ateb.obc.service.impl;uses:="com.ateb.obc.service,com.at
+ eb.obc.model,com.ateb.obc.dao,com.ateb.obc.filter,org.apache.commons.
+ logging,com.ateb.atebWebAppLib.common,com.ateb.atebWebAppLib.business
+ Entity.model,org.springframework.mail,com.ateb.atebWebAppLib.exceptio
+ n,com.ateb.atebWebAppLib.businessEntity.filter,com.ateb.obc.composite
+ ,com.ateb.obc.common,javax.servlet.http,com.ateb.atebWebAppLib.user.m
+ odel,com.ateb.obc.exception,com.ateb.atebWebAppLib.user.filter,com.at
+ eb.atebWebAppLib.rpt.service,com.ateb.atebWebAppLib.rpt.filter,com.at
+ eb.atebWebAppLib.rpt.dao,com.ateb.atebWebAppLib.rpt.model,org.quartz,
+ com.ateb.obc.service.scheduled,javax.servlet",com.ateb.obc.service.sc
+ heduled;uses:="com.ateb.obc.service,org.quartz,org.springframework.co
+ ntext,com.ateb.atebWebAppLib.rpt.service"
 Private-Package: .
 Implementation-Title: Ateb OBC Business Service Library (Business Serv
  ice JAR)
@@ -27,31 +55,50 @@
 DSTAMP: 20100902
 TODAY: September 2 2010
 Bundle-Name: Ateb OBC Business Service Library
-Created-By: 1.6.0_21 (Sun Microsystems Inc.)
-TSTAMP: 1106
-Build-Date: Thu Sep 02, 2010 at 11:06:02 EDT
+Created-By: 1.6.0_16 (Sun Microsystems Inc.)
+TSTAMP: 1053
+Build-Date: Thu Sep 02, 2010 at 10:53:00 EDT
 Version: 3.5.1
 DynamicImport-Package: *
-Ant-Version: Apache Ant 1.8.0
+Ant-Version: Apache Ant 1.7.1
 Implementation-Vendor: Ateb, Inc.
 Package-Version: 3.5.1-8395
 Bundle-Version: 3.5.1.SNAPSHOT
-Bnd-LastModified: 1283440002952
+Bnd-LastModified: 1283439242620
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: com.ateb.obc.obc-bs
-Import-Package: com.ateb.atebWebAppLib.businessEntity.filter;resolutio
- n:=optional,com.ateb.atebWebAppLib.businessEntity.model;resolution:=o
- ptional,com.ateb.atebWebAppLib.exception;resolution:=optional,com.ate
- b.atebWebAppLib.filter;resolution:=optional,com.ateb.atebWebAppLib.rp
- t.model;resolution:=optional,com.ateb.atebWebAppLib.rpt.service;resol
- ution:=optional,com.ateb.atebWebAppLib.user.model;resolution:=optiona
- l,com.ateb.obc.common;resolution:=optional,com.ateb.obc.composite;res
- olution:=optional,com.ateb.obc.dao;resolution:=optional,com.ateb.obc.
- dao.hibernate;resolution:=optional,com.ateb.obc.exception;resolution:
- =optional,com.ateb.obc.filter;resolution:=optional,com.ateb.obc.model
- ;resolution:=optional,com.ateb.obc.model.primaryKeys;resolution:=opti
- onal,com.ateb.obc.service;resolution:=optional,com.ateb.obc.service.i
- mpl;resolution:=optional,com.ateb.obc.service.scheduled;resolution:=o
- ptional,org.hibernate.type;resolution:=optional
-Originally-Created-By: 1.6.0_21-b06 (Sun Microsystems Inc.)
+Import-Package: com.ateb.atebWebAppLib.businessEntity.dao;resolution:=
+ optional,com.ateb.atebWebAppLib.businessEntity.filter;resolution:=opt
+ ional,com.ateb.atebWebAppLib.businessEntity.model;resolution:=optiona
+ l,com.ateb.atebWebAppLib.businessEntity.service;resolution:=optional,
+ com.ateb.atebWebAppLib.common;resolution:=optional,com.ateb.atebWebAp
+ pLib.dao;resolution:=optional,com.ateb.atebWebAppLib.dao.hibernate;re
+ solution:=optional,com.ateb.atebWebAppLib.exception;resolution:=optio
+ nal,com.ateb.atebWebAppLib.filter;resolution:=optional,com.ateb.atebW
+ ebAppLib.rpt.dao;resolution:=optional,com.ateb.atebWebAppLib.rpt.filt
+ er;resolution:=optional,com.ateb.atebWebAppLib.rpt.model;resolution:=
+ optional,com.ateb.atebWebAppLib.rpt.service;resolution:=optional,com.
+ ateb.atebWebAppLib.user.dao;resolution:=optional,com.ateb.atebWebAppL
+ ib.user.filter;resolution:=optional,com.ateb.atebWebAppLib.user.model
+ ;resolution:=optional,com.ateb.atebWebAppLib.user.service;resolution:
+ =optional,com.ateb.obc.common;resolution:=optional,com.ateb.obc.compo
+ site;resolution:=optional,com.ateb.obc.dao;resolution:=optional,com.a
+ teb.obc.dao.hibernate;resolution:=optional,com.ateb.obc.exception;res
+ olution:=optional,com.ateb.obc.filter;resolution:=optional,com.ateb.o
+ bc.model;resolution:=optional,com.ateb.obc.model.primaryKeys;resoluti
+ on:=optional,com.ateb.obc.service;resolution:=optional,com.ateb.obc.s
+ ervice.impl;resolution:=optional,com.ateb.obc.service.scheduled;resol
+ ution:=optional,javax.naming;resolution:=optional,javax.persistence;r
+ esolution:=optional,javax.servlet;resolution:=optional,javax.servlet.
+ http;resolution:=optional,org.apache.commons.lang.builder;resolution:
+ =optional,org.apache.commons.logging;resolution:=optional,org.hiberna
+ te;resolution:=optional,org.hibernate.annotations;resolution:=optiona
+ l,org.hibernate.jdbc;resolution:=optional,org.hibernate.type;resoluti
+ on:=optional,org.quartz;resolution:=optional,org.springframework.bean
+ s.propertyeditors;resolution:=optional,org.springframework.context;re
+ solution:=optional,org.springframework.dao;resolution:=optional,org.s
+ pringframework.mail;resolution:=optional,org.springframework.orm;reso
+ lution:=optional,org.springframework.orm.hibernate3;resolution:=optio
+ nal,org.springframework.orm.hibernate3.support;resolution:=optional
+Originally-Created-By: 14.2-b01 (Sun Microsystems Inc.)