[exo-jcr-commits] exo-jcr SVN: r285 - in ws/branches/2.2.x: rest/core and 25 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Oct 15 12:21:36 EDT 2009


Author: aparfonov
Date: 2009-10-15 12:21:30 -0400 (Thu, 15 Oct 2009)
New Revision: 285

Added:
   ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/ext/method/MethodInvokerFilterComponentPlugin.java
   ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/impl/ExoContainerDependencyInjector.java
   ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/impl/RestInitializer.java
   ws/branches/2.2.x/rest/ext/src/test/java/conf/
   ws/branches/2.2.x/rest/ext/src/test/java/conf/standalone/
   ws/branches/2.2.x/rest/ext/src/test/java/conf/standalone/test-configuration.xml
   ws/branches/2.2.x/rest/ext/src/test/java/org/exoplatform/services/rest/BaseTest.java
Removed:
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RequestFilterComponentPlugin.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ResponseFilterComponentPlugin.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/MethodInvokerFilterComponentPlugin.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/EntityProviderComponentPlugin.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBContextComponentPlugin.java
Modified:
   ws/branches/2.2.x/pom.xml
   ws/branches/2.2.x/rest/core/pom.xml
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ApplicationContext.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/Connector.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ConstructorDescriptor.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ConstructorParameter.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ContainerResponseWriter.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ExtHttpHeaders.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ExtMultivaluedMap.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/FieldInjector.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/Filter.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/FilterDescriptor.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/GenericContainerRequest.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/GenericContainerResponse.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ObjectFactory.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ObjectModel.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/Parameter.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/PerRequestObjectFactory.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/RequestFilter.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/RequestHandler.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ResponseFilter.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/SingletonObjectFactory.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/header/AbstractHeaderDelegate.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/header/QualityValue.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ApplicationContextImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/BaseResourceBinder.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ConstructorDescriptorImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ConstructorParameterImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ContainerRequest.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ContainerResponse.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/EnvironmentContext.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/FieldInjectorImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/FilterDescriptorImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/InputHeadersMap.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/InternalException.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/MultivaluedMapImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/OutputHeadersMap.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ProviderBinder.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RequestDispatcher.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RequestHandlerImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ResponseImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RuntimeDelegateImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/SimpleDependencyInjector.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/UnhandledException.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/VariantListBuilderImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/VariantsHandler.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptLanguage.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptLanguageHeaderDelegate.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptMediaType.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptMediaTypeHeaderDelegate.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptToken.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/CacheControlHeaderDelegate.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/CookieHeaderDelegate.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/DateHeaderDelegate.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/EntityTagHeaderDelegate.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/HeaderHelper.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/HeaderParameterParser.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/Language.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/ListHeaderProducer.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/LocaleHeaderDelegate.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/MediaTypeHeaderDelegate.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/MediaTypeHelper.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/NewCookieHeaderDelegate.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/StringHeaderDelegate.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/Token.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/URIHeaderDelegate.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/BaseCollectionProducer.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/BaseTypeProducer.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CollectionStringConstructorProducer.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CollectionStringProducer.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CollectionStringValueOfProducer.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ContextParameterResolver.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CookieParameterResolver.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/DefaultMethodInvoker.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/FormParameterResolver.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/HeaderParameterResolver.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/MatrixParameterResolver.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/MethodParameterImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/OptionsRequestMethodInvoker.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterHelper.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterResolver.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterResolverFactory.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/PathParameterResolver.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/PrimitiveTypeProducer.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/QueryParameterResolver.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/StringConstructorProducer.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/StringProducer.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/StringValueOfProducer.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/ByteEntityProvider.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/DOMSourceEntityProvider.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/DataSourceEntityProvider.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/FileEntityProvider.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/IOHelper.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/InputStreamEntityProvider.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBContextResolver.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBElementEntityProvider.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBObjectEntityProvider.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JsonEntityProvider.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/MultipartFormDataEntityProvider.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/MultivaluedMapEntityProvider.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/ProviderDescriptorImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/ReaderEntityProvider.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/SAXSourceEntityProvider.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/StreamOutputEntityProvider.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/StreamSourceEntityProvider.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/StringEntityProvider.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/AbstractResourceDescriptorImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/OptionsRequestResourceMethodDescriptorImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/PathValue.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceDescriptorValidator.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceMethodDescriptorImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/SubResourceLocatorDescriptorImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/SubResourceMethodDescriptorImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/uri/PathSegmentImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/uri/UriBuilderImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/uri/UriComponent.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/MethodInvoker.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/MethodInvokerFilter.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/MethodParameter.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/TypeProducer.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/provider/EntityProvider.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/provider/ProviderDescriptor.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/AbstractResourceDescriptor.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/GenericMethodResource.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceContainer.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceDescriptor.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceDescriptorVisitor.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceMethodDescriptor.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceMethodMap.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceLocatorDescriptor.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceLocatorMap.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceMethodDescriptor.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceMethodMap.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/servlet/RestEncodingFilter.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/servlet/ServletContainerRequest.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/tools/ByteArrayContainerResponseWriter.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/tools/DummyContainerResponseWriter.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/uri/UriPattern.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/uri/UriTemplateParser.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/util/MediaTypeMap.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/util/MediaTypeMultivaluedMap.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/util/UriPatternMap.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/wadl/BaseWadlGeneratorImpl.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/wadl/WadlGenerator.java
   ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/wadl/WadlProcessor.java
   ws/branches/2.2.x/rest/core/src/test/java/org/exoplatform/services/rest/impl/BaseTest.java
   ws/branches/2.2.x/rest/ext/pom.xml
   ws/branches/2.2.x/rest/ext/src/main/java/conf/portal/configuration.xml
   ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/impl/ExoContainerResourceBinder.java
Log:
EXOJCR-185 : 

Modified: ws/branches/2.2.x/pom.xml
===================================================================
--- ws/branches/2.2.x/pom.xml	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/pom.xml	2009-10-15 16:21:30 UTC (rev 285)
@@ -85,6 +85,16 @@
          </dependency>
          <dependency>
             <groupId>org.exoplatform.kernel</groupId>
+            <artifactId>exo.kernel.container</artifactId>
+            <version>${org.exoplatform.kernel.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.kernel</groupId>
+            <artifactId>exo.kernel.commons</artifactId>
+            <version>${org.exoplatform.kernel.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.kernel</groupId>
             <artifactId>exo.kernel.component.common</artifactId>
             <version>${org.exoplatform.kernel.version}</version>
          </dependency>
@@ -140,6 +150,16 @@
             <artifactId>jsr250-api</artifactId>
             <version>1.0</version>
          </dependency>
+         <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+         </dependency>
+         <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>1.4</version>
+         </dependency>
       </dependencies>
    </dependencyManagement>
 

Modified: ws/branches/2.2.x/rest/core/pom.xml
===================================================================
--- ws/branches/2.2.x/rest/core/pom.xml	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/pom.xml	2009-10-15 16:21:30 UTC (rev 285)
@@ -33,13 +33,9 @@
    <name>eXo WS :: REST :: Core</name>
 
    <dependencies>
-      <!--dependency>
+      <dependency>
          <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.component.common</artifactId>
-      </dependency-->
-      <dependency>
-         <groupId>org.exoplatform.core</groupId>
-         <artifactId>exo.core.component.xml-processing</artifactId>
+         <artifactId>exo.kernel.commons</artifactId>
       </dependency>
       <dependency>
          <groupId>org.exoplatform.ws</groupId>
@@ -72,9 +68,13 @@
          <artifactId>commons-fileupload</artifactId>
       </dependency>
       <dependency>
-         <groupId>commons-io</groupId>
-         <artifactId>commons-io</artifactId>
+         <groupId>javax.servlet</groupId>
+         <artifactId>servlet-api</artifactId>
       </dependency>
+      <dependency>
+         <groupId>javax.mail</groupId>
+         <artifactId>mail</artifactId>
+      </dependency>
    </dependencies>
 
    <build>

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ApplicationContext.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ApplicationContext.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ApplicationContext.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -35,7 +35,7 @@
  * information.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface ApplicationContext extends UriInfo, InitialProperties
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ApplicationContext.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/Connector.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/Connector.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/Connector.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -30,7 +30,7 @@
  * request."
  * 
  * @author Gennady Azarenkov
- * @version $Id: $
+ * @version $Id$
  */
 public interface Connector
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/Connector.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ConstructorDescriptor.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ConstructorDescriptor.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ConstructorDescriptor.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -28,7 +28,7 @@
  * type is used in per-request lifecycle.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface ConstructorDescriptor extends ResourceDescriptor
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ConstructorDescriptor.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ConstructorParameter.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ConstructorParameter.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ConstructorParameter.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -22,7 +22,7 @@
  * Constructor parameter.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface ConstructorParameter extends Parameter
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ConstructorParameter.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ContainerResponseWriter.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ContainerResponseWriter.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ContainerResponseWriter.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -27,7 +27,7 @@
  * container response, e. g. servlet response.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface ContainerResponseWriter
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ContainerResponseWriter.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ExtHttpHeaders.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ExtHttpHeaders.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ExtHttpHeaders.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -22,7 +22,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface ExtHttpHeaders extends HttpHeaders
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ExtHttpHeaders.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ExtMultivaluedMap.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ExtMultivaluedMap.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ExtMultivaluedMap.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -30,7 +30,7 @@
  * @param <V> value
  * @see #getList(Object)
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface ExtMultivaluedMap<K, V> extends MultivaluedMap<K, V>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ExtMultivaluedMap.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/FieldInjector.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/FieldInjector.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/FieldInjector.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -25,7 +25,7 @@
  * per-request mode.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface FieldInjector extends Parameter, ResourceDescriptor
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/FieldInjector.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/Filter.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/Filter.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/Filter.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -36,7 +36,7 @@
  * @see ResponseFilter
  * @see MethodInvokerFilter
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/Filter.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/FilterDescriptor.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/FilterDescriptor.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/FilterDescriptor.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -31,7 +31,7 @@
  * @see ResponseFilter
  * @see MethodInvokerFilter
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface FilterDescriptor extends ResourceDescriptor, ObjectModel
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/FilterDescriptor.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/GenericContainerRequest.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/GenericContainerRequest.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/GenericContainerRequest.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -29,7 +29,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface GenericContainerRequest extends Request, SecurityContext, ExtHttpHeaders
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/GenericContainerRequest.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/GenericContainerResponse.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/GenericContainerResponse.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/GenericContainerResponse.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -27,7 +27,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface GenericContainerResponse
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/GenericContainerResponse.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ObjectFactory.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ObjectFactory.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ObjectFactory.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -25,7 +25,7 @@
  * @param <T> ObjectModel extensions
  * @see ObjectModel
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface ObjectFactory<T extends ObjectModel>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ObjectFactory.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ObjectModel.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ObjectModel.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ObjectModel.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -24,7 +24,7 @@
  * Abstract description of object.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface ObjectModel
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ObjectModel.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/Parameter.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/Parameter.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/Parameter.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -25,7 +25,7 @@
  * Abstraction of method's, constructor's parameter or object field.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface Parameter
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/Parameter.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/PerRequestObjectFactory.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/PerRequestObjectFactory.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/PerRequestObjectFactory.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -24,7 +24,7 @@
  * @param <T> ObjectModel extensions
  * @see ObjectModel
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class PerRequestObjectFactory<T extends ObjectModel> implements ObjectFactory<T>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/PerRequestObjectFactory.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/RequestFilter.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/RequestFilter.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/RequestFilter.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -25,7 +25,7 @@
  * wrong parameters.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface RequestFilter
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/RequestFilter.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/RequestHandler.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/RequestHandler.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/RequestHandler.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -23,7 +23,7 @@
  * control main components of JAX-RS implementation.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface RequestHandler
 {
@@ -46,6 +46,13 @@
    public static final int WS_RS_BUFFER_SIZE_VALUE = 204800;
 
    /**
+    * Get {@link ResourceBinder}.
+    * 
+    * @return ResourceBinder
+    */
+   ResourceBinder getResourceBinder();
+
+   /**
     * Handle the HTTP request by dispatching request to appropriate resource. If
     * no one appropriate resource found then error response will be produced.
     * 


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/RequestHandler.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ResponseFilter.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ResponseFilter.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ResponseFilter.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -24,7 +24,7 @@
  * not be used directly, it is part of REST framework.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface ResponseFilter
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/ResponseFilter.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/SingletonObjectFactory.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/SingletonObjectFactory.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/SingletonObjectFactory.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -22,7 +22,7 @@
  * Provide object instance of components that support singleton lifecycle.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  * @param <T>
  */
 public class SingletonObjectFactory<T extends ObjectModel> implements ObjectFactory<T>


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/SingletonObjectFactory.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/header/AbstractHeaderDelegate.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/header/AbstractHeaderDelegate.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/header/AbstractHeaderDelegate.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -22,7 +22,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  * @param <T> Java type for representing HTTP header
  */
 public abstract class AbstractHeaderDelegate<T> implements HeaderDelegate<T>


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/header/AbstractHeaderDelegate.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/header/QualityValue.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/header/QualityValue.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/header/QualityValue.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -24,7 +24,7 @@
  * {@link <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1">HTTP/1.1 documentation</a>}.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface QualityValue
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/header/QualityValue.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ApplicationContextImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ApplicationContextImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ApplicationContextImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -41,7 +41,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class ApplicationContextImpl implements ApplicationContext
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ApplicationContextImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/BaseResourceBinder.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/BaseResourceBinder.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/BaseResourceBinder.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -100,14 +100,12 @@
 
    private int size = 0;
 
-   /**
-    * @see RuntimeDelegate
-    */
-   private final RuntimeDelegate rd;
-
    public BaseResourceBinder()
    {
-      rd = new RuntimeDelegateImpl();
+      // Initialize RuntimeDelegate instance
+      // This is first component in life cycle what needs.
+      // TODO better solution to initialize RuntimeDelegate
+      RuntimeDelegate rd = new RuntimeDelegateImpl();
       RuntimeDelegate.setInstance(rd);
    }
    

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ConstructorDescriptorImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ConstructorDescriptorImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ConstructorDescriptorImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -48,7 +48,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class ConstructorDescriptorImpl implements ConstructorDescriptor
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ConstructorDescriptorImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ConstructorParameterImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ConstructorParameterImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ConstructorParameterImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -27,7 +27,7 @@
  * Describes constructor's parameter.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class ConstructorParameterImpl implements ConstructorParameter
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ConstructorParameterImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ContainerRequest.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ContainerRequest.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ContainerRequest.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -46,7 +46,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class ContainerRequest implements GenericContainerRequest
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ContainerRequest.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ContainerResponse.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ContainerResponse.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ContainerResponse.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -40,7 +40,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class ContainerResponse implements GenericContainerResponse
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ContainerResponse.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/EnvironmentContext.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/EnvironmentContext.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/EnvironmentContext.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -25,7 +25,7 @@
  * in resource. Parameter must be annotated by {@link javax.ws.rs.core.Context}.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class EnvironmentContext extends HashMap<Class<?>, Object>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/EnvironmentContext.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/FieldInjectorImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/FieldInjectorImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/FieldInjectorImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -43,7 +43,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class FieldInjectorImpl implements FieldInjector
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/FieldInjectorImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/FilterDescriptorImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/FilterDescriptorImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/FilterDescriptorImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -35,7 +35,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class FilterDescriptorImpl implements FilterDescriptor
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/FilterDescriptorImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/InputHeadersMap.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/InputHeadersMap.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/InputHeadersMap.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -34,7 +34,7 @@
  * Read only case insensitive {@link MultivaluedMap}.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 // TODO this implementation is not efficient, probably can be better extend
 // java.util.AbstractMap


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/InputHeadersMap.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/InternalException.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/InternalException.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/InternalException.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -24,7 +24,7 @@
  * used as wrapper for exception that may occur during request processing.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class InternalException extends RuntimeException
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/InternalException.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/MultivaluedMapImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/MultivaluedMapImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/MultivaluedMapImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -27,7 +27,7 @@
 /**
  * @see javax.ws.rs.core.MultivaluedMap
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class MultivaluedMapImpl extends HashMap<String, List<String>> implements ExtMultivaluedMap<String, String>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/MultivaluedMapImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/OutputHeadersMap.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/OutputHeadersMap.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/OutputHeadersMap.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -29,7 +29,7 @@
  * Case insensitive {@link MultivaluedMap}.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 //TODO this implementation is not efficient, probably can be better extend
 //java.util.AbstractMap


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/OutputHeadersMap.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ProviderBinder.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ProviderBinder.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ProviderBinder.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -72,7 +72,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class ProviderBinder implements Providers
 {
@@ -178,7 +178,7 @@
       addMessageBodyReader(MultipartFormDataEntityProvider.class);
 
       // JAXB context
-      addContextResolver(JAXBContextResolver.class);
+      addContextResolver(new JAXBContextResolver());
 
    }
 


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ProviderBinder.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RequestDispatcher.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RequestDispatcher.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RequestDispatcher.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -57,7 +57,7 @@
  * Lookup resource which can serve request.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class RequestDispatcher
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RequestDispatcher.java
___________________________________________________________________
Name: svn:keywords
   + Id

Deleted: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RequestFilterComponentPlugin.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RequestFilterComponentPlugin.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RequestFilterComponentPlugin.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.exoplatform.services.rest.impl;
-
-import org.exoplatform.container.component.BaseComponentPlugin;
-import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.container.xml.ValueParam;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.services.rest.RequestFilter;
-import org.exoplatform.services.rest.RequestHandler;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * For injection {@link RequestFilter} in {@link RequestHandler} at startup.
- * 
- * @see RequestHandlerImpl
- * @see RequestFilter
- * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
- */
-public class RequestFilterComponentPlugin extends BaseComponentPlugin
-{
-
-   /**
-    * Logger.
-    */
-   private static final Log LOG = ExoLogger.getLogger(RequestFilterComponentPlugin.class.getName());
-
-   /**
-    * See {@link RequestFilter}.
-    */
-   private Set<Class<? extends RequestFilter>> fs = new HashSet<Class<? extends RequestFilter>>();
-
-   /**
-    * @param params initialize parameters from configuration.
-    * @see InitParams
-    */
-   @SuppressWarnings("unchecked")
-   public RequestFilterComponentPlugin(InitParams params)
-   {
-      if (params != null)
-      {
-         Iterator<ValueParam> i = params.getValueParamIterator();
-         while (i.hasNext())
-         {
-            ValueParam v = i.next();
-            try
-            {
-               fs.add((Class<? extends RequestFilter>)Class.forName(v.getValue()));
-            }
-            catch (ClassNotFoundException e)
-            {
-               LOG.error("Failed load class " + v.getValue(), e);
-            }
-         }
-      }
-   }
-
-   /**
-    * @return Collection of classes RequestFilter supplied in configuration.
-    */
-   public Set<Class<? extends RequestFilter>> getFilters()
-   {
-      return fs;
-   }
-
-}

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RequestHandlerImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RequestHandlerImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RequestHandlerImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -45,7 +45,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class RequestHandlerImpl implements RequestHandler
 {
@@ -116,13 +116,6 @@
    
    private final DependencyInjector depInjector;
    
-//   public RequestHandlerImpl(DependencyInjector depInjector)
-//   {
-//      this.binder = new BaseResourceBinder();
-//      this.dispatcher = new RequestDispatcher(binder);
-//      this.depInjector = depInjector;
-//   }
-   
    public RequestHandlerImpl(ResourceBinder binder, DependencyInjector depInjector)
    {
       this.binder = binder;
@@ -130,7 +123,10 @@
       this.depInjector = depInjector;
    }
 
-   public ResourceBinder getBinder()
+   /**
+    * {@inheritDoc}
+    */
+   public ResourceBinder getResourceBinder()
    {
       return binder;
    }


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RequestHandlerImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Deleted: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ResponseFilterComponentPlugin.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ResponseFilterComponentPlugin.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ResponseFilterComponentPlugin.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.exoplatform.services.rest.impl;
-
-import org.exoplatform.container.component.BaseComponentPlugin;
-import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.container.xml.ValueParam;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.services.rest.RequestHandler;
-import org.exoplatform.services.rest.ResponseFilter;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * For injection {@link ResponseFilter} in {@link RequestHandler} at startup.
- * 
- * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
- */
-public class ResponseFilterComponentPlugin extends BaseComponentPlugin
-{
-
-   /**
-    * Logger.
-    */
-   private static final Log LOG = ExoLogger.getLogger(RequestFilterComponentPlugin.class.getName());
-
-   /**
-    * See {@link ResponseFilter}.
-    */
-   private Set<Class<? extends ResponseFilter>> fs = new HashSet<Class<? extends ResponseFilter>>();
-
-   /**
-    * @param params initialize parameters from configurations
-    * @see InitParams
-    */
-   @SuppressWarnings("unchecked")
-   public ResponseFilterComponentPlugin(InitParams params)
-   {
-      if (params != null)
-      {
-         Iterator<ValueParam> i = params.getValueParamIterator();
-         while (i.hasNext())
-         {
-            ValueParam v = i.next();
-            try
-            {
-               fs.add((Class<? extends ResponseFilter>)Class.forName(v.getValue()));
-            }
-            catch (ClassNotFoundException e)
-            {
-               LOG.error("Failed load class " + v.getValue(), e);
-            }
-         }
-      }
-   }
-
-   /**
-    * @return Collection of classes ResponseFilter supplied in configuration.
-    */
-   public Set<Class<? extends ResponseFilter>> getFilters()
-   {
-      return fs;
-   }
-
-}

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ResponseImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ResponseImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ResponseImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -38,7 +38,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class ResponseImpl extends Response
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/ResponseImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RuntimeDelegateImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RuntimeDelegateImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RuntimeDelegateImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -52,7 +52,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class RuntimeDelegateImpl extends RuntimeDelegate
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/RuntimeDelegateImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/SimpleDependencyInjector.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/SimpleDependencyInjector.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/SimpleDependencyInjector.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -25,7 +25,7 @@
 
 /**
  * @author <a href="mailto:andrey.parfonov at exoplatform.com">Andrey Parfonov</a>
- * @version $Id: SimpleDependencyInjector.java 275 2009-10-13 16:17:02Z aparfonov $
+ * @version $Id$
  */
 public class SimpleDependencyInjector extends HashMap<Class<?>, Object> implements DependencyInjector
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/SimpleDependencyInjector.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/UnhandledException.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/UnhandledException.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/UnhandledException.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -25,7 +25,7 @@
  * container (e.g. Servlet Container)
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class UnhandledException extends RuntimeException
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/UnhandledException.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/VariantListBuilderImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/VariantListBuilderImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/VariantListBuilderImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -31,7 +31,7 @@
  * See {@link VariantListBuilder}.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class VariantListBuilderImpl extends VariantListBuilder
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/VariantListBuilderImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/VariantsHandler.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/VariantsHandler.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/VariantsHandler.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -35,7 +35,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class VariantsHandler
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/VariantsHandler.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptLanguage.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptLanguage.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptLanguage.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -27,7 +27,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class AcceptLanguage extends Language implements QualityValue
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptLanguage.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptLanguageHeaderDelegate.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptLanguageHeaderDelegate.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptLanguageHeaderDelegate.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -27,7 +27,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class AcceptLanguageHeaderDelegate extends AbstractHeaderDelegate<AcceptLanguage>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptLanguageHeaderDelegate.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptMediaType.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptMediaType.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptMediaType.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -28,7 +28,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class AcceptMediaType extends MediaType implements QualityValue
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptMediaType.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptMediaTypeHeaderDelegate.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptMediaTypeHeaderDelegate.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptMediaTypeHeaderDelegate.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -24,7 +24,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class AcceptMediaTypeHeaderDelegate extends AbstractHeaderDelegate<AcceptMediaType>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptMediaTypeHeaderDelegate.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptToken.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptToken.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptToken.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -22,7 +22,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class AcceptToken extends Token implements QualityValue
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/AcceptToken.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/CacheControlHeaderDelegate.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/CacheControlHeaderDelegate.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/CacheControlHeaderDelegate.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -27,7 +27,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class CacheControlHeaderDelegate extends AbstractHeaderDelegate<CacheControl>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/CacheControlHeaderDelegate.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/CookieHeaderDelegate.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/CookieHeaderDelegate.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/CookieHeaderDelegate.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -26,7 +26,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class CookieHeaderDelegate extends AbstractHeaderDelegate<Cookie>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/CookieHeaderDelegate.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/DateHeaderDelegate.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/DateHeaderDelegate.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/DateHeaderDelegate.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -24,7 +24,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class DateHeaderDelegate extends AbstractHeaderDelegate<Date>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/DateHeaderDelegate.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/EntityTagHeaderDelegate.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/EntityTagHeaderDelegate.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/EntityTagHeaderDelegate.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -24,7 +24,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class EntityTagHeaderDelegate extends AbstractHeaderDelegate<EntityTag>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/EntityTagHeaderDelegate.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/HeaderHelper.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/HeaderHelper.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/HeaderHelper.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -43,7 +43,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class HeaderHelper
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/HeaderHelper.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/HeaderParameterParser.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/HeaderParameterParser.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/HeaderParameterParser.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -24,7 +24,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class HeaderParameterParser
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/HeaderParameterParser.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/Language.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/Language.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/Language.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -27,7 +27,7 @@
  * Reflection for HTTP language tag.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class Language
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/Language.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/ListHeaderProducer.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/ListHeaderProducer.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/ListHeaderProducer.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -29,7 +29,7 @@
  * parsing 'accept' and 'accept-language' headers.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  * @param <T> type that implements {@link QualityValue}
  */
 public abstract class ListHeaderProducer<T extends QualityValue>


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/ListHeaderProducer.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/LocaleHeaderDelegate.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/LocaleHeaderDelegate.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/LocaleHeaderDelegate.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -24,7 +24,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class LocaleHeaderDelegate extends AbstractHeaderDelegate<Locale>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/LocaleHeaderDelegate.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/MediaTypeHeaderDelegate.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/MediaTypeHeaderDelegate.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/MediaTypeHeaderDelegate.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -28,7 +28,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class MediaTypeHeaderDelegate extends AbstractHeaderDelegate<MediaType>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/MediaTypeHeaderDelegate.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/MediaTypeHelper.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/MediaTypeHelper.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/MediaTypeHelper.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -32,7 +32,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class MediaTypeHelper
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/MediaTypeHelper.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/NewCookieHeaderDelegate.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/NewCookieHeaderDelegate.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/NewCookieHeaderDelegate.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -24,7 +24,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class NewCookieHeaderDelegate extends AbstractHeaderDelegate<NewCookie>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/NewCookieHeaderDelegate.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/StringHeaderDelegate.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/StringHeaderDelegate.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/StringHeaderDelegate.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -22,7 +22,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class StringHeaderDelegate extends AbstractHeaderDelegate<String>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/StringHeaderDelegate.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/Token.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/Token.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/Token.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -23,7 +23,7 @@
  * {@link HeaderHelper#isToken(String)} . Token is separated by ','
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class Token
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/Token.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/URIHeaderDelegate.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/URIHeaderDelegate.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/URIHeaderDelegate.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -24,7 +24,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class URIHeaderDelegate extends AbstractHeaderDelegate<URI>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/header/URIHeaderDelegate.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/BaseCollectionProducer.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/BaseCollectionProducer.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/BaseCollectionProducer.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -32,7 +32,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public abstract class BaseCollectionProducer implements TypeProducer
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/BaseCollectionProducer.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/BaseTypeProducer.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/BaseTypeProducer.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/BaseTypeProducer.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -26,7 +26,7 @@
  * Abstraction for single (not for collections) types.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public abstract class BaseTypeProducer implements TypeProducer
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/BaseTypeProducer.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CollectionStringConstructorProducer.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CollectionStringConstructorProducer.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CollectionStringConstructorProducer.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -25,7 +25,7 @@
  * single String argument.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class CollectionStringConstructorProducer extends BaseCollectionProducer
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CollectionStringConstructorProducer.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CollectionStringProducer.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CollectionStringProducer.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CollectionStringProducer.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -22,7 +22,7 @@
  * Produce collections each element of it is String.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class CollectionStringProducer extends BaseCollectionProducer
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CollectionStringProducer.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CollectionStringValueOfProducer.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CollectionStringValueOfProducer.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CollectionStringValueOfProducer.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -25,7 +25,7 @@
  * <code>valueOf</code> with single String argument.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class CollectionStringValueOfProducer extends BaseCollectionProducer
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CollectionStringValueOfProducer.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ContextParameterResolver.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ContextParameterResolver.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ContextParameterResolver.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -34,7 +34,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class ContextParameterResolver extends ParameterResolver<Context>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ContextParameterResolver.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CookieParameterResolver.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CookieParameterResolver.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CookieParameterResolver.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -25,7 +25,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class CookieParameterResolver extends ParameterResolver<CookieParam>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/CookieParameterResolver.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/DefaultMethodInvoker.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/DefaultMethodInvoker.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/DefaultMethodInvoker.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -46,7 +46,7 @@
  * Invoker for Resource Method, Sub-Resource Method and SubResource Locator.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class DefaultMethodInvoker implements MethodInvoker
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/DefaultMethodInvoker.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/FormParameterResolver.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/FormParameterResolver.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/FormParameterResolver.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -32,7 +32,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class FormParameterResolver extends ParameterResolver<FormParam>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/FormParameterResolver.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/HeaderParameterResolver.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/HeaderParameterResolver.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/HeaderParameterResolver.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -25,7 +25,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class HeaderParameterResolver extends ParameterResolver<HeaderParam>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/HeaderParameterResolver.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/MatrixParameterResolver.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/MatrixParameterResolver.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/MatrixParameterResolver.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -28,7 +28,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class MatrixParameterResolver extends ParameterResolver<MatrixParam>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/MatrixParameterResolver.java
___________________________________________________________________
Name: svn:keywords
   + Id

Deleted: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/MethodInvokerFilterComponentPlugin.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/MethodInvokerFilterComponentPlugin.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/MethodInvokerFilterComponentPlugin.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.exoplatform.services.rest.impl.method;
-
-import org.exoplatform.container.component.BaseComponentPlugin;
-import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.container.xml.ValueParam;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.services.rest.RequestHandler;
-import org.exoplatform.services.rest.method.MethodInvokerFilter;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * For injection {@link MethodInvokerFilter} in {@link RequestHandler} at
- * startup.
- * 
- * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
- */
-public class MethodInvokerFilterComponentPlugin extends BaseComponentPlugin
-{
-
-   /**
-    * Logger.
-    */
-   private static final Log LOG = ExoLogger.getLogger(MethodInvokerFilterComponentPlugin.class.getName());
-
-   /**
-    * List of {@link MethodInvokerFilter}.
-    */
-   private Set<Class<? extends MethodInvokerFilter>> mifs = new HashSet<Class<? extends MethodInvokerFilter>>();
-
-   /**
-    * @param params initialize parameters from configuration
-    * @see InitParams
-    */
-   @SuppressWarnings("unchecked")
-   public MethodInvokerFilterComponentPlugin(InitParams params)
-   {
-      if (params != null)
-      {
-         Iterator<ValueParam> i = params.getValueParamIterator();
-         while (i.hasNext())
-         {
-            ValueParam v = i.next();
-            try
-            {
-               mifs.add((Class<? extends MethodInvokerFilter>)Class.forName(v.getValue()));
-            }
-            catch (ClassNotFoundException e)
-            {
-               LOG.error("Failed load class " + v.getValue(), e);
-            }
-         }
-      }
-   }
-
-   /**
-    * @return get collection of classes MethodInvokerFilter supplied from
-    *         configuration
-    */
-   public Set<Class<? extends MethodInvokerFilter>> getFilters()
-   {
-      return mifs;
-   }
-
-}

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/MethodParameterImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/MethodParameterImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/MethodParameterImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -25,7 +25,7 @@
  * Describes the method's parameter.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class MethodParameterImpl implements org.exoplatform.services.rest.method.MethodParameter
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/MethodParameterImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/OptionsRequestMethodInvoker.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/OptionsRequestMethodInvoker.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/OptionsRequestMethodInvoker.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -29,7 +29,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class OptionsRequestMethodInvoker implements MethodInvoker
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/OptionsRequestMethodInvoker.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterHelper.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterHelper.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterHelper.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -45,7 +45,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class ParameterHelper
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterHelper.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterResolver.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterResolver.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterResolver.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -22,7 +22,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  * @param <T> on of JAX-RS annotation that used for method parameters
  */
 public abstract class ParameterResolver<T>


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterResolver.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterResolverFactory.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterResolverFactory.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterResolverFactory.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -33,7 +33,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class ParameterResolverFactory
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterResolverFactory.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/PathParameterResolver.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/PathParameterResolver.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/PathParameterResolver.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -25,7 +25,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class PathParameterResolver extends ParameterResolver<PathParam>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/PathParameterResolver.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/PrimitiveTypeProducer.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/PrimitiveTypeProducer.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/PrimitiveTypeProducer.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -29,7 +29,7 @@
  * Construct a primitive type from string value.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class PrimitiveTypeProducer extends BaseTypeProducer
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/PrimitiveTypeProducer.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/QueryParameterResolver.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/QueryParameterResolver.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/QueryParameterResolver.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -25,7 +25,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class QueryParameterResolver extends ParameterResolver<QueryParam>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/QueryParameterResolver.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/StringConstructorProducer.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/StringConstructorProducer.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/StringConstructorProducer.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -24,7 +24,7 @@
  * Create object which has constructor with single String parameter.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class StringConstructorProducer extends BaseTypeProducer
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/StringConstructorProducer.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/StringProducer.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/StringProducer.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/StringProducer.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -20,7 +20,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class StringProducer extends BaseTypeProducer
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/StringProducer.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/StringValueOfProducer.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/StringValueOfProducer.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/StringValueOfProducer.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -22,7 +22,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class StringValueOfProducer extends BaseTypeProducer
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/StringValueOfProducer.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/ByteEntityProvider.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/ByteEntityProvider.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/ByteEntityProvider.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -33,7 +33,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 @Provider
 public class ByteEntityProvider implements EntityProvider<byte[]>


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/ByteEntityProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/DOMSourceEntityProvider.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/DOMSourceEntityProvider.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/DOMSourceEntityProvider.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -47,7 +47,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 @Provider
 @Consumes({MediaType.APPLICATION_XML, MediaType.TEXT_XML, MediaType.APPLICATION_XHTML_XML})


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/DOMSourceEntityProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/DataSourceEntityProvider.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/DataSourceEntityProvider.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/DataSourceEntityProvider.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -41,7 +41,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 @Provider
 public class DataSourceEntityProvider implements EntityProvider<DataSource>


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/DataSourceEntityProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id

Deleted: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/EntityProviderComponentPlugin.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/EntityProviderComponentPlugin.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/EntityProviderComponentPlugin.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.exoplatform.services.rest.impl.provider;
-
-import org.exoplatform.container.component.BaseComponentPlugin;
-import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.container.xml.ValueParam;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.services.rest.provider.EntityProvider;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
- */
- at SuppressWarnings("unchecked")
-public class EntityProviderComponentPlugin extends BaseComponentPlugin
-{
-
-   /**
-    * Logger.
-    */
-   private static final Log LOG = ExoLogger.getLogger(EntityProviderComponentPlugin.class.getName());
-
-   /**
-    * See {@link EntityProvider}.
-    */
-   private Set<Class<? extends EntityProvider>> eps = new HashSet<Class<? extends EntityProvider>>();
-
-   /**
-    * @param params initialize parameters
-    * @see InitParams
-    */
-   public EntityProviderComponentPlugin(InitParams params)
-   {
-      if (params != null)
-      {
-         Iterator<ValueParam> i = params.getValueParamIterator();
-         while (i.hasNext())
-         {
-            ValueParam v = i.next();
-            try
-            {
-               eps.add((Class<? extends EntityProvider>)Class.forName(v.getValue()));
-            }
-            catch (ClassNotFoundException e)
-            {
-               LOG.error("Failed load class " + v.getValue(), e);
-            }
-         }
-      }
-   }
-
-   /**
-    * @return the entityProviders supplied from configuration
-    */
-   public Set<Class<? extends EntityProvider>> getEntityProviders()
-   {
-      return eps;
-   }
-
-}

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/FileEntityProvider.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/FileEntityProvider.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/FileEntityProvider.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -35,7 +35,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 @Provider
 public class FileEntityProvider implements EntityProvider<File>


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/FileEntityProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/IOHelper.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/IOHelper.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/IOHelper.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -29,7 +29,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class IOHelper
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/IOHelper.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/InputStreamEntityProvider.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/InputStreamEntityProvider.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/InputStreamEntityProvider.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -32,7 +32,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 @Provider
 public class InputStreamEntityProvider implements EntityProvider<InputStream>


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/InputStreamEntityProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id

Deleted: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBContextComponentPlugin.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBContextComponentPlugin.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBContextComponentPlugin.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.exoplatform.services.rest.impl.provider;
-
-import org.exoplatform.container.component.BaseComponentPlugin;
-import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.container.xml.ValueParam;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * For injection JAXBContext from configuration at startup in
- * {@link JAXBContextResolver}.
- * 
- * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
- */
-public class JAXBContextComponentPlugin extends BaseComponentPlugin
-{
-
-   /**
-    * Logger.
-    */
-   private static final Log LOG = ExoLogger.getLogger(JAXBContextComponentPlugin.class.getName());
-
-   /**
-    * Set of classes that will be bounded.
-    */
-   private final Set<Class<?>> jcs = new HashSet<Class<?>>();
-
-   /**
-    * @param params initialize parameters
-    * @see InitParams
-    */
-   @SuppressWarnings("unchecked")
-   public JAXBContextComponentPlugin(InitParams params)
-   {
-      if (params != null)
-      {
-         Iterator<ValueParam> i = params.getValueParamIterator();
-         while (i.hasNext())
-         {
-            ValueParam v = i.next();
-            try
-            {
-               jcs.add(Class.forName(v.getValue()));
-            }
-            catch (ClassNotFoundException e)
-            {
-               LOG.warn("Failed load class " + v.getValue(), e);
-            }
-         }
-      }
-   }
-
-   /**
-    * @return collection of classes to be bound
-    */
-   public Set<Class<?>> getJAXBContexts()
-   {
-      return jcs;
-   }
-
-}

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBContextResolver.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBContextResolver.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBContextResolver.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -18,12 +18,6 @@
  */
 package org.exoplatform.services.rest.impl.provider;
 
-import org.exoplatform.container.component.ComponentPlugin;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.services.rest.impl.header.MediaTypeHelper;
-
-import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.ws.rs.Consumes;
@@ -34,11 +28,13 @@
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 
+import org.exoplatform.services.rest.impl.header.MediaTypeHelper;
+
 /**
  * Provide cache for {@link JAXBContext}.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 @Provider
 @Consumes({MediaType.APPLICATION_XML, MediaType.TEXT_XML, MediaType.APPLICATION_XHTML_XML})
@@ -47,11 +43,6 @@
 {
 
    /**
-    * Logger.
-    */
-   private static final Log LOG = ExoLogger.getLogger(JAXBContextResolver.class.getName());
-
-   /**
     * JAXBContext cache.
     */
    @SuppressWarnings("unchecked")
@@ -111,26 +102,4 @@
       jaxbContexts.put(clazz, jaxbctx);
    }
 
-   /**
-    * @param plugin for injection prepared JAXBContext at startup
-    */
-   public void addPlugin(ComponentPlugin plugin)
-   {
-      if (plugin instanceof JAXBContextComponentPlugin)
-      {
-         for (Iterator<Class<?>> i = ((JAXBContextComponentPlugin)plugin).getJAXBContexts().iterator(); i.hasNext();)
-         {
-            Class<?> c = i.next();
-            try
-            {
-               createJAXBContext(c);
-            }
-            catch (JAXBException e)
-            {
-               LOG.error("Failed add JAXBContext for class " + c.getName(), e);
-            }
-         }
-      }
-   }
-
 }


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBContextResolver.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBElementEntityProvider.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBElementEntityProvider.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBElementEntityProvider.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -46,7 +46,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 @Provider
 @Consumes({MediaType.APPLICATION_XML, MediaType.TEXT_XML, MediaType.APPLICATION_XHTML_XML})
@@ -151,7 +151,7 @@
          providers.getContextResolver(JAXBContextResolver.class, mediaType);
       if (resolver == null)
          throw new RuntimeException("Not found any JAXBContextResolver for media type " + mediaType);
-      JAXBContextResolver jaxbres = resolver.getContext(type);
+      JAXBContextResolver jaxbres = resolver.getContext(null);
       return jaxbres.getJAXBContext(type);
    }
 


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBElementEntityProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBObjectEntityProvider.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBObjectEntityProvider.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBObjectEntityProvider.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -45,7 +45,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 @Provider
 @Consumes({MediaType.APPLICATION_XML, MediaType.TEXT_XML, MediaType.APPLICATION_XHTML_XML})
@@ -147,7 +147,7 @@
          providers.getContextResolver(JAXBContextResolver.class, mediaType);
       if (resolver == null)
          throw new RuntimeException("Not found any JAXBContextResolver for media type " + mediaType);
-      JAXBContextResolver jaxbres = resolver.getContext(type);
+      JAXBContextResolver jaxbres = resolver.getContext(null);
       return jaxbres.getJAXBContext(type);
    }
 


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBObjectEntityProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JsonEntityProvider.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JsonEntityProvider.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JsonEntityProvider.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -44,7 +44,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 @Provider
 @Consumes({MediaType.APPLICATION_JSON})


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/JsonEntityProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/MultipartFormDataEntityProvider.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/MultipartFormDataEntityProvider.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/MultipartFormDataEntityProvider.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -47,7 +47,7 @@
  * Processing multipart data based on apache fileupload.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 @Provider
 @Consumes({"multipart/*"})


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/MultipartFormDataEntityProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/MultivaluedMapEntityProvider.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/MultivaluedMapEntityProvider.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/MultivaluedMapEntityProvider.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -43,7 +43,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 @Provider
 @Consumes({MediaType.APPLICATION_FORM_URLENCODED})


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/MultivaluedMapEntityProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/ProviderDescriptorImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/ProviderDescriptorImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/ProviderDescriptorImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -38,7 +38,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class ProviderDescriptorImpl implements ProviderDescriptor
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/ProviderDescriptorImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/ReaderEntityProvider.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/ReaderEntityProvider.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/ReaderEntityProvider.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -37,7 +37,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 @Provider
 public class ReaderEntityProvider implements EntityProvider<Reader>


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/ReaderEntityProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/SAXSourceEntityProvider.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/SAXSourceEntityProvider.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/SAXSourceEntityProvider.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -41,7 +41,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 @Provider
 @Consumes({MediaType.APPLICATION_XML, MediaType.TEXT_XML, MediaType.APPLICATION_XHTML_XML})


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/SAXSourceEntityProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/StreamOutputEntityProvider.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/StreamOutputEntityProvider.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/StreamOutputEntityProvider.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -33,7 +33,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 @Provider
 public class StreamOutputEntityProvider implements EntityProvider<StreamingOutput>


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/StreamOutputEntityProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/StreamSourceEntityProvider.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/StreamSourceEntityProvider.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/StreamSourceEntityProvider.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -40,7 +40,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 @Provider
 @Consumes({MediaType.APPLICATION_XML, MediaType.TEXT_XML, MediaType.APPLICATION_XHTML_XML})


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/StreamSourceEntityProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/StringEntityProvider.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/StringEntityProvider.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/StringEntityProvider.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -32,7 +32,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 @Provider
 public class StringEntityProvider implements EntityProvider<String>


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/provider/StringEntityProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/AbstractResourceDescriptorImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/AbstractResourceDescriptorImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/AbstractResourceDescriptorImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -69,7 +69,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class AbstractResourceDescriptorImpl implements AbstractResourceDescriptor
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/AbstractResourceDescriptorImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/OptionsRequestResourceMethodDescriptorImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/OptionsRequestResourceMethodDescriptorImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/OptionsRequestResourceMethodDescriptorImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -30,7 +30,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class OptionsRequestResourceMethodDescriptorImpl extends ResourceMethodDescriptorImpl
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/OptionsRequestResourceMethodDescriptorImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/PathValue.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/PathValue.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/PathValue.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -22,7 +22,7 @@
  * Describe the Path annotation, see {@link javax.ws.rs.Path}.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class PathValue
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/PathValue.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceDescriptorValidator.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceDescriptorValidator.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceDescriptorValidator.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -67,7 +67,7 @@
  * <p>
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class ResourceDescriptorValidator implements ResourceDescriptorVisitor
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceDescriptorValidator.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceMethodDescriptorImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceMethodDescriptorImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceMethodDescriptorImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -31,7 +31,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class ResourceMethodDescriptorImpl implements ResourceMethodDescriptor
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceMethodDescriptorImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/SubResourceLocatorDescriptorImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/SubResourceLocatorDescriptorImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/SubResourceLocatorDescriptorImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -30,7 +30,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class SubResourceLocatorDescriptorImpl implements SubResourceLocatorDescriptor
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/SubResourceLocatorDescriptorImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/SubResourceMethodDescriptorImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/SubResourceMethodDescriptorImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/SubResourceMethodDescriptorImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -32,7 +32,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class SubResourceMethodDescriptorImpl implements SubResourceMethodDescriptor
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/resource/SubResourceMethodDescriptorImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/uri/PathSegmentImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/uri/PathSegmentImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/uri/PathSegmentImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -25,7 +25,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class PathSegmentImpl implements PathSegment
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/uri/PathSegmentImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/uri/UriBuilderImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/uri/UriBuilderImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/uri/UriBuilderImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -31,7 +31,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class UriBuilderImpl extends UriBuilder
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/uri/UriBuilderImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/uri/UriComponent.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/uri/UriComponent.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/uri/UriComponent.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -32,7 +32,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class UriComponent
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/uri/UriComponent.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/MethodInvoker.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/MethodInvoker.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/MethodInvoker.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -27,7 +27,7 @@
  * 
  * @see GenericMethodResource
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface MethodInvoker
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/MethodInvoker.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/MethodInvokerFilter.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/MethodInvokerFilter.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/MethodInvokerFilter.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -26,7 +26,7 @@
  * JSR-250.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface MethodInvokerFilter
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/MethodInvokerFilter.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/MethodParameter.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/MethodParameter.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/MethodParameter.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -22,7 +22,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface MethodParameter extends Parameter
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/MethodParameter.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/TypeProducer.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/TypeProducer.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/TypeProducer.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -25,7 +25,7 @@
  * created new instance of TypeProducer.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface TypeProducer
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/method/TypeProducer.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/provider/EntityProvider.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/provider/EntityProvider.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/provider/EntityProvider.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -24,7 +24,7 @@
 /**
  * @param <T> entity type
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface EntityProvider<T> extends MessageBodyReader<T>, MessageBodyWriter<T>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/provider/EntityProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/provider/ProviderDescriptor.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/provider/ProviderDescriptor.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/provider/ProviderDescriptor.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -30,7 +30,7 @@
  * implement interface defined by JAX-RS.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface ProviderDescriptor extends ResourceDescriptor, ObjectModel
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/provider/ProviderDescriptor.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/AbstractResourceDescriptor.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/AbstractResourceDescriptor.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/AbstractResourceDescriptor.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -27,7 +27,7 @@
  * class that uses JAX-RS annotations to implement corresponding Web resource.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface AbstractResourceDescriptor extends ResourceDescriptor, ObjectModel
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/AbstractResourceDescriptor.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/GenericMethodResource.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/GenericMethodResource.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/GenericMethodResource.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -30,7 +30,7 @@
  * {@link SubResourceLocatorDescriptor} .
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface GenericMethodResource
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/GenericMethodResource.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceContainer.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceContainer.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceContainer.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -22,7 +22,7 @@
  * Abstraction of REST resource.
  * 
  * @author Gennady Azarenkov
- * @version $Id: $
+ * @version $Id$
  */
 public interface ResourceContainer
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceContainer.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceDescriptor.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceDescriptor.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceDescriptor.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -22,7 +22,7 @@
  * Common essence for all resource descriptors.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface ResourceDescriptor
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceDescriptor.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceDescriptorVisitor.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceDescriptorVisitor.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceDescriptorVisitor.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -31,7 +31,7 @@
  * {@link ProviderDescriptor}, {@link FilterDescriptor}.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface ResourceDescriptorVisitor
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceDescriptorVisitor.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceMethodDescriptor.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceMethodDescriptor.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceMethodDescriptor.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -28,7 +28,7 @@
  * and has not {@link javax.ws.rs.Path} annotation.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface ResourceMethodDescriptor extends ResourceDescriptor, GenericMethodResource
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceMethodDescriptor.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceMethodMap.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceMethodMap.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceMethodMap.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -32,7 +32,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class ResourceMethodMap<T extends ResourceMethodDescriptor> extends HashMap<String, List<T>> implements
    ExtMultivaluedMap<String, T>


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/ResourceMethodMap.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceLocatorDescriptor.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceLocatorDescriptor.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceLocatorDescriptor.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -31,7 +31,7 @@
  * request or maybe has other resource locators.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface SubResourceLocatorDescriptor extends GenericMethodResource, ResourceDescriptor
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceLocatorDescriptor.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceLocatorMap.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceLocatorMap.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceLocatorMap.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -24,7 +24,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class SubResourceLocatorMap extends TreeMap<UriPattern, SubResourceLocatorDescriptor>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceLocatorMap.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceMethodDescriptor.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceMethodDescriptor.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceMethodDescriptor.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -30,7 +30,7 @@
  * handle request directly.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface SubResourceMethodDescriptor extends ResourceMethodDescriptor
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceMethodDescriptor.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceMethodMap.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceMethodMap.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceMethodMap.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -24,7 +24,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class SubResourceMethodMap extends TreeMap<UriPattern, ResourceMethodMap<SubResourceMethodDescriptor>>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/resource/SubResourceMethodMap.java
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/servlet/RestEncodingFilter.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/servlet/ServletContainerRequest.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/servlet/ServletContainerRequest.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/servlet/ServletContainerRequest.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -34,7 +34,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class ServletContainerRequest extends ContainerRequest
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/servlet/ServletContainerRequest.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/tools/ByteArrayContainerResponseWriter.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/tools/ByteArrayContainerResponseWriter.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/tools/ByteArrayContainerResponseWriter.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -32,7 +32,7 @@
  * 
  * @see ContainerResponseWriter
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class ByteArrayContainerResponseWriter implements ContainerResponseWriter
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/tools/ByteArrayContainerResponseWriter.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/tools/DummyContainerResponseWriter.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/tools/DummyContainerResponseWriter.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/tools/DummyContainerResponseWriter.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -30,7 +30,7 @@
  * entity at all.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class DummyContainerResponseWriter implements ContainerResponseWriter
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/tools/DummyContainerResponseWriter.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/uri/UriPattern.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/uri/UriPattern.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/uri/UriPattern.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -30,7 +30,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class UriPattern
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/uri/UriPattern.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/uri/UriTemplateParser.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/uri/UriTemplateParser.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/uri/UriTemplateParser.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -27,7 +27,7 @@
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class UriTemplateParser
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/uri/UriTemplateParser.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/util/MediaTypeMap.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/util/MediaTypeMap.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/util/MediaTypeMap.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -29,7 +29,7 @@
  * 
  * @param <T> actual value type
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class MediaTypeMap<T> extends java.util.TreeMap<MediaType, T>
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/util/MediaTypeMap.java
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/util/MediaTypeMultivaluedMap.java
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/util/UriPatternMap.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/wadl/BaseWadlGeneratorImpl.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/wadl/BaseWadlGeneratorImpl.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/wadl/BaseWadlGeneratorImpl.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -44,7 +44,7 @@
  * provide doc and grammar extension of WADL.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public class BaseWadlGeneratorImpl implements WadlGenerator
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/wadl/BaseWadlGeneratorImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/wadl/WadlGenerator.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/wadl/WadlGenerator.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/wadl/WadlGenerator.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -33,7 +33,7 @@
  * representation.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public interface WadlGenerator
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/wadl/WadlGenerator.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/wadl/WadlProcessor.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/wadl/WadlProcessor.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/wadl/WadlProcessor.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -46,7 +46,7 @@
  * {@link AbstractResourceDescriptor}.
  * 
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
- * @version $Id: $
+ * @version $Id$
  */
 public final class WadlProcessor
 {


Property changes on: ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/wadl/WadlProcessor.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ws/branches/2.2.x/rest/core/src/test/java/org/exoplatform/services/rest/impl/BaseTest.java
===================================================================
--- ws/branches/2.2.x/rest/core/src/test/java/org/exoplatform/services/rest/impl/BaseTest.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/core/src/test/java/org/exoplatform/services/rest/impl/BaseTest.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -20,7 +20,7 @@
 
 import junit.framework.TestCase;
 
-import org.exoplatform.container.StandaloneContainer;
+//import org.exoplatform.container.StandaloneContainer;
 import org.exoplatform.services.rest.impl.ApplicationContextImpl;
 import org.exoplatform.services.rest.impl.BaseResourceBinder;
 import org.exoplatform.services.rest.impl.ProviderBinder;

Modified: ws/branches/2.2.x/rest/ext/pom.xml
===================================================================
--- ws/branches/2.2.x/rest/ext/pom.xml	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/ext/pom.xml	2009-10-15 16:21:30 UTC (rev 285)
@@ -34,6 +34,10 @@
 
    <dependencies>
       <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.container</artifactId>
+      </dependency>
+      <dependency>
          <groupId>org.exoplatform.ws</groupId>
          <artifactId>exo.ws.commons</artifactId>
       </dependency>
@@ -42,6 +46,15 @@
          <artifactId>exo.ws.rest.core</artifactId>
       </dependency>
       <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.container</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.core</groupId>
+         <artifactId>exo.core.component.xml-processing</artifactId>
+      </dependency>
+
+      <dependency>
          <groupId>javax.annotation</groupId>
          <artifactId>jsr250-api</artifactId>
       </dependency>

Modified: ws/branches/2.2.x/rest/ext/src/main/java/conf/portal/configuration.xml
===================================================================
--- ws/branches/2.2.x/rest/ext/src/main/java/conf/portal/configuration.xml	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/ext/src/main/java/conf/portal/configuration.xml	2009-10-15 16:21:30 UTC (rev 285)
@@ -21,44 +21,43 @@
 -->
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
    xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
-   <external-component-plugins>
-      <target-component>org.exoplatform.services.rest.impl.RequestHandlerImpl</target-component>
-      <component-plugin>
-         <name>ws.rs.method.filter</name>
-         <set-method>addPlugin</set-method>
-         <type>org.exoplatform.services.rest.impl.method.MethodInvokerFilterComponentPlugin</type>
-         <!--init-params>
-            <value-param>
-               <name>method.access.filter</name>
-               <value>org.exoplatform.services.rest.ext.method.filter.MethodAccessFilter</value>
-            </value-param>
-         </init-params-->
-      </component-plugin>
-      <component-plugin>
-         <name>ws.rs.entity.provider</name>
-         <set-method>addPlugin</set-method>
-         <type>org.exoplatform.services.rest.impl.provider.EntityProviderComponentPlugin</type>
-         <init-params>
-            <value-param>
-               <name>ws.rest.ext.HierarchicalPropertyEntityProvider</name>
-               <value>org.exoplatform.services.rest.ext.provider.HierarchicalPropertyEntityProvider</value>
-            </value-param>
-         </init-params>
-      </component-plugin>
-      <component-plugin>
-         <name>ws.rs.request.filter</name>
-         <set-method>addPlugin</set-method>
-         <type>org.exoplatform.services.rest.impl.RequestFilterComponentPlugin</type>
-         <init-params>
-            <!--        <value-param>-->
-            <!--          <name>ws.rs.request.uri-normalization-filter</name>-->
-            <!--          <value>org.exoplatform.services.rest.ext.filter.UriNormalizationFilter</value>-->
-            <!--        </value-param>-->
-            <value-param>
-               <name>ws.rs.request.method-override-filter</name>
-               <value>org.exoplatform.services.rest.ext.filter.MethodOverrideFilter</value>
-            </value-param>
-         </init-params>
-      </component-plugin>
-   </external-component-plugins>
+   <component>
+      <type>org.exoplatform.services.rest.impl.RestInitializer</type>
+      <init-params>
+         <values-param>
+            <name>ws.rs.entity.provider</name>
+            <value>org.exoplatform.services.rest.ext.provider.HierarchicalPropertyEntityProvider</value>
+<!--            Add own entity providers here -->
+         </values-param>
+         <values-param>
+            <name>ws.rs.request.filter</name>
+            <value>org.exoplatform.services.rest.ext.filter.MethodOverrideFilter</value>
+<!--            Add own request filters here -->
+         </values-param>
+         <values-param>
+            <name>ws.rs.response.filter</name>
+<!--            Add own response filters here -->
+         </values-param>
+         <values-param>
+            <name>ws.rs.method.filter</name>
+            <value>org.exoplatform.services.rest.impl.method.MethodInvokerFilterComponentPlugin</value>
+<!--            Add own method filters here -->
+         </values-param>
+         <values-param>
+            <name>ws.rs.jaxb.context</name>
+            <value>org.exoplatform.services.rest.wadl.research.Application</value>
+<!--            Add own jaxb context here -->
+         </values-param>
+      </init-params>
+   </component>
+   <component>
+      <type>org.exoplatform.services.rest.impl.RequestHandlerImpl</type>
+   </component>
+   <component>
+      <type>org.exoplatform.services.rest.impl.ExoContainerResourceBinder</type>
+   </component>
+   <component>
+      <type>org.exoplatform.services.rest.impl.ExoContainerDependencyInjector</type>
+   </component>
+
 </configuration>
\ No newline at end of file

Copied: ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/ext/method/MethodInvokerFilterComponentPlugin.java (from rev 277, ws/branches/2.2.x/rest/core/src/main/java/org/exoplatform/services/rest/impl/method/MethodInvokerFilterComponentPlugin.java)
===================================================================
--- ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/ext/method/MethodInvokerFilterComponentPlugin.java	                        (rev 0)
+++ ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/ext/method/MethodInvokerFilterComponentPlugin.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.services.rest.ext.method;
+
+import org.exoplatform.container.component.BaseComponentPlugin;
+import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.container.xml.ValueParam;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+import org.exoplatform.services.rest.RequestHandler;
+import org.exoplatform.services.rest.method.MethodInvokerFilter;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+/**
+ * For injection {@link MethodInvokerFilter} in {@link RequestHandler} at
+ * startup.
+ * 
+ * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
+ * @version $Id: $
+ */
+public class MethodInvokerFilterComponentPlugin extends BaseComponentPlugin
+{
+
+   /**
+    * Logger.
+    */
+   private static final Log LOG = ExoLogger.getLogger(MethodInvokerFilterComponentPlugin.class.getName());
+
+   /**
+    * List of {@link MethodInvokerFilter}.
+    */
+   private Set<Class<? extends MethodInvokerFilter>> mifs = new HashSet<Class<? extends MethodInvokerFilter>>();
+
+   /**
+    * @param params initialize parameters from configuration
+    * @see InitParams
+    */
+   @SuppressWarnings("unchecked")
+   public MethodInvokerFilterComponentPlugin(InitParams params)
+   {
+      if (params != null)
+      {
+         Iterator<ValueParam> i = params.getValueParamIterator();
+         while (i.hasNext())
+         {
+            ValueParam v = i.next();
+            try
+            {
+               mifs.add((Class<? extends MethodInvokerFilter>)Class.forName(v.getValue()));
+            }
+            catch (ClassNotFoundException e)
+            {
+               LOG.error("Failed load class " + v.getValue(), e);
+            }
+         }
+      }
+   }
+
+   /**
+    * @return get collection of classes MethodInvokerFilter supplied from
+    *         configuration
+    */
+   public Set<Class<? extends MethodInvokerFilter>> getFilters()
+   {
+      return mifs;
+   }
+
+}

Added: ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/impl/ExoContainerDependencyInjector.java
===================================================================
--- ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/impl/ExoContainerDependencyInjector.java	                        (rev 0)
+++ ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/impl/ExoContainerDependencyInjector.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.services.rest.impl;
+
+import java.lang.reflect.Type;
+
+import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.ExoContainerContext;
+import org.exoplatform.services.rest.DependencyInjector;
+
+/**
+ * @author <a href="mailto:andrey.parfonov at exoplatform.com">Andrey Parfonov</a>
+ * @version $Id$
+ */
+public class ExoContainerDependencyInjector implements DependencyInjector
+{
+
+   /**
+    * {@inheritDoc}
+    */
+   public Object getInjectableParameter(Class<?> type, Type genericType)
+   {
+      ExoContainer container = ExoContainerContext.getCurrentContainer();
+      return container.getComponentInstanceOfType(type);
+   }
+
+}


Property changes on: ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/impl/ExoContainerDependencyInjector.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Modified: ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/impl/ExoContainerResourceBinder.java
===================================================================
--- ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/impl/ExoContainerResourceBinder.java	2009-10-15 14:56:47 UTC (rev 284)
+++ ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/impl/ExoContainerResourceBinder.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -27,9 +27,7 @@
 import org.exoplatform.container.ExoContainerContext;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.services.rest.impl.resource.ResourceDescriptorValidator;
 import org.exoplatform.services.rest.resource.ResourceContainer;
-import org.exoplatform.services.rest.resource.ResourceDescriptorVisitor;
 
 /**
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
@@ -44,39 +42,18 @@
    private static final Log LOG = ExoLogger.getLogger(ExoContainerResourceBinder.class.getName());
 
    /**
-    * Validator.
-    */
-   private final ResourceDescriptorVisitor rdv = ResourceDescriptorValidator.getInstance();
-
-   /**
-    * @see RuntimeDelegate
-    */
-   private final RuntimeDelegate rd;
-
-   public ExoContainerResourceBinder()
-   {
-      rd = new RuntimeDelegateImpl();
-      RuntimeDelegate.setInstance(rd);
-   }
-   
-   /**
     * @param containerContext eXo container context
     * @throws Exception if can't set instance of {@link RuntimeDelegate}
     */
    @SuppressWarnings("unchecked")
    public ExoContainerResourceBinder(ExoContainerContext containerContext) throws Exception
    {
-      // Initialize RuntimeDelegate instance
-      // This is first component in life cycle what needs.
-      // TODO better solution to initialize RuntimeDelegate
-      rd = new RuntimeDelegateImpl();
-      RuntimeDelegate.setInstance(rd);
-
+      super();
       ExoContainer container = containerContext.getContainer();
 
       // Lookup Applications
-      List<Application> al = container.getComponentInstancesOfType(Application.class);
-      for (Application a : al)
+      List<Application> applications = container.getComponentInstancesOfType(Application.class);
+      for (Application a : applications)
       {
          try
          {

Added: ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/impl/RestInitializer.java
===================================================================
--- ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/impl/RestInitializer.java	                        (rev 0)
+++ ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/impl/RestInitializer.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.services.rest.impl;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.ContextResolver;
+import javax.xml.bind.JAXBException;
+
+import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+import org.exoplatform.services.rest.RequestFilter;
+import org.exoplatform.services.rest.RequestHandler;
+import org.exoplatform.services.rest.ResponseFilter;
+import org.exoplatform.services.rest.impl.provider.JAXBContextResolver;
+import org.exoplatform.services.rest.method.MethodInvokerFilter;
+import org.exoplatform.services.rest.provider.EntityProvider;
+import org.picocontainer.Startable;
+
+/**
+ * @author <a href="mailto:andrey.parfonov at exoplatform.com">Andrey Parfonov</a>
+ * @version $Id$
+ */
+public class RestInitializer implements Startable
+{
+
+   /**
+    * Logger.
+    */
+   private static final Log LOG = ExoLogger.getLogger(RestInitializer.class.getName());
+
+   @SuppressWarnings("unchecked")
+   public RestInitializer(RequestHandler requestHandler, InitParams initParams)
+   {
+
+      ProviderBinder providers = ProviderBinder.getInstance();
+
+      if (initParams != null)
+      {
+         for (Object cl : initParams.getValuesParam("ws.rs.request.filter").getValues())
+         {
+            try
+            {
+               providers.addRequestFilter((Class<? extends RequestFilter>)Class.forName((String)cl));
+            }
+            catch (ClassNotFoundException e)
+            {
+               LOG.error("Failed load class " + cl, e);
+            }
+         }
+      }
+      for (Object cl : initParams.getValuesParam("ws.rs.response.filter").getValues())
+      {
+         try
+         {
+            providers.addResponseFilter((Class<? extends ResponseFilter>)Class.forName((String)cl));
+         }
+         catch (ClassNotFoundException e)
+         {
+            LOG.error("Failed load class " + cl, e);
+         }
+      }
+      for (Object cl : initParams.getValuesParam("ws.rs.method.filter").getValues())
+      {
+         try
+         {
+            providers.addMethodInvokerFilter((Class<? extends MethodInvokerFilter>)Class.forName((String)cl));
+         }
+         catch (ClassNotFoundException e)
+         {
+            LOG.error("Failed load class " + cl, e);
+         }
+      }
+      for (Object cl : initParams.getValuesParam("ws.rs.entity.provider").getValues())
+      {
+         try
+         {
+            Class<? extends EntityProvider> prov = (Class<? extends EntityProvider>)Class.forName((String)cl);
+            providers.addMessageBodyReader(prov);
+            providers.addMessageBodyWriter(prov);
+         }
+         catch (ClassNotFoundException e)
+         {
+            LOG.error("Failed load class " + cl, e);
+         }
+      }
+      for (Object cl : initParams.getValuesParam("ws.rs.jaxb.context").getValues())
+      {
+         try
+         {
+            ContextResolver<JAXBContextResolver> resolver =
+               providers.getContextResolver(JAXBContextResolver.class, MediaType.WILDCARD_TYPE);
+            if (resolver == null)
+            {
+               LOG.error("Not found JAXBContextResolver.");
+            }
+            else
+            {
+               JAXBContextResolver contextResolver = resolver.getContext(null);
+               contextResolver.createJAXBContext((Class<?>)Class.forName((String)cl));
+            }
+         }
+         catch (ClassNotFoundException e)
+         {
+            LOG.error("Failed load class " + cl, e);
+         }
+         catch (JAXBException jaxbe)
+         {
+            LOG.error("Failed add JAXBContext for class " + cl, jaxbe);
+         }
+      }
+      
+   }
+
+   public void start()
+   {
+   }
+
+   public void stop()
+   {
+   }
+}


Property changes on: ws/branches/2.2.x/rest/ext/src/main/java/org/exoplatform/services/rest/impl/RestInitializer.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Added: ws/branches/2.2.x/rest/ext/src/test/java/conf/standalone/test-configuration.xml
===================================================================
--- ws/branches/2.2.x/rest/ext/src/test/java/conf/standalone/test-configuration.xml	                        (rev 0)
+++ ws/branches/2.2.x/rest/ext/src/test/java/conf/standalone/test-configuration.xml	2009-10-15 16:21:30 UTC (rev 285)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+	<!--
+
+		Copyright (C) 2009 eXo Platform SAS. This is free software; you can
+		redistribute it and/or modify it under the terms of the GNU Lesser
+		General Public License as published by the Free Software Foundation;
+		either version 2.1 of the License, or (at your option) any later
+		version. This software is distributed in the hope that it will be
+		useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+		Lesser General Public License for more details. You should have
+		received a copy of the GNU Lesser General Public License along with
+		this software; if not, write to the Free Software Foundation, Inc., 51
+		Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+		site: http://www.fsf.org.
+	-->
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+	xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+	<component>
+		<type>org.exoplatform.services.rest.impl.RestInitializer</type>
+		<init-params>
+			<values-param>
+				<name>ws.rs.entity.provider</name>
+				<value>org.exoplatform.services.rest.ext.provider.HierarchicalPropertyEntityProvider</value>
+<!--				 Add own entity providers here -->
+			</values-param>
+			<values-param>
+				<name>ws.rs.request.filter</name>
+				<value>org.exoplatform.services.rest.ext.filter.MethodOverrideFilter</value>
+<!--				 Add own request filters here -->
+			</values-param>
+			<values-param>
+				<name>ws.rs.response.filter</name>
+<!--				 Add own response filters here -->
+			</values-param>
+			<values-param>
+				<name>ws.rs.method.filter</name>
+				<value>org.exoplatform.services.rest.impl.method.MethodInvokerFilterComponentPlugin</value>
+<!--            Add own method filters here -->
+			</values-param>
+			<values-param>
+			   <name>ws.rs.jaxb.context</name>
+			   <value>org.exoplatform.services.rest.wadl.research.Application</value>
+<!--            Add own jaxb context here -->
+			</values-param>
+		</init-params>
+	</component>
+	<component>
+		<type>org.exoplatform.services.rest.impl.RequestHandlerImpl</type>
+	</component>
+	<component>
+		<type>org.exoplatform.services.rest.impl.ExoContainerResourceBinder</type>
+	</component>
+	<component>
+		<type>org.exoplatform.services.rest.impl.ExoContainerDependencyInjector</type>
+	</component>
+
+</configuration>
\ No newline at end of file


Property changes on: ws/branches/2.2.x/rest/ext/src/test/java/conf/standalone/test-configuration.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: ws/branches/2.2.x/rest/ext/src/test/java/org/exoplatform/services/rest/BaseTest.java
===================================================================
--- ws/branches/2.2.x/rest/ext/src/test/java/org/exoplatform/services/rest/BaseTest.java	                        (rev 0)
+++ ws/branches/2.2.x/rest/ext/src/test/java/org/exoplatform/services/rest/BaseTest.java	2009-10-15 16:21:30 UTC (rev 285)
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.services.rest;
+
+import org.exoplatform.container.StandaloneContainer;
+
+import junit.framework.TestCase;
+
+/**
+ * @author <a href="mailto:andrey.parfonov at exoplatform.com">Andrey Parfonov</a>
+ * @version $Id$
+ */
+public abstract class BaseTest extends TestCase
+{
+
+   protected StandaloneContainer container;
+
+   public void setUp() throws Exception
+   {
+      StandaloneContainer.setConfigurationPath("src/test/java/conf/standalone/test-configuration.xml");
+      container = StandaloneContainer.getInstance();
+   }
+   
+}


Property changes on: ws/branches/2.2.x/rest/ext/src/test/java/org/exoplatform/services/rest/BaseTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native



More information about the exo-jcr-commits mailing list