[jboss-cvs] JBossAS SVN: r61070 - in branches/Branch_4_2/server/src: resources/dtd and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2007-03-03 06:16:35 -0500 (Sat, 03 Mar 2007)
New Revision: 61070

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

Modified: branches/Branch_4_2/server/src/main/org/jboss/metadata/EjbPortComponentMetaData.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/metadata/EjbPortComponentMetaData.java	2007-03-03 10:12:58 UTC (rev 61069)
+++ branches/Branch_4_2/server/src/main/org/jboss/metadata/EjbPortComponentMetaData.java	2007-03-03 11:16:35 UTC (rev 61070)
@@ -31,6 +31,7 @@
 /** The metdata data for session/port-component element from jboss.xml
  *
  * @author Scott.Stark at jboss.org
+ * @author Thomas.Diesler at jboss.com
  * @version $Revision$
  */
 public class EjbPortComponentMetaData
@@ -41,7 +42,8 @@
    private String portComponentURI;
    private String authMethod;
    private String transportGuarantee;
-   
+   private Boolean secureWSDLAccess;
+
    public EjbPortComponentMetaData(SessionMetaData sessionMetaData)
    {
       this.sessionMetaData = sessionMetaData;
@@ -76,9 +78,13 @@
    {
       return transportGuarantee;
    }
+   
+   public Boolean getSecureWSDLAccess()
+   {
+      return secureWSDLAccess;
+   }
 
-   public void importStandardXml(Element element)
-      throws DeploymentException
+   public void importStandardXml(Element element) throws DeploymentException
    {
    }
 
@@ -93,7 +99,7 @@
 
       // port-component/port-component-name
       portComponentName = MetaData.getUniqueChildContent(element, "port-component-name");
-      
+
       // port-component/port-component-uri?
       portComponentURI = MetaData.getOptionalChildContent(element, "port-component-uri");
       if (portComponentURI != null)
@@ -107,12 +113,12 @@
             StringTokenizer st = new StringTokenizer(portComponentURI, "/");
             if (st.countTokens() < 2)
                throw new DeploymentException("Expected at least two tokens <port-component-uri>");
-   
+
             contextRoot = "/" + st.nextToken();
             String prevContextRoot = contextRoot;
             if (prevContextRoot != null && prevContextRoot.equals(contextRoot) == false)
                throw new DeploymentException("Invalid <port-component-uri>, expected to start with: " + prevContextRoot);
-   
+
             appMetaData.setWebServiceContextRoot(contextRoot);
             portComponentURI = portComponentURI.substring(portComponentURI.indexOf('/', 1));
          }
@@ -126,14 +132,13 @@
          portComponentURI = "/" + sessionMetaData.getEjbName();
          // The context root will be derived from deployment short name
       }
-      
+
       // port-component/auth-method?,
       authMethod = MetaData.getOptionalChildContent(element, "auth-method");
       // port-component/transport-guarantee?
       transportGuarantee = MetaData.getOptionalChildContent(element, "transport-guarantee");
-
-      // Deprecated in jboss-4.0.1
-      if (MetaData.getOptionalChildContent(element, "port-uri") != null)
-         throw new DeploymentException("Deprecated element <port-uri>, use <port-component-uri> instead");
+      // port-component/secure-wsdl-access?
+      if (MetaData.getOptionalChildContent(element, "secure-wsdl-access") != null)
+         secureWSDLAccess = Boolean.valueOf(MetaData.getOptionalChildContent(element, "secure-wsdl-access"));
    }
 }

Modified: branches/Branch_4_2/server/src/resources/dtd/jboss_4_2.dtd
===================================================================
--- branches/Branch_4_2/server/src/resources/dtd/jboss_4_2.dtd	2007-03-03 10:12:58 UTC (rev 61069)
+++ branches/Branch_4_2/server/src/resources/dtd/jboss_4_2.dtd	2007-03-03 11:16:35 UTC (rev 61070)
@@ -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