[sakai] svn commit: r75055 - in entitybroker/branches/entitybroker-1.3.x: . api/src/java/org/sakaiproject/entitybroker api/src/java/org/sakaiproject/entitybroker/entityprovider/capabilities api/src/java/org/sakaiproject/entitybroker/entityprovider/extension api/src/java/org/sakaiproject/entitybroker/providers core-providers/src/java core-providers/src/java/org core-providers/src/java/org/sakaiproject/entitybroker/providers core-providers/src/java/org/sakaiproject/entitybroker/providers/model impl/src/java/org/sakaiproject/entitybroker/impl impl/src/java/org/sakaiproject/entitybroker/impl/devhelper impl/src/java/org/sakaiproject/entitybroker/impl/external impl/src/test/org/sakaiproject/entitybroker/impl rest/src/java rest/src/java/org/sakaiproject/entitybroker/rest rest/src/test/org/sakaiproject/entitybroker/rest rest/src/test/org/sakaiproject/entitybroker/rest/jetty utils/src/java/org/sakaiproject/entitybroker/util utils/src/java/org/sakaiproject/entitybroker/util/a! ccess utils/src/java/org/sakaiproject/entitybroker/util/core utils/src/java/org/sakaiproject/entitybroker/util/devhelper utils/src/java/org/sakaiproject/entitybroker/util/request utils/src/java/org/sakaiproject/entitybroker/util/servlet utils/src/java/org/sakaiproject/entitybroker/util/spring utils/src/test/org/sakaiproject/entitybroker/util/request

[arwhyte at umich.edu]

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

Author: arwhyte at umich.edu
Date: 2010-03-23 12:57:51 -0400 (Tue, 23 Mar 2010)
New Revision: 75055

Modified:
   entitybroker/branches/entitybroker-1.3.x/
   entitybroker/branches/entitybroker-1.3.x/api/src/java/org/sakaiproject/entitybroker/EntityBrokerManager.java
   entitybroker/branches/entitybroker-1.3.x/api/src/java/org/sakaiproject/entitybroker/entityprovider/capabilities/BrowseableCollection.java
   entitybroker/branches/entitybroker-1.3.x/api/src/java/org/sakaiproject/entitybroker/entityprovider/extension/URLRedirect.java
   entitybroker/branches/entitybroker-1.3.x/api/src/java/org/sakaiproject/entitybroker/providers/EntityPropertiesService.java
   entitybroker/branches/entitybroker-1.3.x/api/src/java/org/sakaiproject/entitybroker/providers/EntityRequestHandler.java
   entitybroker/branches/entitybroker-1.3.x/core-providers/src/java/membership.properties
   entitybroker/branches/entitybroker-1.3.x/core-providers/src/java/membership_es_ES.properties
   entitybroker/branches/entitybroker-1.3.x/core-providers/src/java/org/
   entitybroker/branches/entitybroker-1.3.x/core-providers/src/java/org/sakaiproject/entitybroker/providers/SiteEntityProvider.java
   entitybroker/branches/entitybroker-1.3.x/core-providers/src/java/org/sakaiproject/entitybroker/providers/model/EntityMember.java
   entitybroker/branches/entitybroker-1.3.x/core-providers/src/java/org/sakaiproject/entitybroker/providers/model/EntityServerConfig.java
   entitybroker/branches/entitybroker-1.3.x/core-providers/src/java/org/sakaiproject/entitybroker/providers/model/EntitySession.java
   entitybroker/branches/entitybroker-1.3.x/core-providers/src/java/org/sakaiproject/entitybroker/providers/model/EntitySite.java
   entitybroker/branches/entitybroker-1.3.x/core-providers/src/java/org/sakaiproject/entitybroker/providers/model/EntityUser.java
   entitybroker/branches/entitybroker-1.3.x/core-providers/src/java/server-config.properties
   entitybroker/branches/entitybroker-1.3.x/core-providers/src/java/server-config_es_ES.properties
   entitybroker/branches/entitybroker-1.3.x/core-providers/src/java/session.properties
   entitybroker/branches/entitybroker-1.3.x/core-providers/src/java/session_es_ES.properties
   entitybroker/branches/entitybroker-1.3.x/core-providers/src/java/site.properties
   entitybroker/branches/entitybroker-1.3.x/core-providers/src/java/site_es_ES.properties
   entitybroker/branches/entitybroker-1.3.x/core-providers/src/java/user.properties
   entitybroker/branches/entitybroker-1.3.x/core-providers/src/java/user_es_ES.properties
   entitybroker/branches/entitybroker-1.3.x/impl/src/java/org/sakaiproject/entitybroker/impl/EntityBrokerManagerImpl.java
   entitybroker/branches/entitybroker-1.3.x/impl/src/java/org/sakaiproject/entitybroker/impl/devhelper/DeveloperHelperServiceImpl.java
   entitybroker/branches/entitybroker-1.3.x/impl/src/java/org/sakaiproject/entitybroker/impl/external/SakaiExternalIntegrationProvider.java
   entitybroker/branches/entitybroker-1.3.x/impl/src/test/org/sakaiproject/entitybroker/impl/EntityBrokerTransactionalTest.java
   entitybroker/branches/entitybroker-1.3.x/rest/src/java/batch.properties
   entitybroker/branches/entitybroker-1.3.x/rest/src/java/describe.properties
   entitybroker/branches/entitybroker-1.3.x/rest/src/java/describe_es_ES.properties
   entitybroker/branches/entitybroker-1.3.x/rest/src/java/org/sakaiproject/entitybroker/rest/EntityActionsManager.java
   entitybroker/branches/entitybroker-1.3.x/rest/src/java/org/sakaiproject/entitybroker/rest/EntityBatchHandler.java
   entitybroker/branches/entitybroker-1.3.x/rest/src/java/org/sakaiproject/entitybroker/rest/EntityBrokerRESTServiceManager.java
   entitybroker/branches/entitybroker-1.3.x/rest/src/java/org/sakaiproject/entitybroker/rest/EntityDescriptionManager.java
   entitybroker/branches/entitybroker-1.3.x/rest/src/java/org/sakaiproject/entitybroker/rest/EntityEncodingManager.java
   entitybroker/branches/entitybroker-1.3.x/rest/src/java/org/sakaiproject/entitybroker/rest/EntityHandlerImpl.java
   entitybroker/branches/entitybroker-1.3.x/rest/src/java/org/sakaiproject/entitybroker/rest/EntityRedirectsManager.java
   entitybroker/branches/entitybroker-1.3.x/rest/src/test/org/sakaiproject/entitybroker/rest/EntityActionsManagerTest.java
   entitybroker/branches/entitybroker-1.3.x/rest/src/test/org/sakaiproject/entitybroker/rest/EntityDescriptionManagerTest.java
   entitybroker/branches/entitybroker-1.3.x/rest/src/test/org/sakaiproject/entitybroker/rest/EntityEncodingManagerTest.java
   entitybroker/branches/entitybroker-1.3.x/rest/src/test/org/sakaiproject/entitybroker/rest/EntityHandlerImplTest.java
   entitybroker/branches/entitybroker-1.3.x/rest/src/test/org/sakaiproject/entitybroker/rest/EntityRedirectsManagerTest.java
   entitybroker/branches/entitybroker-1.3.x/rest/src/test/org/sakaiproject/entitybroker/rest/jetty/EntityBrokerServletTest.java
   entitybroker/branches/entitybroker-1.3.x/rest/src/test/org/sakaiproject/entitybroker/rest/jetty/MockDirectServlet.java
   entitybroker/branches/entitybroker-1.3.x/utils/src/java/org/sakaiproject/entitybroker/util/VersionConstants.java
   entitybroker/branches/entitybroker-1.3.x/utils/src/java/org/sakaiproject/entitybroker/util/access/AccessProviderManagerImpl.java
   entitybroker/branches/entitybroker-1.3.x/utils/src/java/org/sakaiproject/entitybroker/util/access/EntityViewAccessProviderManagerImpl.java
   entitybroker/branches/entitybroker-1.3.x/utils/src/java/org/sakaiproject/entitybroker/util/access/HttpServletAccessProviderManagerImpl.java
   entitybroker/branches/entitybroker-1.3.x/utils/src/java/org/sakaiproject/entitybroker/util/core/EntityProviderMethodStoreImpl.java
   entitybroker/branches/entitybroker-1.3.x/utils/src/java/org/sakaiproject/entitybroker/util/devhelper/AbstractDeveloperHelperService.java
   entitybroker/branches/entitybroker-1.3.x/utils/src/java/org/sakaiproject/entitybroker/util/devhelper/DeveloperHelperServiceMock.java
   entitybroker/branches/entitybroker-1.3.x/utils/src/java/org/sakaiproject/entitybroker/util/request/RequestGetterImpl.java
   entitybroker/branches/entitybroker-1.3.x/utils/src/java/org/sakaiproject/entitybroker/util/request/RequestStorageImpl.java
   entitybroker/branches/entitybroker-1.3.x/utils/src/java/org/sakaiproject/entitybroker/util/request/RequestUtils.java
   entitybroker/branches/entitybroker-1.3.x/utils/src/java/org/sakaiproject/entitybroker/util/servlet/DirectServlet.java
   entitybroker/branches/entitybroker-1.3.x/utils/src/java/org/sakaiproject/entitybroker/util/spring/BeanCollectorAutoRegistrar.java
   entitybroker/branches/entitybroker-1.3.x/utils/src/java/org/sakaiproject/entitybroker/util/spring/EntityPropertiesServiceSpringImpl.java
   entitybroker/branches/entitybroker-1.3.x/utils/src/java/org/sakaiproject/entitybroker/util/spring/EntityProviderAutoRegistrar.java
   entitybroker/branches/entitybroker-1.3.x/utils/src/java/org/sakaiproject/entitybroker/util/spring/ResourceFinder.java
   entitybroker/branches/entitybroker-1.3.x/utils/src/test/org/sakaiproject/entitybroker/util/request/RequestStorageImplTest.java
   entitybroker/branches/entitybroker-1.3.x/utils/src/test/org/sakaiproject/entitybroker/util/request/RequestUtilsTest.java
Log:
SAK-18216 reverse merge