Attachment 54144 Details for Bug 165113 – Fix propsed in bug description

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix propsed in bug description

packaging.patch (text/plain), 24.70 KB, created by Andrew Eberbach

on 2006-11-19 23:11:05 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Eberbach

Created: 2006-11-19 23:11:05 EST

Size: 24.70 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.wsdm.tooling.codegeneration
>Index: resources/axis2/WebContent/WEB-INF/conf/axis2.xml
>===================================================================
>RCS file: resources/axis2/WebContent/WEB-INF/conf/axis2.xml
>diff -N resources/axis2/WebContent/WEB-INF/conf/axis2.xml
>--- resources/axis2/WebContent/WEB-INF/conf/axis2.xml	12 Sep 2006 13:51:48 -0000	1.3
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,203 +0,0 @@
>-<axisconfig name="AxisJava2.0">
>-    
>-    
>-    
>-    <parameter name="hotdeployment" locked="false">true</parameter>
>-    <parameter name="hotupdate" locked="false">false</parameter>
>-    <parameter name="enableMTOM" locked="false">false</parameter>
>-
>-    
>-    
>-    <parameter name="sendStacktraceDetailsWithFaults" locked="false">true</parameter>
>-
>-    
>-    
>-    
>-    
>-    <parameter name="DrillDownToRootCauseForFaultReason" locked="false">false</parameter>
>-
>-    <parameter name="userName" locked="false">admin</parameter>
>-    <parameter name="password" locked="false">axis2</parameter>
>-
>-    
>-    
>-    
>-
>-
>-    
>-    
>-    
>-    
>-
>-    
>-    
>-    
>-    
>-    
>-    
>-    
>-    <messageReceivers>
>-        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
>-                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
>-        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
>-                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
>-    </messageReceivers>
>-    
>-    
>-    
>-    <transportReceiver name="http"
>-                       class="org.apache.axis2.transport.http.SimpleHTTPServer">
>-        <parameter name="port" locked="false">6060</parameter>
>-        
>-        
>-        
>-    </transportReceiver>
>-
>-    
>-    
>-    
>-    
>-    
>-    
>-    
>-    
>-
>-    <transportReceiver name="tcp"
>-                       class="org.apache.axis2.transport.tcp.TCPServer">
>-        <parameter name="port" locked="false">6060</parameter>
>-        
>-        
>-        
>-    </transportReceiver>
>-
>-    
>-    
>-    
>-    
>-    
>-    
>-    
>-
>-    
>-    
>-    
>-
>-    <transportSender name="tcp"
>-                     class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
>-    <transportSender name="local"
>-                     class="org.apache.axis2.transport.local.LocalTransportSender"/>
>-    <transportSender name="jms"
>-                     class="org.apache.axis2.transport.jms.JMSSender"/>
>-    <transportSender name="http"
>-                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
>-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
>-        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
>-    </transportSender>
>-    <transportSender name="https"
>-                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
>-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
>-        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
>-    </transportSender>
>-
>-    
>-
>-    
>-    
>-    
>-    
>-    <module ref="addressing"/>
>-
>-    
>-    
>-    
>-    
>-
>-    
>-    
>-    
>-    <phaseOrder type="inflow">
>-        
>-        <phase name="Transport">
>-            <handler name="RequestURIBasedDispatcher"
>-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>-                <order phase="Dispatch"/>
>-            </handler>
>-            <handler name="SOAPActionBasedDispatcher"
>-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>-                <order phase="Dispatch"/>
>-            </handler>
>-        </phase>
>-        <phase name="Security"/>
>-        <phase name="PreDispatch"/>
>-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>-            <handler name="AddressingBasedDispatcher"
>-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
>-                <order phase="Dispatch"/>
>-            </handler>
>-
>-            <handler name="SOAPMessageBodyBasedDispatcher"
>-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>-                <order phase="Dispatch"/>
>-            </handler>
>-            <handler name="InstanceDispatcher"
>-                     class="org.apache.axis2.engine.InstanceDispatcher">
>-                <order phase="PostDispatch"/>
>-            </handler>
>-        </phase>
>-        
>-        
>-        <phase name="OperationInPhase"/>
>-    </phaseOrder>
>-    <phaseOrder type="outflow">
>-        
>-        <phase name="OperationOutPhase"/>
>-        
>-        
>-        <phase name="PolicyDetermination"/>
>-        <phase name="MessageOut"/>
>-    </phaseOrder>
>-    <phaseOrder type="INfaultflow">
>-        <phase name="PreDispatch"/>
>-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>-            <handler name="RequestURIBasedDispatcher"
>-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>-                <order phase="Dispatch"/>
>-            </handler>
>-
>-            <handler name="SOAPActionBasedDispatcher"
>-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>-                <order phase="Dispatch"/>
>-            </handler>
>-
>-            <handler name="AddressingBasedDispatcher"
>-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
>-                <order phase="Dispatch"/>
>-            </handler>
>-
>-            <handler name="SOAPMessageBodyBasedDispatcher"
>-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>-                <order phase="Dispatch"/>
>-            </handler>
>-            <handler name="InstanceDispatcher"
>-                     class="org.apache.axis2.engine.InstanceDispatcher">
>-                <order phase="PostDispatch"/>
>-            </handler>
>-        </phase>
>-        
>-        <phase name="OperationInFaultPhase"/>
>-    </phaseOrder>
>-    <phaseOrder type="Outfaultflow">
>-        
>-        <phase name="OperationOutFaultPhase"/>
>-        <phase name="PolicyDetermination"/>
>-        <phase name="MessageOut"/>
>-    </phaseOrder>
>-</axisconfig>
>-
>Index: src/org/eclipse/tptp/wsdm/tooling/internal/projectizer/EclipseAxis2Projectizer.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.tooling.codegeneration/src/org/eclipse/tptp/wsdm/tooling/internal/projectizer/EclipseAxis2Projectizer.java,v
>retrieving revision 1.6
>diff -u -r1.6 EclipseAxis2Projectizer.java
>--- src/org/eclipse/tptp/wsdm/tooling/internal/projectizer/EclipseAxis2Projectizer.java	26 Sep 2006 19:13:28 -0000	1.6
>+++ src/org/eclipse/tptp/wsdm/tooling/internal/projectizer/EclipseAxis2Projectizer.java	18 Nov 2006 20:43:58 -0000
>@@ -17,6 +17,7 @@
> import java.net.URL;
> import java.util.Map;
> 
>+import org.apache.muse.tools.Activator;
> import org.apache.muse.tools.generator.projectizer.Axis2Projectizer;
> import org.apache.muse.tools.generator.projectizer.Axis2ProjectizerConstants;
> import org.apache.muse.tools.generator.util.ConfigurationData;
>@@ -26,7 +27,6 @@
> import org.eclipse.core.runtime.FileLocator;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.Platform;
>-import org.eclipse.tptp.wsdm.tooling.internal.codegeneration.Activator;
> import org.eclipse.tptp.wsdm.tooling.internal.util.WebProjectHelper;
> import org.eclipse.tptp.wsdm.tooling.wizard.mrt.internal.EclipseConfigurationData;
> import org.w3c.dom.Document;
>Index: resources/axis2/WebContent/WEB-INF/web.xml
>===================================================================
>RCS file: resources/axis2/WebContent/WEB-INF/web.xml
>diff -N resources/axis2/WebContent/WEB-INF/web.xml
>--- resources/axis2/WebContent/WEB-INF/web.xml	12 Sep 2006 13:51:47 -0000	1.3
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,73 +0,0 @@
>-<?xml version="1.0" encoding="ISO-8859-1"?>
>-
>-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
>-
>-<web-app>
>-    <display-name>Apache-Axis2</display-name>
>-    <servlet>
>-        <servlet-name>AxisServlet</servlet-name>
>-        <display-name>Apache-Axis Servlet</display-name>
>-        <servlet-class>
>-            org.apache.axis2.transport.http.AxisServlet</servlet-class>
>-        
>-        
>-        
>-        
>-        
>-        
>-        
>-        
>-        
>-        
>-        <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>
>-    <servlet-mapping>
>-        <servlet-name>AxisRESTServlet</servlet-name>
>-        <url-pattern>/rest/*</url-pattern>
>-    </servlet-mapping>
>-
>-
>-    <servlet-mapping>
>-        <servlet-name>AxisServlet</servlet-name>
>-        <url-pattern>/servlet/AxisServlet</url-pattern>
>-    </servlet-mapping>
>-
>-    <servlet-mapping>
>-        <servlet-name>AxisServlet</servlet-name>
>-        <url-pattern>*.jws</url-pattern>
>-    </servlet-mapping>
>-
>-    <servlet-mapping>
>-        <servlet-name>AxisServlet</servlet-name>
>-        <url-pattern>/services/*</url-pattern>
>-    </servlet-mapping>
>-
>-    <servlet-mapping>
>-        <servlet-name>AxisAdminServlet</servlet-name>
>-        <url-pattern>/axis2-admin/*</url-pattern>
>-    </servlet-mapping>
>-
>-    <error-page>
>-      <error-code>404</error-code>
>-      <location>/axis2-web/Error/error404.jsp</location>
>-    </error-page>
>-
>-    <error-page>
>-        <error-code>500</error-code>
>-        <location>/axis2-web/Error/error500.jsp</location>
>-    </error-page>
>-
>-
>-</web-app>
>Index: resources/axis2/WebContent/WEB-INF/services/muse/muse-descriptor.xsd
>===================================================================
>RCS file: resources/axis2/WebContent/WEB-INF/services/muse/muse-descriptor.xsd
>diff -N resources/axis2/WebContent/WEB-INF/services/muse/muse-descriptor.xsd
>--- resources/axis2/WebContent/WEB-INF/services/muse/muse-descriptor.xsd	12 Sep 2006 13:51:48 -0000	1.3
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,155 +0,0 @@
>-<?xml version="1.0" encoding="UTF-8" ?>
>-
>-
>-
>-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
>-           targetNamespace="http://ws.apache.org/muse/descriptor" 
>-           xmlns:tns="http://ws.apache.org/muse/descriptor" >
>-
>-  <xs:element name="capability">
>-    <xs:complexType>
>-      <xs:sequence>
>-        <xs:element ref="tns:capability-uri"/>
>-        <xs:element ref="tns:java-capability-class" minOccurs="0"/>
>-        <xs:element ref="tns:persistence" minOccurs="0"/>
>-        <xs:element ref="tns:init-param" minOccurs="0" maxOccurs="unbounded"/>
>-      </xs:sequence>
>-    </xs:complexType>
>-  </xs:element>
>-
>-  <xs:element name="capability-uri" type="xs:anyURI"/>
>-
>-  <xs:element name="context-path" type="xs:NCName"/>
>-  
>-  <xs:element name="custom-serializer">
>-    <xs:complexType>
>-      <xs:sequence>
>-        <xs:element ref="tns:java-serializable-type"/>
>-        <xs:element ref="tns:java-serializer-class"/>
>-      </xs:sequence>
>-    </xs:complexType>
>-  </xs:element>
>-
>-  <xs:element name="init-param">
>-    <xs:complexType>
>-      <xs:sequence>
>-        <xs:element ref="tns:param-name"/>
>-        <xs:element ref="tns:param-value"/>
>-      </xs:sequence>
>-    </xs:complexType>
>-  </xs:element>
>-  
>-  <xs:element name="java-capability-class" type="xs:string"/>
>-  <xs:element name="java-id-factory-class" type="xs:string"/> 
>-  <xs:element name="java-persistence-class" type="xs:string"/> 
>-  <xs:element name="java-resource-class" type="xs:string"/> 
>-  <xs:element name="java-router-class" type="xs:string"/> 
>-  <xs:element name="java-serializable-type" type="xs:string"/> 
>-  <xs:element name="java-serializer-class" type="xs:string"/>
>-  
>-  <xs:element name="log-file" type="xs:anyURI"/>
>-  
>-  <xs:element name="log-level">
>-    <xs:simpleType>
>-      <xs:restriction base="xs:string">
>-        <xs:enumeration value="OFF"/>
>-        <xs:enumeration value="SEVERE"/>
>-        <xs:enumeration value="WARNING"/>
>-        <xs:enumeration value="INFO"/>
>-        <xs:enumeration value="CONFIG"/>
>-        <xs:enumeration value="FINE"/>
>-        <xs:enumeration value="FINER"/>
>-        <xs:enumeration value="FINEST"/>
>-        <xs:enumeration value="ALL"/>
>-      </xs:restriction>
>-    </xs:simpleType>
>-  </xs:element>
>-
>-  <xs:element name="logging">
>-    <xs:complexType>
>-      <xs:sequence>
>-        <xs:element ref="tns:log-file"/>
>-        <xs:element ref="tns:log-level"/>
>-      </xs:sequence>
>-    </xs:complexType>
>-  </xs:element>
>-
>-  <xs:element name="muse">
>-    <xs:complexType>
>-      <xs:sequence>
>-        <xs:element ref="tns:router"/>
>-        <xs:element ref="tns:resource-type" maxOccurs="unbounded"/>
>-        <xs:element ref="tns:custom-serializer" minOccurs="0" maxOccurs="unbounded"/>
>-      </xs:sequence>
>-    </xs:complexType>
>-  </xs:element>
>-  
>-  <xs:element name="param-name" type="xs:string"/>
>-  
>-  <xs:element name="param-value" type="xs:string"/>
>-
>-  <xs:element name="persistence">
>-    <xs:complexType>
>-      <xs:sequence>
>-        <xs:element ref="tns:java-persistence-class"/>
>-        <xs:element ref="tns:persistence-location" minOccurs="0"/>
>-        <xs:element ref="tns:init-param" minOccurs="0" maxOccurs="unbounded"/>
>-      </xs:sequence>
>-    </xs:complexType>
>-  </xs:element>
>-
>-  <xs:element name="persistence-location" type="xs:anyURI"/>
>-
>-  <xs:element name="resource-type">
>-    <xs:complexType>
>-      <xs:sequence>
>-        <xs:element ref="tns:context-path"/>
>-        <xs:element ref="tns:wsdl"/>
>-        <xs:element ref="tns:java-id-factory-class" minOccurs="0"/>
>-        <xs:element ref="tns:java-resource-class"/>
>-        <xs:element ref="tns:capability" minOccurs="0" maxOccurs="unbounded"/>
>-        <xs:element ref="tns:init-param" minOccurs="0" maxOccurs="unbounded"/>
>-      </xs:sequence>
>-    </xs:complexType>
>-  </xs:element>
>-
>-  <xs:element name="router">
>-    <xs:complexType>
>-      <xs:sequence>
>-        <xs:element ref="tns:java-router-class"/>
>-        <xs:element ref="tns:logging"/>
>-        <xs:element ref="tns:persistence" minOccurs="0"/>
>-      </xs:sequence>
>-    </xs:complexType>
>-  </xs:element>
>-
>-  <xs:element name="wsdl">
>-    <xs:complexType>
>-      <xs:sequence>
>-        <xs:element ref="tns:wsdl-file"/>
>-        <xs:element ref="tns:wsdl-port-type"/>
>-      </xs:sequence>
>-    </xs:complexType>
>-  </xs:element>
>-  
>-  <xs:element name="wsdl-file" type="xs:anyURI"/>
>-  
>-  <xs:element name="wsdl-port-type" type="xs:QName"/>
>-
>-</xs:schema>
>Index: resources/axis2/WebContent/WEB-INF/classes/log4j.properties
>===================================================================
>RCS file: resources/axis2/WebContent/WEB-INF/classes/log4j.properties
>diff -N resources/axis2/WebContent/WEB-INF/classes/log4j.properties
>--- resources/axis2/WebContent/WEB-INF/classes/log4j.properties	19 Sep 2006 17:26:02 -0000	1.6
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,32 +0,0 @@
>-###############################################################################
>-# Copyright (c) 2006 IBM Corporation and others.
>-# All rights reserved. This program and the accompanying materials
>-# are made available under the terms of the Eclipse Public License v1.0
>-# which accompanies this distribution, and is available at
>-# http://www.eclipse.org/legal/epl-v10.html
>-# 
>-# Contributors:
>-# 	Balan Subramanian (bsubram@us.ibm.com)
>-#     IBM Corporation - initial API and implementation
>-###############################################################################
>-# Set root category priority to INFO and its only appender to CONSOLE.
>-log4j.rootCategory=INFO, CONSOLE
>-#log4j.rootCategory=INFO, CONSOLE, LOGFILE
>-
>-# Set the enterprise logger category to FATAL and its only appender to CONSOLE.
>-log4j.logger.org.apache.axis2.enterprise=FATAL, CONSOLE
>-log4j.logger.de.hunsicker.jalopy.io=FATAL, CONSOLE
>-
>-# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
>-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
>-log4j.appender.CONSOLE.Threshold=INFO
>-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
>-log4j.appender.CONSOLE.layout.ConversionPattern=- %m%n
>-
>-# LOGFILE is set to be a File appender using a PatternLayout.
>-log4j.appender.LOGFILE=org.apache.log4j.FileAppender
>-log4j.appender.LOGFILE.File=axis2.log
>-log4j.appender.LOGFILE.Append=true
>-log4j.appender.LOGFILE.Threshold=INFO
>-log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
>-log4j.appender.LOGFILE.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
>\ No newline at end of file
>Index: resources/axis2/WebContent/WEB-INF/classes/commons-logging.properties
>===================================================================
>RCS file: resources/axis2/WebContent/WEB-INF/classes/commons-logging.properties
>diff -N resources/axis2/WebContent/WEB-INF/classes/commons-logging.properties
>--- resources/axis2/WebContent/WEB-INF/classes/commons-logging.properties	13 Sep 2006 12:12:03 -0000	1.4
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,22 +0,0 @@
>-###############################################################################
>-# Copyright (c) 2006 IBM Corporation and others.
>-# All rights reserved. This program and the accompanying materials
>-# are made available under the terms of the Eclipse Public License v1.0
>-# which accompanies this distribution, and is available at
>-# http://www.eclipse.org/legal/epl-v10.html
>-# 
>-# Contributors:
>-# 	Balan Subramanian (bsubram@us.ibm.com)
>-#     IBM Corporation - initial API and implementation
>-###############################################################################
>-# This is the logging properties that goes to the war, there are two logging conf kept at the 
>-# svn, one for developement (one at src/test-resources) and other for producation
>- 
>-# Uncomment the next line to disable all logging.
>-#org.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
>-
>-# Uncomment the next line to enable the simple log based logging
>-#org.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
>-
>-# Uncomment the next line to enable log4j based logging
>-org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger

Actions: View | Diff

Attachments on bug 165113: 54144