Tue Mar 30 01:43:37 PDT 2010

Details: http://source.sakaiproject.org/viewsvn?root=svn&view=rev&rev=75415

Author: david.horwitz at uct.ac.za
Date: 2010-03-30 04:43:37 -0400 (Tue, 30 Mar 2010)
New Revision: 75415

Modified:
   msub/uct.ac.za/vula/trunk/entitybroker/
   msub/uct.ac.za/vula/trunk/entitybroker/api/src/java/org/sakaiproject/entitybroker/EntityBrokerManager.java
   msub/uct.ac.za/vula/trunk/entitybroker/api/src/java/org/sakaiproject/entitybroker/entityprovider/capabilities/BrowseableCollection.java
   msub/uct.ac.za/vula/trunk/entitybroker/api/src/java/org/sakaiproject/entitybroker/entityprovider/extension/URLRedirect.java
   msub/uct.ac.za/vula/trunk/entitybroker/api/src/java/org/sakaiproject/entitybroker/providers/EntityPropertiesService.java
   msub/uct.ac.za/vula/trunk/entitybroker/api/src/java/org/sakaiproject/entitybroker/providers/EntityRequestHandler.java
   msub/uct.ac.za/vula/trunk/entitybroker/core-providers/src/java/membership.properties
   msub/uct.ac.za/vula/trunk/entitybroker/core-providers/src/java/membership_es_ES.properties
   msub/uct.ac.za/vula/trunk/entitybroker/core-providers/src/java/org/
   msub/uct.ac.za/vula/trunk/entitybroker/core-providers/src/java/org/sakaiproject/entitybroker/providers/MembershipEntityProvider.java
   msub/uct.ac.za/vula/trunk/entitybroker/core-providers/src/java/org/sakaiproject/entitybroker/providers/UserEntityProvider.java
   msub/uct.ac.za/vula/trunk/entitybroker/core-providers/src/java/org/sakaiproject/entitybroker/providers/model/EntityMember.java
   msub/uct.ac.za/vula/trunk/entitybroker/core-providers/src/java/org/sakaiproject/entitybroker/providers/model/EntityServerConfig.java
   msub/uct.ac.za/vula/trunk/entitybroker/core-providers/src/java/org/sakaiproject/entitybroker/providers/model/EntitySession.java
   msub/uct.ac.za/vula/trunk/entitybroker/core-providers/src/java/org/sakaiproject/entitybroker/providers/model/EntitySite.java
   msub/uct.ac.za/vula/trunk/entitybroker/core-providers/src/java/org/sakaiproject/entitybroker/providers/model/EntityUser.java
   msub/uct.ac.za/vula/trunk/entitybroker/core-providers/src/java/server-config.properties
   msub/uct.ac.za/vula/trunk/entitybroker/core-providers/src/java/server-config_es_ES.properties
   msub/uct.ac.za/vula/trunk/entitybroker/core-providers/src/java/session.properties
   msub/uct.ac.za/vula/trunk/entitybroker/core-providers/src/java/session_es_ES.properties
   msub/uct.ac.za/vula/trunk/entitybroker/core-providers/src/java/site_es_ES.properties
   msub/uct.ac.za/vula/trunk/entitybroker/core-providers/src/java/user.properties
   msub/uct.ac.za/vula/trunk/entitybroker/core-providers/src/java/user_es_ES.properties
   msub/uct.ac.za/vula/trunk/entitybroker/impl/src/java/org/sakaiproject/entitybroker/impl/EntityBrokerManagerImpl.java
   msub/uct.ac.za/vula/trunk/entitybroker/impl/src/java/org/sakaiproject/entitybroker/impl/devhelper/DeveloperHelperServiceImpl.java
   msub/uct.ac.za/vula/trunk/entitybroker/impl/src/java/org/sakaiproject/entitybroker/impl/external/SakaiExternalIntegrationProvider.java
   msub/uct.ac.za/vula/trunk/entitybroker/impl/src/test/org/sakaiproject/entitybroker/impl/EntityBrokerTransactionalTest.java
   msub/uct.ac.za/vula/trunk/entitybroker/rest/src/java/batch.properties
   msub/uct.ac.za/vula/trunk/entitybroker/rest/src/java/describe.properties
   msub/uct.ac.za/vula/trunk/entitybroker/rest/src/java/describe_es_ES.properties
   msub/uct.ac.za/vula/trunk/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityActionsManager.java
   msub/uct.ac.za/vula/trunk/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityBatchHandler.java
   msub/uct.ac.za/vula/trunk/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityBrokerRESTServiceManager.java
   msub/uct.ac.za/vula/trunk/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityDescriptionManager.java
   msub/uct.ac.za/vula/trunk/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityEncodingManager.java
   msub/uct.ac.za/vula/trunk/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityHandlerImpl.java
   msub/uct.ac.za/vula/trunk/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityRedirectsManager.java
   msub/uct.ac.za/vula/trunk/entitybroker/rest/src/test/org/sakaiproject/entitybroker/rest/EntityActionsManagerTest.java
   msub/uct.ac.za/vula/trunk/entitybroker/rest/src/test/org/sakaiproject/entitybroker/rest/EntityDescriptionManagerTest.java
   msub/uct.ac.za/vula/trunk/entitybroker/rest/src/test/org/sakaiproject/entitybroker/rest/EntityEncodingManagerTest.java
   msub/uct.ac.za/vula/trunk/entitybroker/rest/src/test/org/sakaiproject/entitybroker/rest/EntityHandlerImplTest.java
   msub/uct.ac.za/vula/trunk/entitybroker/rest/src/test/org/sakaiproject/entitybroker/rest/EntityRedirectsManagerTest.java
   msub/uct.ac.za/vula/trunk/entitybroker/rest/src/test/org/sakaiproject/entitybroker/rest/jetty/EntityBrokerServletTest.java
   msub/uct.ac.za/vula/trunk/entitybroker/rest/src/test/org/sakaiproject/entitybroker/rest/jetty/MockDirectServlet.java
   msub/uct.ac.za/vula/trunk/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/VersionConstants.java
   msub/uct.ac.za/vula/trunk/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/access/AccessProviderManagerImpl.java
   msub/uct.ac.za/vula/trunk/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/access/EntityViewAccessProviderManagerImpl.java
   msub/uct.ac.za/vula/trunk/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/access/HttpServletAccessProviderManagerImpl.java
   msub/uct.ac.za/vula/trunk/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/core/EntityProviderMethodStoreImpl.java
   msub/uct.ac.za/vula/trunk/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/devhelper/AbstractDeveloperHelperService.java
   msub/uct.ac.za/vula/trunk/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/devhelper/DeveloperHelperServiceMock.java
   msub/uct.ac.za/vula/trunk/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/request/RequestGetterImpl.java
   msub/uct.ac.za/vula/trunk/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/request/RequestStorageImpl.java
   msub/uct.ac.za/vula/trunk/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/request/RequestUtils.java
   msub/uct.ac.za/vula/trunk/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/servlet/DirectServlet.java
   msub/uct.ac.za/vula/trunk/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/spring/BeanCollectorAutoRegistrar.java
   msub/uct.ac.za/vula/trunk/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/spring/EntityPropertiesServiceSpringImpl.java
   msub/uct.ac.za/vula/trunk/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/spring/EntityProviderAutoRegistrar.java
   msub/uct.ac.za/vula/trunk/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/spring/ResourceFinder.java
   msub/uct.ac.za/vula/trunk/entitybroker/utils/src/test/org/sakaiproject/entitybroker/util/request/RequestStorageImplTest.java
   msub/uct.ac.za/vula/trunk/entitybroker/utils/src/test/org/sakaiproject/entitybroker/util/request/RequestUtilsTest.java
Log:
dhorwitz at david-horwitz-4:~/branchManagement/uct.ac.za/vula/trunk/entitybroker>
svn log -r72981
https://source.sakaiproject.org/svn/entitybroker/trunk------------------------------------------------------------------------
r72981 | david.horwitz at uct.ac.za | 2010-01-29 16:02:09 +0200 (Fri, 29
Jan 2010) | 2 lines

SAK-17498 one place a user might be null

------------------------------------------------------------------------
dhorwitz at david-horwitz-4:~/branchManagement/uct.ac.za/vula/trunk/entitybroker>
svn merge -c72981 https://source.sakaiproject.org/svn/entitybroker/trunk
--- Merging r72981 into 'core-providers/src/java/org':
U
core-providers/src/java/org/sakaiproject/entitybroker/providers/MembershipEntityProvider.java
dhorwitz at david-horwitz-4:~/branchManagement/uct.ac.za/vula/trunk/entitybroker>
svn merge -c75413 https://source.sakaiproject.org/svn/entitybroker/trunk
Conflict discovered in
'core-providers/src/java/org/sakaiproject/entitybroker/providers/MembershipEntityProvider.java'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r75413 into '.':
C
core-providers/src/java/org/sakaiproject/entitybroker/providers/MembershipEntityProvider.java
U
core-providers/src/java/org/sakaiproject/entitybroker/providers/UserEntityProvider.java
Summary of conflicts: