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 du...@apache.org on 2001/04/05 21:42:44 UTC
cvs commit: xml-axis/java/src/org/apache/axis/utils Admin.java
dug 01/04/05 12:42:44
Modified: java/src/org/apache/axis/utils Admin.java
Log:
Client chains were not being deployed properly
Revision Changes Path
1.25 +17 -10 xml-axis/java/src/org/apache/axis/utils/Admin.java
Index: Admin.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/Admin.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Admin.java 2001/03/31 00:53:11 1.24
+++ Admin.java 2001/04/05 19:42:43 1.25
@@ -70,18 +70,21 @@
* @author Doug Davis (dug@us.ibm.com)
*/
public class Admin {
- private static HandlerRegistry hr = null ;
- private static HandlerRegistry sr = null ;
+ private static DefaultHandlerRegistry hr = null ;
+ private static DefaultServiceRegistry sr = null ;
+ private boolean onServer = true ;
private void init() {
if ( hr == null ) {
// hr = new SimpleRegistry("handlers.reg");
- hr = new SupplierRegistry("handlers-supp.reg");
+ hr = new DefaultHandlerRegistry("handlers-supp.reg");
+ hr.setOnServer( onServer );
hr.init();
}
if ( sr == null ) {
// sr = new SimpleRegistry("services.reg");
- sr = new SupplierRegistry("services-supp.reg");
+ sr = new DefaultServiceRegistry("services-supp.reg");
+ hr.setOnServer( onServer );
sr.init();
}
}
@@ -105,8 +108,8 @@
throws AxisFault
{
Debug.Print( 1, "Enter: Admin:AdminService" );
- hr = (HandlerRegistry)msgContext.getProperty(Constants.HANDLER_REGISTRY);
- sr = (HandlerRegistry)msgContext.getProperty(Constants.SERVICE_REGISTRY);
+ hr = (DefaultHandlerRegistry)msgContext.getProperty(Constants.HANDLER_REGISTRY);
+ sr = (DefaultServiceRegistry)msgContext.getProperty(Constants.SERVICE_REGISTRY);
Document doc = process( xml );
Debug.Print( 1, "Exit: Admin:AdminService" );
return( doc );
@@ -371,7 +374,8 @@
}
catch( Exception e ) {
e.printStackTrace();
- throw new AxisFault( e );
+ if ( !(e instanceof AxisFault) ) e = new AxisFault( e );
+ throw (AxisFault) e ;
}
return( doc );
}
@@ -379,8 +383,9 @@
public static void main(String args[]) {
int i = 0 ;
- if ( args.length == 0 ) {
- System.err.println( "Usage: Admin <xml-file>\n" );
+ if ( args.length < 2 || !(args[0].equals("client") ||
+ args[0].equals("server")) ) {
+ System.err.println( "Usage: Admin client|server <xml-file>\n" );
System.err.println( "Where <xml-file> looks like:" );
System.err.println( "<deploy>" );
@@ -402,8 +407,10 @@
Admin admin = new Admin();
+ if ( args[0].equals("client") ) admin.onServer = false ;
+
try {
- for ( i = 0 ; i < args.length ; i++ ) {
+ for ( i = 1 ; i < args.length ; i++ ) {
System.out.println( "Processing '" + args[i] + "'" );
admin.process(XMLUtils.newDocument( new FileInputStream( args[i] ) ));
}