cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1240014 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Date Fri, 03 Feb 2012 07:11:08 GMT
Author: ffang
Date: Fri Feb  3 07:11:07 2012
New Revision: 1240014

URL: http://svn.apache.org/viewvc?rev=1240014&view=rev
Log:
Merged revisions 1240011 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1240011 | ffang | 2012-02-03 14:59:17 +0800 (五, 03  2 2012) | 16 lines
  
  Merged revisions 1240008 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1240008 | ffang | 2012-02-03 14:50:34 +0800 (五, 03  2 2012) | 9 lines
    
    Merged revisions 1240006 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1240006 | ffang | 2012-02-03 14:37:47 +0800 (五, 03  2 2012) | 1 line
      
      [CXF-4085]introduce org.apache.cxf.jaxws.checkPublishEndpointPermissionWithSecurityManager
for EndpointImpl so that get chance to bypass SecurityManager Check in some cases
    ........
  ................
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=1240014&r1=1240013&r2=1240014&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Fri Feb  3 07:11:07 2012
@@ -77,6 +77,9 @@ public class EndpointImpl extends javax.
     public static final String CHECK_PUBLISH_ENDPOINT_PERMISSON_PROPERTY =
         "org.apache.cxf.jaxws.checkPublishEndpointPermission";
 
+    public static final String CHECK_PUBLISH_ENDPOINT_PERMISSON_PROPERTY_WITH_SECURITY_MANAGER
=
+        "org.apache.cxf.jaxws.checkPublishEndpointPermissionWithSecurityManager";
+    
     private static final WebServicePermission PUBLISH_PERMISSION =
         new WebServicePermission("publishEndpoint");
     private static final Logger LOG = LogUtils.getL7dLogger(EndpointImpl.class);
@@ -465,7 +468,12 @@ public class EndpointImpl extends javax.
     
     protected void checkPublishPermission() {
         SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
+        boolean checkPublishEndpointPermissionWithSecurityManager
+            = Boolean.valueOf(
+                      System.getProperty(
+                                         CHECK_PUBLISH_ENDPOINT_PERMISSON_PROPERTY_WITH_SECURITY_MANAGER,

+                                         "true"));
+        if (checkPublishEndpointPermissionWithSecurityManager && sm != null) {
             sm.checkPermission(PUBLISH_PERMISSION);
         } else if (Boolean.getBoolean(CHECK_PUBLISH_ENDPOINT_PERMISSON_PROPERTY)) {
             AccessController.checkPermission(PUBLISH_PERMISSION);



Mime
View raw message