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 2007/04/16 19:15:31 UTC
svn commit: r529328 - in /webservices/axis2/trunk/java/modules:
clustering/project.xml saaj/test-resources/axis2.xml tool/script/axis2.sh
tool/script/axis2server.sh tool/script/java2wsdl.sh tool/script/wsdl2java.sh
Author: dims
Date: Mon Apr 16 10:15:30 2007
New Revision: 529328
URL: http://svn.apache.org/viewvc?view=rev&rev=529328
Log:
merge from 1.2 branch
Modified:
webservices/axis2/trunk/java/modules/clustering/project.xml
webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml
webservices/axis2/trunk/java/modules/tool/script/axis2.sh
webservices/axis2/trunk/java/modules/tool/script/axis2server.sh
webservices/axis2/trunk/java/modules/tool/script/java2wsdl.sh
webservices/axis2/trunk/java/modules/tool/script/wsdl2java.sh
Modified: webservices/axis2/trunk/java/modules/clustering/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/project.xml?view=diff&rev=529328&r1=529327&r2=529328
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/project.xml (original)
+++ webservices/axis2/trunk/java/modules/clustering/project.xml Mon Apr 16 10:15:30 2007
@@ -21,7 +21,7 @@
<extend>../../etc/project.xml</extend>
<name>Apache Axis 2.0 - Cluster</name>
- <id>axis2-clustering</id>
+ <id>axis2-cluster</id>
<groupId>org.apache.axis2</groupId>
<description>Clustering Support for Axis 2.0</description>
Modified: webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml?view=diff&rev=529328&r1=529327&r2=529328
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml Mon Apr 16 10:15:30 2007
@@ -111,26 +111,8 @@
<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"/>
- <handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
- <handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
- <handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
- <handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
- <handler name="HTTPLocationBasedDispatcher"
- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher"/>
- </phase>
<!-- user can add his own phases to this area -->
- <phase name="OperationInFaultPhase"/>
- <phase name="soapmonitorPhase"/>
+ <phase name="userphase1"/>
</phaseOrder>
<phaseOrder type="OutFaultFlow">
<!-- user can add his own phases to this area -->
Modified: webservices/axis2/trunk/java/modules/tool/script/axis2.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/script/axis2.sh?view=diff&rev=529328&r1=529327&r2=529328
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/script/axis2.sh (original)
+++ webservices/axis2/trunk/java/modules/tool/script/axis2.sh Mon Apr 16 10:15:30 2007
@@ -28,8 +28,8 @@
# -----------------------------------------------------------------------------
# Get the context and from that find the location of setenv.sh
-. `dirname $0`/setenv.sh
+sh `dirname $0`/setenv.sh
$JAVA_HOME/bin/java -classpath "$AXIS2_CLASSPATH" \
--Daxis2.xml="$AXIS2_HOME/conf/axis2.xml" -Daxis2.repo="$AXIS2_HOME/repository" $*
\ No newline at end of file
+-Daxis2.xml="$AXIS2_HOME/conf/axis2.xml" -Daxis2.repo="$AXIS2_HOME/repository" $*
Modified: webservices/axis2/trunk/java/modules/tool/script/axis2server.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/script/axis2server.sh?view=diff&rev=529328&r1=529327&r2=529328
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/script/axis2server.sh (original)
+++ webservices/axis2/trunk/java/modules/tool/script/axis2server.sh Mon Apr 16 10:15:30 2007
@@ -27,7 +27,7 @@
# -----------------------------------------------------------------------------
# Get the context and from that find the location of setenv.sh
-. `dirname $0`/setenv.sh
+sh `dirname $0`/setenv.sh
java -classpath $AXIS2_CLASSPATH org.apache.axis2.transport.SimpleAxis2Server \
-repo $AXIS2_HOME/repository -conf $AXIS2_HOME/conf/axis2.xml $*
Modified: webservices/axis2/trunk/java/modules/tool/script/java2wsdl.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/script/java2wsdl.sh?view=diff&rev=529328&r1=529327&r2=529328
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/script/java2wsdl.sh (original)
+++ webservices/axis2/trunk/java/modules/tool/script/java2wsdl.sh Mon Apr 16 10:15:30 2007
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-. `dirname $0`/axis2.sh org.apache.ws.java2wsdl.Java2WSDL $*
+sh `dirname $0`/axis2.sh org.apache.ws.java2wsdl.Java2WSDL $*
Modified: webservices/axis2/trunk/java/modules/tool/script/wsdl2java.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/script/wsdl2java.sh?view=diff&rev=529328&r1=529327&r2=529328
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/script/wsdl2java.sh (original)
+++ webservices/axis2/trunk/java/modules/tool/script/wsdl2java.sh Mon Apr 16 10:15:30 2007
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-. `dirname $0`/axis2.sh org.apache.axis2.wsdl.WSDL2Java $*
+sh `dirname $0`/axis2.sh org.apache.axis2.wsdl.WSDL2Java $*
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org