[Andromda-cvs] CVS update: andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/src/main/config/mappings WebMergeMappings.xml.vsl

[Chad B. <cwb...@us...>]

  User: cwbrandon
  Date: 07/04/23 07:20:46

  Modified:    projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/src/main/config/mappings
                        Tag: V3_x_HEAD WebMergeMappings.xml.vsl
  Log:
  add merge points for axis2 and xfire
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.5   +64 -5     andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/src/main/config/mappings/Attic/WebMergeMappings.xml.vsl
  
  Index: WebMergeMappings.xml.vsl
  ===================================================================
  RCS file: /cvsroot/andromda/andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/src/main/config/mappings/Attic/WebMergeMappings.xml.vsl,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -w -r1.1.2.4 -r1.1.2.5
  --- WebMergeMappings.xml.vsl	19 Oct 2006 16:11:56 -0000	1.1.2.4
  +++ WebMergeMappings.xml.vsl	23 Apr 2007 14:20:46 -0000	1.1.2.5
  @@ -5,7 +5,8 @@
       CDATA sections of the <to/> elements in order to
       use the following merge points.
   -->
  -#set ($requiresAxisMergePoints = $webservice && $war)
  +#set ($axis1 = $axisVersion.equals("1"))
  +#set ($axis2 = $axisVersion.equals("2"))
   <mappings name="WebMerge">
       <mapping>
           <from><![CDATA[<!-- context-param merge-point -->]]></from>
  @@ -64,7 +65,7 @@
           <from><![CDATA[<!-- listener merge-point -->]]></from>
           <to>
               <![CDATA[
  -#if ($requiresAxisMergePoints)
  +#if ($axis1)
       <listener>
           <listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
       </listener>
  @@ -83,12 +84,46 @@
           <from><![CDATA[<!-- servlet merge-point -->]]></from>
           <to>
               <![CDATA[
  -#if ($requiresAxisMergePoints)
  +#if ($axis1)
       <servlet>
           <display-name>Apache-Axis Servlet</display-name>
           <servlet-name>AxisServlet</servlet-name>
           <servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
       </servlet>
  +#elseif ($axis2)
  +    <servlet>
  +        <servlet-name>AxisServlet</servlet-name>
  +        <display-name>Apache-Axis Servlet</display-name>
  +        <servlet-class>
  +            org.apache.axis2.transport.http.AxisServlet</servlet-class>
  +        <!--<init-param>-->
  +        <!--<param-name>axis2.xml.path</param-name>-->
  +        <!--<param-value>/WEB-INF/conf/axis2.xml</param-value>-->
  +        <!--<param-name>axis2.xml.url</param-name>-->
  +        <!--<param-value>http://localhot/myrepo/axis2.xml</param-value>-->
  +        <!--<param-name>axis2.repository.path</param-name>-->
  +        <!--<param-value>/WEB-INF</param-value>-->
  +        <!--<param-name>axis2.repository.url</param-name>-->
  +        <!--<param-value>http://localhot/myrepo</param-value>-->
  +        <!--</init-param>-->
  +        <load-on-startup>1</load-on-startup>
  +    </servlet>
  +    <servlet>
  +        <servlet-name>AxisRESTServlet</servlet-name>
  +        <display-name>Apache-Axis Servlet (REST)</display-name>
  +        <servlet-class>org.apache.axis2.transport.http.AxisRESTServlet</servlet-class>
  +    </servlet>
  +    <servlet>
  +        <servlet-name>AxisAdminServlet</servlet-name>
  +        <display-name>Apache-Axis AxisAdmin Servlet (REST)</display-name>
  +        <servlet-class>org.apache.axis2.transport.http.AxisAdminServlet</servlet-class>
  +    </servlet>
  +#elseif ($xfire)
  +    <servlet>
  +        <display-name>XFire Servlet</display-name>
  +        <servlet-name>XFireServlet</servlet-name>
  +        <servlet-class>org.codehaus.xfire.transport.http.XFireConfigurableServlet</servlet-class>
  +    </servlet>
   #end
               ]]>
           </to>
  @@ -97,7 +132,7 @@
           <from><![CDATA[<!-- servlet-mapping merge-point -->]]></from>
           <to>
               <![CDATA[
  -#if ($requiresAxisMergePoints)
  +#if ($axis)
       <servlet-mapping>
           <servlet-name>AxisServlet</servlet-name>
           <url-pattern>/servlet/AxisServlet</url-pattern>
  @@ -110,6 +145,30 @@
           <servlet-name>AxisServlet</servlet-name>
           <url-pattern>/services/*</url-pattern>
       </servlet-mapping>
  +#if ($axis1)
  +    <servlet-mapping>
  +        <servlet-name>SOAPMonitorService</servlet-name>
  +        <url-pattern>/SOAPMonitor</url-pattern>
  +    </servlet-mapping>
  +#elseif ($axis2)
  +    <servlet-mapping>
  +        <servlet-name>AxisRESTServlet</servlet-name>
  +        <url-pattern>/rest/*</url-pattern>
  +    </servlet-mapping>
  +    <servlet-mapping>
  +        <servlet-name>AxisAdminServlet</servlet-name>
  +        <url-pattern>/axis2-admin/*</url-pattern>
  +    </servlet-mapping>
  +#end
  +#elseif ($xfire)
  +    <servlet-mapping>
  +        <servlet-name>XFireServlet</servlet-name>
  +        <url-pattern>/servlet/XFireServlet/*</url-pattern>
  +    </servlet-mapping>
  +    <servlet-mapping>
  +        <servlet-name>XFireServlet</servlet-name>
  +        <url-pattern>/services/*</url-pattern>
  +    </servlet-mapping>
   #end
               ]]>
           </to>
  @@ -146,7 +205,7 @@
           <from><![CDATA[<!-- mime-type merge-point -->]]></from>
           <to>
               <![CDATA[
  -#if ($requiresAxisMergePoints)
  +#if ($axis1)
       <mime-mapping>
           <extension>wsdl</extension>
           <mime-type>text/xml</mime-type>