You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/08/01 18:42:23 UTC
svn commit: r1368110 -
/cxf/branches/2.6.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
Author: dkulp
Date: Wed Aug 1 16:42:22 2012
New Revision: 1368110
URL: http://svn.apache.org/viewvc?rev=1368110&view=rev
Log:
Merged revisions 1367836 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1367836 | bimargulies | 2012-07-31 21:18:21 -0400 (Tue, 31 Jul 2012) | 2 lines
Javadoc fixes to a CORS class.
........
Modified:
cxf/branches/2.6.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
Modified: cxf/branches/2.6.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java?rev=1368110&r1=1368109&r2=1368110&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java (original)
+++ cxf/branches/2.6.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java Wed Aug 1 16:42:22 2012
@@ -48,11 +48,11 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.service.Service;
/**
- * An single class that provides both an input and an output filter for CORS, following
- * http://www.w3.org/TR/cors/. The input examines the input headers. If the request is valid, it stores the
+ * A single class that provides both an input and an output filter for CORS, following
+ * http://www.w3.org/TR/cors/. The input filter examines the input headers. If the request is valid, it stores the
* information in the Exchange to allow the response handler to add the appropriate headers to the response.
* If you need complex or subtle control of the behavior here (e.g. clearing the prefight cache) you might be
- * better off reading the source of this and implementing this inside your service.
+ * better off reading the source of this class and implementing this inside your service.
*
* This class will perform preflight processing even if there is a resource method annotated
* to handle @OPTIONS,
@@ -496,7 +496,7 @@ public class CrossOriginResourceSharingF
}
/**
- * The origin strings to allow. Call {@link #setAllowAllOrigins(boolean)} to enable '*'.
+ * The origin strings to allow. An empty list allows all origins.
*
* @param allowedOrigins a list of case-sensitive origin strings.
*/
@@ -504,6 +504,7 @@ public class CrossOriginResourceSharingF
this.allowOrigins = allowedOrigins;
}
+ /** @return the list of allowed origins. */
public List<String> getAllowOrigins() {
return allowOrigins;
}