[jbossws-commits] JBossWS SVN: r12119 - in common/branches/jms-integration/src/main: java/org/jboss/wsf/common/integration and 2 other directories.

[jbossws-commits at lists.jboss.org]

Author: jim.ma
Date: 2010-04-26 23:15:38 -0400 (Mon, 26 Apr 2010)
New Revision: 12119

Added:
   common/branches/jms-integration/src/main/resources/
   common/branches/jms-integration/src/main/resources/schema/
   common/branches/jms-integration/src/main/resources/schema/jbossws.xsd
   common/branches/jms-integration/src/main/resources/schema/jms.xsd
Modified:
   common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java
   common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/WSHelper.java
Log:
[JBWS-2791]:Added AbstractDeploymentAspect and schema files to validate the jbossws-endpoints.xml

Modified: common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java
===================================================================
--- common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java	2010-04-27 03:06:58 UTC (rev 12118)
+++ common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java	2010-04-27 03:15:38 UTC (rev 12119)
@@ -48,7 +48,6 @@
    private boolean isLast;
    private boolean isForJaxWs = true;
    private boolean isForJaxRpc = true;
-   private boolean processEndpointDeployment = false;
    private WeakReference<ClassLoader> loader;
 
    public AbstractDeploymentAspect()
@@ -136,20 +135,9 @@
    public boolean canHandle(Deployment dep)
    {
       return (this.isForJaxWs && WSHelper.isJaxwsDeployment(dep) ||
-            this.isForJaxRpc && WSHelper.isJaxrpcDeployment(dep) 
-            || this.isForJaxWs && processEndpointDeployment);
+            this.isForJaxRpc && WSHelper.isJaxrpcDeployment(dep));
    }
-
-   public boolean isProcessEndpointDeployment()
-   {
-      return processEndpointDeployment;
-   }
-
-   public void setProcessEndpointDeployment(boolean processEndpointDeployment)
-   {
-      this.processEndpointDeployment = processEndpointDeployment;
-   }
-
+   
    public boolean isForJaxWs()
    {
       return isForJaxWs;

Modified: common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/WSHelper.java
===================================================================
--- common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/WSHelper.java	2010-04-27 03:06:58 UTC (rev 12118)
+++ common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/WSHelper.java	2010-04-27 03:15:38 UTC (rev 12119)
@@ -193,7 +193,7 @@
    
    public static boolean hasEndpointsDeployment(final Deployment dep) 
    {
-      return WSHelper.getRequiredAttachment(dep, EndpointsMetaData.class) != null ? true : false;   
+      return WSHelper.getOptionalAttachment(dep, EndpointsMetaData.class) != null ? true : false;   
    }
 
 }

Added: common/branches/jms-integration/src/main/resources/schema/jbossws.xsd
===================================================================
--- common/branches/jms-integration/src/main/resources/schema/jbossws.xsd	                        (rev 0)
+++ common/branches/jms-integration/src/main/resources/schema/jbossws.xsd	2010-04-27 03:15:38 UTC (rev 12119)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" targetNamespace="http://jbossws.jboss.org/jbossws"
+	xmlns:jbossws="http://jbossws.jboss.org/jbossws" xmlns:jms="http://jbossws.jboss.org/jbossws/transport/jms">
+
+
+	<xs:element name="endpoints">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="endpoint" type="jbossws:endpoint" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:complexType name="endpoint">
+		<xs:sequence>
+			<xs:element ref="jbossws:abstractAddress" maxOccurs="unbounded" />
+		</xs:sequence>
+		<xs:attribute name="implementor" use="required" type="xs:string" />
+		<xs:attribute name="name" use="optional" type="xs:string" />
+		<xs:attribute name="portName" use="optional" type="xs:string" />
+		<xs:attribute name="serviceName" use="optional" type="xs:string" />
+		<xs:attribute name="wsdlLocation" use="optional" type="xs:string" />
+	</xs:complexType>
+
+	<xs:element name="abstractAddress" type="jbossws:abstractAddressType"
+		abstract="true">
+	</xs:element>
+	<xs:complexType name="abstractAddressType" abstract="true"/>
+</xs:schema>
\ No newline at end of file

Added: common/branches/jms-integration/src/main/resources/schema/jms.xsd
===================================================================
--- common/branches/jms-integration/src/main/resources/schema/jms.xsd	                        (rev 0)
+++ common/branches/jms-integration/src/main/resources/schema/jms.xsd	2010-04-27 03:15:38 UTC (rev 12119)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" targetNamespace="http://jbossws.jboss.org/jbossws/transport/jms"
+	xmlns:jbossws="http://jbossws.jboss.org/jbossws" xmlns:jms="http://jbossws.jboss.org/jbossws/transport/jms">
+	<xs:import namespace="http://jbossws.jboss.org/jbossws"
+		schemaLocation="jbossws.xsd" />
+	<xs:complexType name="Destination">
+		<xs:sequence>
+			<xs:element name="property" maxOccurs="unbounded" type="jms:Property" />
+		</xs:sequence>
+	</xs:complexType>
+
+
+	<xs:complexType name="Property">
+		<xs:attribute name="name" use="required" type="xs:string" />
+		<xs:attribute name="value" use="required" type="xs:string" />
+	</xs:complexType>
+
+	<xs:element name="Address" substitutionGroup="jbossws:abstractAddress"
+		type="jms:AddressType" />
+		
+	<xs:complexType name="AddressType">
+		<xs:complexContent>
+			<xs:extension base="jbossws:abstractAddressType">
+				<xs:sequence>
+					<xs:element name="requestDestination" type="jms:Destination" />
+					<xs:element name="replyDestination" type="jms:Destination" minOccurs="0"/>
+				</xs:sequence>
+				<xs:attribute name="portName" use="required" type="xs:string" />				
+			</xs:extension>
+		</xs:complexContent>
+		
+	</xs:complexType>
+</xs:schema>
\ No newline at end of file