Author: sergeyb
Date: Fri Jan 20 11:35:20 2012
New Revision: 1233876
URL: http://svn.apache.org/viewvc?rev=1233876&view=rev
Log:
Merged revisions 1233875 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1233875 | sergeyb | 2012-01-20 11:31:19 +0000 (Fri, 20 Jan 2012) | 1 line
Minor updates to the cors package.html
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/package.html
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 20 11:35:20 2012
@@ -1 +1 @@
-/cxf/trunk:1233075,1233112,1233289-1233294,1233308,1233355,1233401,1233478
+/cxf/trunk:1233075,1233112,1233289-1233294,1233308,1233355,1233401,1233478,1233875
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/package.html
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/package.html?rev=1233876&r1=1233875&r2=1233876&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/package.html
(original)
+++
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/package.html
Fri Jan 20 11:35:20 2012
@@ -44,10 +44,8 @@ is defined by the combination of URI and
it may cache it. JAX-RS, on the other hand, defines a resource as:
<ul>
<li>URI</li>
-<li>method</li>
-<li>Accepts</li>
-<li>Accepts-Language</li>
-<li>Content-Type</li>
+<li>HTTP Method</li>
+<li>Content-Type and Accept HTTP headers</li>
</ul>
The logical place, in other words, to specify CORS policy in a JAX-RS
application is at the level of an annotated method. However, each method is
applied to the narrow 'resource' defined by the list above, not just the
URI+Method pair. This will motivate the annotation model below.
@@ -68,12 +66,6 @@ resource access models above makes it im
If all the methods of a class can share a common policy, you can attach a
single @{@link CrossOriginResourceSharing}
to a resource class, and it will apply to all the resource implied by all of
the methods.
</p>
-<p>
-If you need finer control, you can use @{@link
CrossOriginResourceSharingPaths} at the class level. This annotation contains a
list of
-@{@link CrossOriginResourceSharing} annotations. In the nested annotations,
you add <tt>path = "/localResourcePath"</tt> to associate the
-annotation with a path. The filter will find the annotation based on path, and
then allow (or forbid) based on the method
-as compared to the <tt>allowedMethods</tt>.
-</p>
<h2>Bean Configuration</h2>
<p>
The simplest configuration applies when you want to apply the same
configuration to all of your resources. In this case, you can
