You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@abdera.apache.org by jm...@apache.org on 2008/01/28 21:10:10 UTC
svn commit: r616015 - in /incubator/abdera/java/trunk: ./ build/
dependencies/i18n/src/main/java/org/apache/abdera/i18n/templates/
examples/src/main/java/org/apache/abdera/examples/appserver/
jcr/src/main/java/org/apache/abdera/jcr/ jcr/src/test/java/o...
Author: jmsnell
Date: Mon Jan 28 12:09:53 2008
New Revision: 616015
URL: http://svn.apache.org/viewvc?rev=616015&view=rev
Log:
merge in the refactored server code
Added:
incubator/abdera/java/trunk/dependencies/i18n/src/main/java/org/apache/abdera/i18n/templates/DelegatingContext.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/dependencies/i18n/src/main/java/org/apache/abdera/i18n/templates/DelegatingContext.java
incubator/abdera/java/trunk/dependencies/i18n/src/main/java/org/apache/abdera/i18n/templates/Route.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/dependencies/i18n/src/main/java/org/apache/abdera/i18n/templates/Route.java
incubator/abdera/java/trunk/dependencies/i18n/src/main/java/org/apache/abdera/i18n/templates/URIRoute.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/dependencies/i18n/src/main/java/org/apache/abdera/i18n/templates/URIRoute.java
incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/appserver/AppServer.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/examples/src/main/java/org/apache/abdera/examples/appserver/AppServer.java
incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/appserver/CustomProvider.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/examples/src/main/java/org/apache/abdera/examples/appserver/CustomProvider.java
incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/appserver/SimpleAdapter.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/examples/src/main/java/org/apache/abdera/examples/appserver/SimpleAdapter.java
incubator/abdera/java/trunk/jcr/src/main/java/org/apache/abdera/jcr/JcrCollectionAdapter.java (contents, props changed)
- copied, changed from r616012, incubator/abdera/java/branches/server_refactor_all/jcr/src/main/java/org/apache/abdera/jcr/JcrCollectionAdapter.java
incubator/abdera/java/trunk/jcr/src/test/java/org/apache/abdera/jcr/JcrCollectionAdapterTest.java (contents, props changed)
- copied, changed from r616012, incubator/abdera/java/branches/server_refactor_all/jcr/src/test/java/org/apache/abdera/jcr/JcrCollectionAdapterTest.java
incubator/abdera/java/trunk/server/src/main/java/org/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/
incubator/abdera/java/trunk/server/src/main/java/org/apache/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/CategoriesInfo.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/CategoriesInfo.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/CategoryInfo.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/CategoryInfo.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/CollectionAdapter.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/CollectionAdapter.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/CollectionInfo.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/CollectionInfo.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/Filter.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/Filter.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/FilterChain.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/FilterChain.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/MediaCollectionAdapter.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/MediaCollectionAdapter.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/Provider.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/Provider.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ProviderHelper.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/ProviderHelper.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestContext.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/RequestContext.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ResponseContext.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/ResponseContext.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ServiceManager.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/ServiceManager.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/Target.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/Target.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/TargetBuilder.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/TargetBuilder.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/TargetType.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/TargetType.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/Transactional.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/Transactional.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/WorkspaceInfo.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/WorkspaceInfo.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/WorkspaceManager.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/WorkspaceManager.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/AbstractRequestContext.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/AbstractRequestContext.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/AbstractResponseContext.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/AbstractResponseContext.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/BaseResponseContext.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/BaseResponseContext.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/EmptyResponseContext.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/EmptyResponseContext.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/EntityProviderResponseContext.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/EntityProviderResponseContext.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/MediaResponseContext.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/MediaResponseContext.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/RequestContextWrapper.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/RequestContextWrapper.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/ResponseContextException.java (contents, props changed)
- copied, changed from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/ResponseContextException.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/ResponseContextWrapper.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/ResponseContextWrapper.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/SimpleResponseContext.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/SimpleResponseContext.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/StreamWriterResponseContext.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/StreamWriterResponseContext.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractCollectionAdapter.java (contents, props changed)
- copied, changed from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractCollectionAdapter.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractEntityCollectionAdapter.java (contents, props changed)
- copied, changed from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractEntityCollectionAdapter.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractProvider.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractProvider.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractTarget.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractTarget.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractWorkspaceManager.java (contents, props changed)
- copied, changed from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractWorkspaceManager.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractWorkspaceProvider.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractWorkspaceProvider.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/CollectionAdapterManager.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/CollectionAdapterManager.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultProvider.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultProvider.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultTarget.java (contents, props changed)
- copied, changed from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultTarget.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultWorkspaceManager.java (contents, props changed)
- copied, changed from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultWorkspaceManager.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/RegexTargetResolver.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/RegexTargetResolver.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/RouteManager.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/RouteManager.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleCategoriesInfo.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleCategoriesInfo.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleCategoryInfo.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleCategoryInfo.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleCollectionInfo.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleCollectionInfo.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleSubjectResolver.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleSubjectResolver.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleWorkspaceInfo.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleWorkspaceInfo.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/StructuredTargetResolver.java (contents, props changed)
- copied, changed from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/StructuredTargetResolver.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/provider/
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/basic/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/provider/basic/
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/basic/BasicAdapter.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/provider/basic/BasicAdapter.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/basic/BasicProvider.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/provider/basic/BasicProvider.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/basic/BasicWorkspace.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/provider/basic/BasicWorkspace.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/servlet/
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/AbderaFilter.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/servlet/AbderaFilter.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/AbderaServlet.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/servlet/AbderaServlet.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/AbstractFilter.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/servlet/AbstractFilter.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/CompressionFilter.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/servlet/CompressionFilter.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/MethodOverrideFilter.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/servlet/MethodOverrideFilter.java
incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/ServletRequestContext.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/servlet/ServletRequestContext.java
incubator/abdera/java/trunk/server/src/test/java/org/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/
incubator/abdera/java/trunk/server/src/test/java/org/apache/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/
incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/
incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/
incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/
incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/
incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/JettyServer.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/JettyServer.java
incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/basic/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/basic/
incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/basic/BasicTest.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/basic/BasicTest.java
incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/basic/SampleBasicAdapter.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/basic/SampleBasicAdapter.java
incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/custom/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/custom/
incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/custom/CustomProvider.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/custom/CustomProvider.java
incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/custom/CustomProviderTest.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/custom/CustomProviderTest.java
incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/custom/OpenSearchFilter.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/custom/OpenSearchFilter.java
incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/custom/SimpleAdapter.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/custom/SimpleAdapter.java
incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/customer/
incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/Customer.java (contents, props changed)
- copied, changed from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/customer/Customer.java
incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapter.java (contents, props changed)
- copied, changed from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapter.java
incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapterTest.java (contents, props changed)
- copied, changed from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapterTest.java
incubator/abdera/java/trunk/server/src/test/resources/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/resources/
incubator/abdera/java/trunk/server/src/test/resources/abdera/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/resources/abdera/
incubator/abdera/java/trunk/server/src/test/resources/abdera/adapter/
- copied from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/resources/abdera/adapter/
incubator/abdera/java/trunk/server/src/test/resources/abdera/adapter/sample.properties
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/resources/abdera/adapter/sample.properties
incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/DefaultProviderDefinitionParser.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/spring/src/main/java/org/apache/abdera/spring/DefaultProviderDefinitionParser.java
incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ProviderFactoryBean.java (contents, props changed)
- copied, changed from r616012, incubator/abdera/java/branches/server_refactor_all/spring/src/main/java/org/apache/abdera/spring/ProviderFactoryBean.java
incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/WorkspaceDefinitionParser.java (contents, props changed)
- copied, changed from r616012, incubator/abdera/java/branches/server_refactor_all/spring/src/main/java/org/apache/abdera/spring/WorkspaceDefinitionParser.java
incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/ProviderDefinitionParserTest.java
- copied unchanged from r616012, incubator/abdera/java/branches/server_refactor_all/spring/src/test/java/org/apache/abdera/spring/ProviderDefinitionParserTest.java
incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/TestAdapter.java (contents, props changed)
- copied, changed from r616012, incubator/abdera/java/branches/server_refactor_all/spring/src/test/java/org/apache/abdera/spring/TestAdapter.java
Removed:
incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/appserver/SimpleProvider.java
incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/appserver/SimpleProviderManager.java
incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/appserver/SimpleServiceContext.java
incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/appserver/SimpleTargetResolver.java
incubator/abdera/java/trunk/jcr/src/main/java/org/apache/abdera/jcr/JcrCollectionProvider.java
incubator/abdera/java/trunk/jcr/src/test/java/org/apache/abdera/jcr/JcrCollectionProviderTest.java
incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ServiceContextDefinitionParser.java
incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/ServiceContextDefinitionParserTest.java
incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/TestProvider.java
Modified:
incubator/abdera/java/trunk/build/build.xml
incubator/abdera/java/trunk/jcr/src/main/java/org/apache/abdera/jcr/SessionPoolManager.java
incubator/abdera/java/trunk/pom.xml
incubator/abdera/java/trunk/spring/pom.xml
incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/AbstractSingleBeanDefinitionParser.java
incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/NamespaceHandler.java
incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/SpringAbderaServlet.java
incubator/abdera/java/trunk/spring/src/main/resources/META-INF/schemas/abdera-spring.xsd
incubator/abdera/java/trunk/spring/src/test/resources/org/apache/abdera/spring/beans.xml
Modified: incubator/abdera/java/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/build/build.xml?rev=616015&r1=616014&r2=616015&view=diff
==============================================================================
--- incubator/abdera/java/trunk/build/build.xml (original)
+++ incubator/abdera/java/trunk/build/build.xml Mon Jan 28 12:09:53 2008
@@ -777,7 +777,7 @@
<antcall target="dist.extension">
<param name="ext" value="html" />
</antcall>
-
+
<antcall target="dist.extension">
<param name="ext" value="json" />
</antcall>
@@ -836,7 +836,6 @@
<param name="ext" value="html" />
</antcall>
-
<antcall target="test.extension">
<param name="ext" value="json" />
</antcall>
@@ -886,6 +885,10 @@
</antcall>
<antcall target="retro.extension">
+ <param name="ext" value="html" />
+ </antcall>
+
+ <antcall target="retro.extension">
<param name="ext" value="json" />
</antcall>
@@ -909,9 +912,6 @@
<param name="ext" value="oauth" />
</antcall>
- <antcall target="retro.extension">
- <param name="ext" value="html" />
- </antcall>
</target>
<target name="retro.extension">
Copied: incubator/abdera/java/trunk/jcr/src/main/java/org/apache/abdera/jcr/JcrCollectionAdapter.java (from r616012, incubator/abdera/java/branches/server_refactor_all/jcr/src/main/java/org/apache/abdera/jcr/JcrCollectionAdapter.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/jcr/src/main/java/org/apache/abdera/jcr/JcrCollectionAdapter.java?p2=incubator/abdera/java/trunk/jcr/src/main/java/org/apache/abdera/jcr/JcrCollectionAdapter.java&p1=incubator/abdera/java/branches/server_refactor_all/jcr/src/main/java/org/apache/abdera/jcr/JcrCollectionAdapter.java&r1=616012&r2=616015&rev=616015&view=diff
==============================================================================
(empty)
Propchange: incubator/abdera/java/trunk/jcr/src/main/java/org/apache/abdera/jcr/JcrCollectionAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/trunk/jcr/src/main/java/org/apache/abdera/jcr/JcrCollectionAdapter.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/abdera/java/trunk/jcr/src/main/java/org/apache/abdera/jcr/JcrCollectionAdapter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/abdera/java/trunk/jcr/src/main/java/org/apache/abdera/jcr/SessionPoolManager.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/jcr/src/main/java/org/apache/abdera/jcr/SessionPoolManager.java?rev=616015&r1=616014&r2=616015&view=diff
==============================================================================
--- incubator/abdera/java/trunk/jcr/src/main/java/org/apache/abdera/jcr/SessionPoolManager.java (original)
+++ incubator/abdera/java/trunk/jcr/src/main/java/org/apache/abdera/jcr/SessionPoolManager.java Mon Jan 28 12:09:53 2008
@@ -6,7 +6,7 @@
import javax.jcr.Session;
import org.apache.abdera.protocol.Request;
-import org.apache.abdera.protocol.server.impl.AbstractItemManager;
+import org.apache.abdera.protocol.util.AbstractItemManager;
public class SessionPoolManager extends AbstractItemManager<Session> {
private Repository repository;
Copied: incubator/abdera/java/trunk/jcr/src/test/java/org/apache/abdera/jcr/JcrCollectionAdapterTest.java (from r616012, incubator/abdera/java/branches/server_refactor_all/jcr/src/test/java/org/apache/abdera/jcr/JcrCollectionAdapterTest.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/jcr/src/test/java/org/apache/abdera/jcr/JcrCollectionAdapterTest.java?p2=incubator/abdera/java/trunk/jcr/src/test/java/org/apache/abdera/jcr/JcrCollectionAdapterTest.java&p1=incubator/abdera/java/branches/server_refactor_all/jcr/src/test/java/org/apache/abdera/jcr/JcrCollectionAdapterTest.java&r1=616012&r2=616015&rev=616015&view=diff
==============================================================================
(empty)
Propchange: incubator/abdera/java/trunk/jcr/src/test/java/org/apache/abdera/jcr/JcrCollectionAdapterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/trunk/jcr/src/test/java/org/apache/abdera/jcr/JcrCollectionAdapterTest.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/abdera/java/trunk/jcr/src/test/java/org/apache/abdera/jcr/JcrCollectionAdapterTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/abdera/java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/pom.xml?rev=616015&r1=616014&r2=616015&view=diff
==============================================================================
--- incubator/abdera/java/trunk/pom.xml (original)
+++ incubator/abdera/java/trunk/pom.xml Mon Jan 28 12:09:53 2008
@@ -143,6 +143,7 @@
<excludes>
<exclude>**/*TestSuite*</exclude>
<exclude>**/*$Test*</exclude>
+ <exclude>**/Test*</exclude>
</excludes>
</configuration>
</plugin>
Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/ResponseContextException.java (from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/ResponseContextException.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/ResponseContextException.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/ResponseContextException.java&p1=incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/ResponseContextException.java&r1=616012&r2=616015&rev=616015&view=diff
==============================================================================
(empty)
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/ResponseContextException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/ResponseContextException.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/ResponseContextException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractCollectionAdapter.java (from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractCollectionAdapter.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractCollectionAdapter.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractCollectionAdapter.java&p1=incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractCollectionAdapter.java&r1=616012&r2=616015&rev=616015&view=diff
==============================================================================
(empty)
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractCollectionAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractCollectionAdapter.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractCollectionAdapter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractEntityCollectionAdapter.java (from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractEntityCollectionAdapter.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractEntityCollectionAdapter.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractEntityCollectionAdapter.java&p1=incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractEntityCollectionAdapter.java&r1=616012&r2=616015&rev=616015&view=diff
==============================================================================
(empty)
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractEntityCollectionAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractEntityCollectionAdapter.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractEntityCollectionAdapter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractWorkspaceManager.java (from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractWorkspaceManager.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractWorkspaceManager.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractWorkspaceManager.java&p1=incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractWorkspaceManager.java&r1=616012&r2=616015&rev=616015&view=diff
==============================================================================
(empty)
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractWorkspaceManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractWorkspaceManager.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractWorkspaceManager.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultTarget.java (from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultTarget.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultTarget.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultTarget.java&p1=incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultTarget.java&r1=616012&r2=616015&rev=616015&view=diff
==============================================================================
(empty)
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultTarget.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultTarget.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultTarget.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultWorkspaceManager.java (from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultWorkspaceManager.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultWorkspaceManager.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultWorkspaceManager.java&p1=incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultWorkspaceManager.java&r1=616012&r2=616015&rev=616015&view=diff
==============================================================================
(empty)
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultWorkspaceManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultWorkspaceManager.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultWorkspaceManager.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/StructuredTargetResolver.java (from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/StructuredTargetResolver.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/StructuredTargetResolver.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/StructuredTargetResolver.java&p1=incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/StructuredTargetResolver.java&r1=616012&r2=616015&rev=616015&view=diff
==============================================================================
(empty)
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/StructuredTargetResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/StructuredTargetResolver.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/StructuredTargetResolver.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/Customer.java (from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/customer/Customer.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/Customer.java?p2=incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/Customer.java&p1=incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/customer/Customer.java&r1=616012&r2=616015&rev=616015&view=diff
==============================================================================
(empty)
Propchange: incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/Customer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/Customer.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/Customer.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapter.java (from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapter.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapter.java?p2=incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapter.java&p1=incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapter.java&r1=616012&r2=616015&rev=616015&view=diff
==============================================================================
(empty)
Propchange: incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapter.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapterTest.java (from r616012, incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapterTest.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapterTest.java?p2=incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapterTest.java&p1=incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapterTest.java&r1=616012&r2=616015&rev=616015&view=diff
==============================================================================
(empty)
Propchange: incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapterTest.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapterTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/abdera/java/trunk/spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/pom.xml?rev=616015&r1=616014&r2=616015&view=diff
==============================================================================
--- incubator/abdera/java/trunk/spring/pom.xml (original)
+++ incubator/abdera/java/trunk/spring/pom.xml Mon Jan 28 12:09:53 2008
@@ -37,21 +37,6 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/abdera/java/trunk/spring/</developerConnection>
<url>http://svn.apache.org/repos/asf/incubator/abdera/java/trunk/spring/</url>
</scm>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/TestProvider.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/AbstractSingleBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/AbstractSingleBeanDefinitionParser.java?rev=616015&r1=616014&r2=616015&view=diff
==============================================================================
--- incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/AbstractSingleBeanDefinitionParser.java (original)
+++ incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/AbstractSingleBeanDefinitionParser.java Mon Jan 28 12:09:53 2008
@@ -84,30 +84,36 @@
throw new IllegalStateException(propertyName + " property must have child elements!");
}
+ return getAndRegister(ctx, bean, first);
+ }
+
+ protected String getAndRegister(ParserContext ctx,
+ BeanDefinitionBuilder bean,
+ Element el) {
// Seems odd that we have to do the registration, I wonder if there is a better way
String id;
BeanDefinition child;
- if (first.getNamespaceURI().equals(BeanDefinitionParserDelegate.BEANS_NAMESPACE_URI)) {
- String name = first.getLocalName();
+ if (el.getNamespaceURI().equals(BeanDefinitionParserDelegate.BEANS_NAMESPACE_URI)) {
+ String name = el.getLocalName();
if ("ref".equals(name)) {
- id = first.getAttribute("bean");
+ id = el.getAttribute("bean");
if (id == null) {
throw new IllegalStateException("<ref> elements must have a \"bean\" attribute!");
}
return id;
} else if ("bean".equals(name)) {
- BeanDefinitionHolder bdh = ctx.getDelegate().parseBeanDefinitionElement(first);
+ BeanDefinitionHolder bdh = ctx.getDelegate().parseBeanDefinitionElement(el);
child = bdh.getBeanDefinition();
id = bdh.getBeanName();
} else {
throw new UnsupportedOperationException("Elements with the name " + name
+ " are not currently "
+ "supported as sub elements of "
- + element.getLocalName());
+ + el.getParentNode().getLocalName());
}
} else {
- child = ctx.getDelegate().parseCustomElement(first, bean.getBeanDefinition());
+ child = ctx.getDelegate().parseCustomElement(el, bean.getBeanDefinition());
id = child.toString();
}
Modified: incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/NamespaceHandler.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/NamespaceHandler.java?rev=616015&r1=616014&r2=616015&view=diff
==============================================================================
--- incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/NamespaceHandler.java (original)
+++ incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/NamespaceHandler.java Mon Jan 28 12:09:53 2008
@@ -22,7 +22,8 @@
public class NamespaceHandler extends NamespaceHandlerSupport {
public void init() {
- registerBeanDefinitionParser("serviceContext", new ServiceContextDefinitionParser());
+ registerBeanDefinitionParser("workspace", new WorkspaceDefinitionParser());
+ registerBeanDefinitionParser("provider", new DefaultProviderDefinitionParser());
registerBeanDefinitionParser("regexTargetResolver", new RegexTargetResolverDefinitionParser());
}
}
Copied: incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ProviderFactoryBean.java (from r616012, incubator/abdera/java/branches/server_refactor_all/spring/src/main/java/org/apache/abdera/spring/ProviderFactoryBean.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ProviderFactoryBean.java?p2=incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ProviderFactoryBean.java&p1=incubator/abdera/java/branches/server_refactor_all/spring/src/main/java/org/apache/abdera/spring/ProviderFactoryBean.java&r1=616012&r2=616015&rev=616015&view=diff
==============================================================================
(empty)
Propchange: incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ProviderFactoryBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ProviderFactoryBean.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ProviderFactoryBean.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/SpringAbderaServlet.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/SpringAbderaServlet.java?rev=616015&r1=616014&r2=616015&view=diff
==============================================================================
--- incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/SpringAbderaServlet.java (original)
+++ incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/SpringAbderaServlet.java Mon Jan 28 12:09:53 2008
@@ -17,7 +17,7 @@
*/
package org.apache.abdera.spring;
-import org.apache.abdera.protocol.server.ServiceContext;
+import org.apache.abdera.protocol.server.Provider;
import org.apache.abdera.protocol.server.servlet.AbderaServlet;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -33,17 +33,17 @@
private static final long serialVersionUID = -7579564455804753809L;
- protected ServiceContext createServiceContext() {
- String contextName = getInitParameter("serviceContextBeanName");
- if (contextName == null) {
- contextName = ServiceContext.class.getName();
+ protected Provider createProvider() {
+ String providerName = getInitParameter("providerBeanName");
+ if (providerName == null) {
+ providerName = Provider.class.getName();
}
WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(getServletContext());
- ServiceContext sc = (ServiceContext) ctx.getBean(contextName);
- sc.init(getAbdera(), getProperties(getServletConfig()));
- return sc;
+ Provider p = (Provider) ctx.getBean(providerName);
+ p.init(getAbdera(), getProperties(getServletConfig()));
+ return p;
}
}
Copied: incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/WorkspaceDefinitionParser.java (from r616012, incubator/abdera/java/branches/server_refactor_all/spring/src/main/java/org/apache/abdera/spring/WorkspaceDefinitionParser.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/WorkspaceDefinitionParser.java?p2=incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/WorkspaceDefinitionParser.java&p1=incubator/abdera/java/branches/server_refactor_all/spring/src/main/java/org/apache/abdera/spring/WorkspaceDefinitionParser.java&r1=616012&r2=616015&rev=616015&view=diff
==============================================================================
(empty)
Propchange: incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/WorkspaceDefinitionParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/WorkspaceDefinitionParser.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/WorkspaceDefinitionParser.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/abdera/java/trunk/spring/src/main/resources/META-INF/schemas/abdera-spring.xsd
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/src/main/resources/META-INF/schemas/abdera-spring.xsd?rev=616015&r1=616014&r2=616015&view=diff
==============================================================================
--- incubator/abdera/java/trunk/spring/src/main/resources/META-INF/schemas/abdera-spring.xsd (original)
+++ incubator/abdera/java/trunk/spring/src/main/resources/META-INF/schemas/abdera-spring.xsd Mon Jan 28 12:09:53 2008
@@ -1,61 +1,76 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<xsd:schema
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:beans="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"
- targetNamespace="http://abdera.apache.org"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified" >
-
- <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"/>
- <xsd:element name="serviceContext">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="beans:identifiedType">
- <xsd:sequence>
- <xsd:element name="provider" type="xsd:anyType" minOccurs="0"/>
- <xsd:element name="providerManager" type="xsd:anyType" minOccurs="0"/>
- <xsd:element name="targetResolver" type="xsd:anyType" minOccurs="0"/>
- <xsd:element name="subjectResolver" type="xsd:anyType" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="class" type="xsd:string" />
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="regexTargetResolver">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="beans:identifiedType">
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="category" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="collection" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="entry" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="media" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="service" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:choice>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xsd:schema
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"
+ targetNamespace="http://abdera.apache.org"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified" >
+
+ <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"/>
+ <xsd:element name="provider">
+ <xsd:complexType>
+ <xsd:complexContent>
+ <xsd:extension base="beans:identifiedType">
+ <xsd:sequence>
+ <xsd:element name="workspace" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="workspaceManager" type="xsd:anyType" minOccurs="0"/>
+ <xsd:element name="targetResolver" type="xsd:anyType" minOccurs="0"/>
+ <xsd:element name="subjectResolver" type="xsd:anyType" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="class" type="xsd:string" />
+ <xsd:attribute name="servicesPattern" type="xsd:string"/>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="workspace">
+ <xsd:complexType>
+ <xsd:complexContent>
+ <xsd:extension base="beans:identifiedType">
+ <xsd:sequence>
+ <xsd:element ref="beans:bean" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element ref="beans:ref" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="title" type="xsd:string"/>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="regexTargetResolver">
+ <xsd:complexType>
+ <xsd:complexContent>
+ <xsd:extension base="beans:identifiedType">
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="category" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="collection" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="entry" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="media" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="service" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:choice>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+ </xsd:element>
</xsd:schema>
Copied: incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/TestAdapter.java (from r616012, incubator/abdera/java/branches/server_refactor_all/spring/src/test/java/org/apache/abdera/spring/TestAdapter.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/TestAdapter.java?p2=incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/TestAdapter.java&p1=incubator/abdera/java/branches/server_refactor_all/spring/src/test/java/org/apache/abdera/spring/TestAdapter.java&r1=616012&r2=616015&rev=616015&view=diff
==============================================================================
(empty)
Propchange: incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/TestAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/TestAdapter.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/TestAdapter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/abdera/java/trunk/spring/src/test/resources/org/apache/abdera/spring/beans.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/src/test/resources/org/apache/abdera/spring/beans.xml?rev=616015&r1=616014&r2=616015&view=diff
==============================================================================
--- incubator/abdera/java/trunk/spring/src/test/resources/org/apache/abdera/spring/beans.xml (original)
+++ incubator/abdera/java/trunk/spring/src/test/resources/org/apache/abdera/spring/beans.xml Mon Jan 28 12:09:53 2008
@@ -1,30 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:a="http://abdera.apache.org"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://abdera.apache.org http://abdera.apache.org/schemas/abdera-spring.xsd">
-
- <!-- Abdera -->
- <a:serviceContext>
-
- <a:provider>
- <ref bean="provider"/>
- </a:provider>
-
- <a:targetResolver>
- <a:regexTargetResolver>
- <a:collection>/atom/feed(\?[^#]*)?</a:collection>
- <a:entry>/atom/feed/([^/#?]+)(\?[^#]*)?</a:entry>
- <a:service>/atom(\?[^#]*)?</a:service>
- </a:regexTargetResolver>
- </a:targetResolver>
-
- </a:serviceContext>
-
-
- <bean id="provider" class="org.apache.abdera.spring.TestProvider">
- </bean>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:a="http://abdera.apache.org"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://abdera.apache.org http://abdera.apache.org/schemas/abdera-spring.xsd">
+
+ <!-- Abdera -->
+ <a:provider>
+
+ <a:workspace title="Foo Workspace">
+ <!-- These are our collections -->
+ <bean class="org.apache.abdera.spring.TestAdapter"/>
+ </a:workspace>
+
+ <!-- It is not necessary to specify this, but we're testing it -->
+ <a:targetResolver>
+ <a:regexTargetResolver>
+ <a:collection>/atom/feed(\?[^#]*)?</a:collection>
+ <a:entry>/atom/feed/([^/#?]+)(\?[^#]*)?</a:entry>
+ <a:service>/atom(\?[^#]*)?</a:service>
+ </a:regexTargetResolver>
+ </a:targetResolver>
+
+ </a:provider>
+
</beans>