You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/09/16 04:19:54 UTC
svn commit: r289363 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine:
AxisConfiguration.java AxisConfigurationImpl.java
Author: dims
Date: Thu Sep 15 19:19:50 2005
New Revision: 289363
URL: http://svn.apache.org/viewcvs?rev=289363&view=rev
Log:
fix bad merge
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=289363&r1=289362&r2=289363&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java Thu Sep 15 19:19:50 2005
@@ -56,7 +56,6 @@
public static final int FAULT_OUT_FLOW = 10006;
/**
-<<<<<<< .mine
* Method getService
*
* @param name
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java?rev=289363&r1=289362&r2=289363&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java Thu Sep 15 19:19:50 2005
@@ -394,20 +394,14 @@
/**
- <<<<<<< .mine
* @return ArrayList
- =======
- >>>>>>> .r280753
*/
public ArrayList getInFaultFlow() {
return inFaultPhases;
}
/**
- <<<<<<< .mine
* @return ArrayList
- =======
- >>>>>>> .r280753
*/
public ArrayList getOutFaultFlow() {
return outFaultPhases;
@@ -442,10 +436,7 @@
* Method getParameter
*
* @param name
- <<<<<<< .mine
* @return Parameter
- =======
- >>>>>>> .r280753
*/
public Parameter getParameter(String name) {
return paramInclude.getParameter(name);
@@ -471,10 +462,7 @@
/**
* Method getEngadgedModules
*
- <<<<<<< .mine
* @return Collection
- =======
- >>>>>>> .r280753
*/
public Collection getEngadgedModules() {
return engagedModules;