[jboss-cvs] JBossAS SVN: r61069 - in trunk/server/src: main/org/jboss/metadata and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-03-03 05:12:58 -0500 (Sat, 03 Mar 2007)
New Revision: 61069

Modified:
   trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
   trunk/server/src/main/org/jboss/metadata/EjbPortComponentMetaData.java
   trunk/server/src/resources/dtd/jboss_4_2.dtd
   trunk/server/src/resources/dtd/jboss_5_0.dtd
Log:
Add support for <secure-wsdl-access>

Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java	2007-03-03 05:15:03 UTC (rev 61068)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java	2007-03-03 10:12:58 UTC (rev 61069)
@@ -1041,6 +1041,8 @@
          pcMetaData.setAuthMethod(value);
       else if (localName.equals("transport-guarantee"))
          pcMetaData.setTransportGuarantee(value);
+      else if (localName.equals("secure-wsdl-access"))
+         pcMetaData.setSecureWSDLAccess(Boolean.valueOf(value));
    }
       
    public void setValue(ActivationConfigPropertyMetaData parent,

Modified: trunk/server/src/main/org/jboss/metadata/EjbPortComponentMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/EjbPortComponentMetaData.java	2007-03-03 05:15:03 UTC (rev 61068)
+++ trunk/server/src/main/org/jboss/metadata/EjbPortComponentMetaData.java	2007-03-03 10:12:58 UTC (rev 61069)
@@ -43,6 +43,7 @@
    private String portComponentURI;
    private String authMethod;
    private String transportGuarantee;
+   private Boolean secureWSDLAccess;
 
    public EjbPortComponentMetaData(SessionMetaData sessionMetaData)
    {
@@ -59,11 +60,21 @@
       return portComponentName;
    }
 
+   public void setPortComponentName(String portComponentName)
+   {
+      this.portComponentName = portComponentName;
+   }
+
    public String getPortComponentURI()
    {
       return portComponentURI;
    }
 
+   public void setPortComponentURI(String portComponentURI)
+   {
+      this.portComponentURI = portComponentURI;
+   }
+
    public String getURLPattern()
    {
       String pattern = "/*";
@@ -78,28 +89,28 @@
       return authMethod;
    }
 
-   public String getTransportGuarantee()
+   public void setAuthMethod(String authMethod)
    {
-      return transportGuarantee;
+      this.authMethod = authMethod;
    }
 
-   public void setPortComponentName(String portComponentName)
+   public String getTransportGuarantee()
    {
-      this.portComponentName = portComponentName;
+      return transportGuarantee;
    }
 
-   public void setPortComponentURI(String portComponentURI)
+   public void setTransportGuarantee(String transportGuarantee)
    {
-      this.portComponentURI = portComponentURI;
+      this.transportGuarantee = transportGuarantee;
    }
 
-   public void setAuthMethod(String authMethod)
+   public Boolean getSecureWSDLAccess()
    {
-      this.authMethod = authMethod;
+      return secureWSDLAccess;
    }
 
-   public void setTransportGuarantee(String transportGuarantee)
+   public void setSecureWSDLAccess(Boolean secureWSDLAccess)
    {
-      this.transportGuarantee = transportGuarantee;
+      this.secureWSDLAccess = secureWSDLAccess;
    }
-}
+   }

Modified: trunk/server/src/resources/dtd/jboss_4_2.dtd
===================================================================
--- trunk/server/src/resources/dtd/jboss_4_2.dtd	2007-03-03 05:15:03 UTC (rev 61068)
+++ trunk/server/src/resources/dtd/jboss_4_2.dtd	2007-03-03 10:12:58 UTC (rev 61069)
@@ -76,6 +76,7 @@
         <port-component-uri>
         <auth-method>
         <transport-guarantee>
+        <secure-wsdl-access>
       </port-component>
     </session>
 
@@ -1624,7 +1625,7 @@
 Used in: session
 -->
 <!ELEMENT port-component (port-component-name, port-component-uri?, auth-method?,
- transport-guarantee?) >
+ transport-guarantee?, secure-wsdl-access?) >
 
 <!-- Maps to the port-component-name in the webservices.xml descriptor.
 
@@ -1661,6 +1662,14 @@
 <!ELEMENT transport-guarantee (#PCDATA)>
 
 <!--
+A secure endpoint does not by default publish it's wsdl on an unsecure transport.
+You can override this behaviour by explicitly setting the secureWSDLAccess flag to false.
+
+Used in: port-component
+-->
+<!ELEMENT secure-wsdl-access (#PCDATA)>
+
+<!--
 Activation config
 
 used in message-driven and proxy-factory-config

Modified: trunk/server/src/resources/dtd/jboss_5_0.dtd
===================================================================
--- trunk/server/src/resources/dtd/jboss_5_0.dtd	2007-03-03 05:15:03 UTC (rev 61068)
+++ trunk/server/src/resources/dtd/jboss_5_0.dtd	2007-03-03 10:12:58 UTC (rev 61069)
@@ -64,12 +64,6 @@
       <resource-env-ref>
       <clustered />
       <cluster-config>
-      <port-component>
-        <port-component-name>
-        <port-component-uri>
-        <auth-method>
-        <transport-guarantee>
-      </port-component>
     </session>
 
     <message-driven>
@@ -458,7 +452,7 @@
  security-proxy? , ejb-ref* ,  ejb-local-ref* , webservice-ref*, security-identity? ,
  resource-ref* , resource-env-ref*, message-destination-ref* , clustered? ,
  cluster-config?, method-attributes?, depends*,
- ior-security-config?, port-component*,  ejb-timeout-identity?)>
+ ior-security-config?, ejb-timeout-identity?)>
 <!-- Allow the session to have a unique id -->
 <!ATTLIST session id ID #IMPLIED>
 
@@ -1532,14 +1526,7 @@
 auth-method element describes the authentication method. The only supported value
 for as-context is USERNAME_PASSWORD
 
-For port-component, the auth-method element is used to configure the
-authentication mechanism for the web service. As a prerequisite to gaining
-access to any web service which are protected by an authorization
-constraint, a user must have authenticated using the configured
-mechanism. Legal values for this element are "BASIC", or "CLIENT-CERT".
-
-Used in: as-context, port-component
-
+Used in: as-context
 -->  
 <!ELEMENT auth-method ( #PCDATA )>