User: cgjung  
  Date: 02/02/04 01:38:58

  Modified:    jboss.net/src/main/org/jboss/net/axis/server
                        AxisService.java AxisServiceMBean.java
                        Constants.java
  Log:
  Adapted to latest deployment changes. Compiles, but does not yet run yet.
  
  Revision  Changes    Path
  1.6       +297 -156  
contrib/jboss.net/src/main/org/jboss/net/axis/server/AxisService.java
  
  Index: AxisService.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/contrib/jboss.net/src/main/org/jboss/net/axis/server/AxisService.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AxisService.java  2002/01/20 15:11:22     1.5
  +++ AxisService.java  2002/02/04 09:38:58     1.6
  @@ -5,7 +5,7 @@
    * See terms of license at gnu.org.
    */
   
  -// $Id: AxisService.java,v 1.5 2002/01/20 15:11:22 mnf999 Exp $
  +// $Id: AxisService.java,v 1.6 2002/02/04 09:38:58 cgjung Exp $
   
   package org.jboss.net.axis.server;
   
  @@ -13,8 +13,10 @@
   import org.jboss.net.DefaultResourceBundle;
   
   import org.jboss.deployment.DeploymentException;
  -import org.jboss.deployment.DeployerMBeanSupport;
  +import org.jboss.deployment.DeploymentInfo;
  +import org.jboss.system.ServiceMBeanSupport;
   import org.jboss.web.WebApplication;
  +import org.jboss.deployment.MainDeployerMBean;
   
   import org.apache.log4j.Category;
   import org.apache.log4j.Priority;
  @@ -49,44 +51,53 @@
   import java.io.File;
   import java.io.IOException;
   import java.io.InputStream;
  +import java.io.OutputStream;
   import java.io.FileOutputStream;
  +import java.io.PrintStream;
   
   import java.net.URL;
   import java.net.URLClassLoader;
   import java.net.MalformedURLException;
   
  -import java.util.HashMap;
   import java.util.Map;
  +import java.util.Iterator;
   
   /**
    *   A deployer service that installs and manages Axis within JMX.
    *   @created 27. September 2001
    *   @author <a href="mailto:[EMAIL PROTECTED]";>Christoph G. Jung</a>
  - *   @version $Revision: 1.5 $
  + *   @version $Revision: 1.6 $
    *   Change notes:
    *   <ul>
  - *     <li> 28.11.01: CGJ, Adapted to jboss3.0 single-phase mbean startup<li>
  - *     <li> 28.11.01: CGJ, Fixed zip-cache problem (sort of)<li>
  + *     <li> 01.02.02: CGJ, Adapted to jboss3.0.0DR1 deployment changes. Arrgh! <li>
  + *     <li> 14.12.01: CGJ, Added security domain support. <li>
  + *     <li> 28.11.01: CGJ, Adapted to jboss3.0 single-phase mbean startup. <li>
  + *     <li> 28.11.01: CGJ, Fixed zip-cache problem (sort of). <li>
    *   </ul>
    */
   
  -public class AxisService 
  -extends DeployerMBeanSupport 
  +public class AxisService
  +extends ServiceMBeanSupport
   implements AxisServiceMBean, MBeanRegistration, Constants
   {
  -   
  +
  +  /**
  +   * A map of current deployments.
  +   */
  +   Map deployments = new java.util.HashMap();
  +
      /** the name registered */
      ObjectName _name=null;
  -   
  +
      /** this is where the axis "web-application" has been installed */
  -   String myUrl=null;
  -   
  +   DeploymentInfo myDeploymentInfo=null;
  +
      /** Axis administration helper, keeps no state, i think */
      final Admin admin=new Admin();
  -   
  +
      /** the axis engines */
  -   final static Map axisServerMap=new HashMap();
  -   
  +   final static Map axisServerMap=new java.util.HashMap();
  +
      /** default */
      public AxisService()
      {
  @@ -94,11 +105,11 @@
         if(log.getCategory().getResourceBundle()==null)
            log.getCategory().setResourceBundle(new DefaultResourceBundle());
      }
  -   
  +
      //----------------------------------------------------------------------------
      // 'name' interface
      //----------------------------------------------------------------------------
  -   
  +
      public ObjectName getObjectName(MBeanServer server, ObjectName name)
      throws MalformedObjectNameException
      {
  @@ -113,31 +124,31 @@
         }
         return _name;
      }
  -   
  +
      /** return just the proper name part */
      public String getName()
      {
         return NAME;
      }
  -   
  +
      //----------------------------------------------------------------------------
      // 'service' interface
      //----------------------------------------------------------------------------
  -   
  +
      /** starts the associated AxisEngine */
      protected void ensureService() throws Exception
      {
  -      
  +
         synchronized(AxisService.class)
         {
            // each engine must have a different context
            if(axisServerMap.get(rootContext)!=null)
               throw new Exception(AXIS_SERVER_CONTEXT_OCCUPIED);
  -         
  +
            // find the global config file in classpath
            URL resource=getClass().
            getClassLoader().getResource(AXIS_CONFIGURATION_FILE);
  -                
  +
            if(resource==null)
            {
               
log.getCategory().l7dlog(Priority.WARN,COULD_NOT_FIND_AXIS_CONFIGURATION_0,
  @@ -145,45 +156,49 @@
               {AXIS_CONFIGURATION_FILE},null);
               throw new Exception(COULD_NOT_FIND_AXIS_CONFIGURATION_0);
            }
  -                  
  +
            // Set the base path for the AxisServer to our WEB-INF directory
            axisServerMap.put(getRootContext(),new ClassLoaderAwareAxisServer(new 
XMLResourceProvider(resource)));
         }
      }
  -   
  -   /** start service = initialise axis engine & register Axis servlet in 
WebContainer */
  +
  +   /**
  +    * start service means
  +    *  - initialise axis engine
  +    *  - register Axis servlet in WebContainer
  +    *  - contact the maindeployer
  +    */
      public void startService() throws Exception
      {
  -      // call the common deployer start code
  -      super.startService();
         // set up the axis engine
         ensureService();
   
         // we find out through which URLClassLoader we have been loaded
         ClassLoader myLoader=getClass().getClassLoader();
  -      
  +
         // and get our web deployment descriptor through the
         // zip-cache faker
         URL resource=fixURL(myLoader.getResource(AXIS_DEPLOYMENT_DESCRIPTOR));
  -                  
  +      InputStream input=resource.openStream();
  +
         if(resource==null)
         {
            log.getCategory().l7dlog(Priority.ERROR,COULD_NOT_DEPLOY_DESCRIPTOR,new 
Object[0],null);
            throw new Exception(COULD_NOT_DEPLOY_DESCRIPTOR);
         }
   
  -      // there must be also the servlet spec as a resource somewhere
  -      InputStream input=resource.openStream();
  -      
  +
  +      //next we build the deployment structure that should
  +      //persuade the web-server to run the axis servlet under
  +      //our root context
  +      File appDir=new File(getDeployDir()+File.separator+getRootContext());
  +
  +      URL myUrl=appDir.toURL();
  +      myDeploymentInfo=new DeploymentInfo(myUrl,null);
  +      myDeploymentInfo.localUrl=myUrl;
  +
         try
         {
  -         //next we build the deployment structure that should
  -         //persuade the web-server to run the axis servlet under
  -         //our root context
  -         File appDir=
  -         new File(getDeployDir()+AXIS_DEPLOY_DIR+"/"+getRootContext()+"/");
  -         // and this is how it looks in stringified URL notation
  -         myUrl=appDir.toURL().toString();
            // the target where the deployemnt descriptor goes to
            File target=
            new File(appDir+WEB_DEPLOYMENT_DESCRIPTOR);
  @@ -201,39 +216,95 @@
         } finally
         {
            input.close();
  +      }
  +
  +
  +      // generate a jboss-web file in case that we have a non-trivial
  +      // security domain
  +      if(securityDomain!=null)
  +      {
  +         File target=new File(appDir+JBOSS_WEB_DEPLOYMENT_DESCRIPTOR);
  +         PrintStream output=new PrintStream(new FileOutputStream(target));
  +         try
  +         {
  +            //lets hope that is a valid xml format ;-)
  +            
output.println("<jboss-web><security-domain>"+securityDomain+"</security-domain></jboss-web>");
  +         } finally
  +         {
  +            output.close();
  +         }
         }
  -      
   
         // we use the root context as URL infix
         String rootContext="/"+getRootContext()+"/*";
  -      
  +
         log.getCategory().l7dlog(Priority.INFO,ABOUT_TO_DEPLOY_0_UNDER_CONTEXT_1,new 
Object[]
  -      {myUrl,rootContext},null);
  -      
  -      // Call the appropriate deployer through the JMX server
  +      {myDeploymentInfo,rootContext},null);
  +
  +      // we fake a new deploymentinfo for the war deployer
  +      myDeploymentInfo.webContext=rootContext;
  +
  +      // Call the main deployer through the JMX server
         Object webApplication=
         getServer().invoke(new ObjectName(getWarDeployerName()),
         DEPLOY_METHOD_NAME, new Object[]
  -      {rootContext,myUrl},
  -      new String[]
  -      {STRING_CLASS_NAME,STRING_CLASS_NAME});
  +      {myDeploymentInfo},new String[]
  +      {DEPLOYMENT_INFO_CLASS_NAME});
  +
  +      try
  +      {
  +         // Register with the main deployer
  +         server.invoke(
  +            new ObjectName(MainDeployerMBean.OBJECT_NAME),
  +            "addDeployer",
  +            new Object[] {this},
  +            new String[] {"org.jboss.deployment.DeployerMBean"});
  +      }
  +      catch (Exception e) {log.error("Could not register with MainDeployer", e);
  +      }
  +
      }
  -   
  +
      /** what to do to stop axis temporarily --> undeploy the servlet */
      public void stopService()
      {
  +      // deregister from main deployer such that we do not get
  +      // web services assigned anymore
  +      try
  +      {
  +         // Register with the main deployer
  +         server.invoke(
  +            new ObjectName(MainDeployerMBean.OBJECT_NAME),
  +            "removeDeployer",
  +            new Object[] {this},
  +            new String[] {"org.jboss.deployment.DeployerMBean"});
  +      }
  +      catch (Exception e) {log.error("Could not deregister from MainDeployer", e);}
  +
  +      // tear down all running web services
  +      for (Iterator apps = new 
java.util.ArrayList(deployments.values()).iterator(); apps.hasNext(); )
  +      {
  +         DeploymentInfo info= (DeploymentInfo) apps.next();
  +         try{
  +          undeploy(info);
  +         } catch(DeploymentException e) {
  +          log.error("Could not undeploy deployment "+info,e);
  +         }
  +      }
  +
  +      // undeploy Axis servlet
         try
         {
            // undeploy axis servlet
            log.getCategory().l7dlog(Priority.INFO,ABOUT_TO_UNDEPLOY_0,new Object[]
  -         {myUrl},null);
  -         
  +         {myDeploymentInfo},null);
  +
            // Call the appropriate deployer through the JMX server
            Object webApplication=
            getServer().invoke(new ObjectName(getWarDeployerName()),
            UNDEPLOY_METHOD_NAME, new Object[]
  -         {myUrl},new String[]
  -         {STRING_CLASS_NAME});
  +         {myDeploymentInfo},new String[]
  +         {DEPLOYMENT_INFO_CLASS_NAME});
         } catch (Exception e)
         {
            log.getCategory().error(COULD_NOT_STOP_AXIS, e);
  @@ -245,91 +316,179 @@
               axisServerMap.remove(getRootContext());
            }
            super.stopService();
  -         myUrl=null;
  +         myDeploymentInfo=null;
         }
  +
      }
  -   
  +
      //----------------------------------------------------------------------------
      // static helper that relates contexts and axis engines
      //----------------------------------------------------------------------------
  -   
  +
      /** return the engine if initialised */
      public static synchronized AxisServer getAxisServer(String context)
      {
         return (AxisServer) axisServerMap.get(context);
      }
  -   
  +
      //----------------------------------------------------------------------------
      // war deployer plug
      //----------------------------------------------------------------------------
  -   
  +
      protected String warDeployerName=null;
  -   
  +
      public String getWarDeployerName()
      {
         return warDeployerName;
      }
  -   
  +
      public void setWarDeployerName(String name)
      {
         log.getCategory().l7dlog(Priority.INFO,SET_WAR_DEPLOYER_0,new Object[]
         {name},null);
         warDeployerName=name;
      }
  -   
  +
      //----------------------------------------------------------------------------
  +   // security domain
  +   //----------------------------------------------------------------------------
  +
  +
  +   /** name of the security domain, null if none */
  +   String securityDomain=null;
  +
  +   public String getSecurityDomain()
  +   {
  +      return securityDomain;
  +   }
  +
  +   public void setSecurityDomain(String name)
  +   {
  +      log.getCategory().l7dlog(Priority.INFO,SET_SECURITY_DOMAIN_TO_0,new Object[]
  +      {name},null);
  +      securityDomain=name;
  +   }
  +
  +   //----------------------------------------------------------------------------
      // root context  plug
      //----------------------------------------------------------------------------
  -   
  +
      protected String rootContext=DEFAULT_ROOT_CONTEXT;
  -   
  +
      public String getRootContext()
      {
         return rootContext;
      }
  -   
  +
      /** the root context must be constant for the lifetime of the service */
  -   public void setRootContext(String name) throws Exception
  +   public void setRootContext(String name)
      {
         log.getCategory().l7dlog(Priority.INFO,SET_ROOT_CONTEXT_0,new Object[]
         {name},null);
         rootContext=name;
      }
  -   
  +
      //----------------------------------------------------------------------------
      // Deployer interface
      //----------------------------------------------------------------------------
  -   
  -   /** we accept .wsr files */
  -   public boolean accepts(DeploymentInfo di) 
  -   {
  -      
  -    return di.url.endsWith(WSR_FILE_EXTENSION);  
  -   }
  -   
  -   /** deploys a given descriptor file, we & axis expect the classes
  -    *  needed to do this in the context classloader of the
  -    *  calling thread
  +
  +   /**
  +    * Provides a filter that decides whether a file can be deployed by
  +    * this deployer based on the filename.  This is for the benefit of
  +    * the {@link org.jboss.deployer.MainDeployer} service.
  +    *
  +    * @return a <tt>FilenameFilter</tt> that only
  +    *         <tt>accept</tt>s files with names that can be
  +    *         deployed by this deployer
       */
  -   protected Element deployDescriptor(URL url, ClassLoader loader) throws 
DeploymentException
  -   {
  -      
  +   public boolean accepts(DeploymentInfo sdi) {
  +    if(sdi.url.getFile().endsWith(WSR_FILE_EXTENSION)) {
  +      try
  +      {
  +         if(sdi.localCl.getResource(WEB_SERVICE_DESCRIPTOR)!=null) {
  +          return true;
  +         }
  +      } catch (Exception e) { }
  +    }
  +      return false;
  +   }
  +
  +  /*
  +   * Init a deployment
  +   *
  +   * parse the XML MetaData.  Init and deploy are separate steps allowing for 
subDeployment
  +   * in between.
  +   *
  +   * @param url    The URL to deploy.
  +   *
  +   * @throws MalformedURLException    Invalid URL
  +   * @throws IOException              Failed to fetch content
  +   * @throws DeploymentException      Failed to deploy
  +   */
  +
  +   public void init(DeploymentInfo sdi)
  +    throws DeploymentException {
  +      try {
  +         URL metaInfos=sdi.localCl.
  +          getResource(WEB_SERVICE_DESCRIPTOR);
  +
  +         sdi.metaData=
  +          XMLUtils.newDocument(metaInfos.openStream());;
  +
  +         //Resolve what to watch
  +         if (sdi.url.getProtocol().startsWith("http"))
  +         {
  +            // We watch the top only, no directory support
  +            sdi.watch = sdi.url;
  +
  +         } else if(sdi.url.getProtocol().startsWith("file"))
  +         {
  +            sdi.watch=metaInfos;
  +         }
  +
  +
  +      } catch (Exception e) {
  +        throw new DeploymentException("problem in init"+e.getMessage());
  +      }
  +   }
  +
  +   /**
  +    * Deploy a given URL.
  +    *
  +    * @param url    The URL to deploy.
  +    *
  +    * @throws MalformedURLException    Invalid URL
  +    * @throws IOException              Failed to fetch content
  +    * @throws DeploymentException      Failed to deploy
  +    */
  +   public void deploy(DeploymentInfo sdi)
  +   throws DeploymentException {
         log.getCategory().l7dlog(Priority.INFO,ABOUT_TO_DEPLOY_AXIS_0,new Object[]
  -      {url},null);
  -      
  -      // remember classloader
  +      {sdi},null);
  +
  +      if(deployments.containsKey(sdi.url)) {
  +        undeploy((DeploymentInfo) deployments.get(sdi.url));
  +      } else {
  +        deployments.put(sdi.url,sdi);
  +      }
  +
  +      // remember old classloader
         ClassLoader previous=Thread.currentThread().getContextClassLoader();
  -      
  +
  +      // build new classloader for naming purposes
  +      URLClassLoader serviceLoader=URLClassLoader.
  +        newInstance(new URL[0],sdi.ucl);
  +
         try
         {
            InitialContext iniCtx = new InitialContext();
            Context envCtx=null;
  -         
  +
            // create a new naming context java:comp/env
            try
            {
               // enter the apartment
  -            Thread.currentThread().setContextClassLoader(loader);
  +            Thread.currentThread().setContextClassLoader(serviceLoader);
               envCtx = (Context) iniCtx.lookup("java:comp");
               envCtx = envCtx.createSubcontext("env");
            } finally
  @@ -337,12 +496,11 @@
               // enter the apartment
               Thread.currentThread().setContextClassLoader(previous);
            }
  -         
  +
            // we create a new message context
            // connected to our singleton servlet
            MessageContext msgContext = new MessageContext((AxisServer) 
axisServerMap.get(getRootContext()));
  -         // parse the stuff into a dom
  -         Document doc = XMLUtils.newDocument( url.openStream() );
  +         Document doc=(Document) sdi.metaData;
            // the original command
            Element root=doc.getDocumentElement();
            // the deployment command document
  @@ -364,7 +522,7 @@
                     throw new DeploymentException(this.EJB_REF_MUST_HAVE_UNIQUE_NAME);
                  if(linkName==null)
                     throw new DeploymentException(this.EJB_REF_MUST_HAVE_UNIQUE_LINK);
  -               
  +
                  Util.bind(envCtx, refName, new LinkRef(linkName));
               } else
               {
  @@ -373,13 +531,12 @@
            }
            // insert command into document
            deployDoc.appendChild(deploy);
  -         
  +
            try
            {
  -            Thread.currentThread().setContextClassLoader(loader);
  +            Thread.currentThread().setContextClassLoader(serviceLoader);
               // and run the axis administrator
               admin.AdminService(msgContext, deployDoc);
  -            return root;
            } catch(AxisFault e)
            {
               throw new DeploymentException(COULD_NOT_DEPLOY_DESCRIPTOR,e);
  @@ -387,23 +544,28 @@
            {
               Thread.currentThread().setContextClassLoader(previous);
            }
  -      } catch(IOException e)
  -      {
  -         throw new DeploymentException(COULD_NOT_DEPLOY_DESCRIPTOR,e);
         } catch(NamingException e)
         {
            throw new DeploymentException(COULD_NOT_DEPLOY_DESCRIPTOR,e);
         }
      }
  -   
  -   /** undeploys a given app */
  -   protected void undeploy(URL url, Object info)
  -   throws DeploymentException
  -   {
  +
  +   /**
  +    * Undeploy a given URL.
  +    *
  +    * @param url    The URL to undeploy.
  +    *
  +    * @throws MalformedURLException    Invalid URL
  +    * @throws IOException              Failed to fetch content
  +    * @throws DeploymentException      Failed to undeploy
  +    */
  +   public void undeploy(DeploymentInfo sdi)
  +   throws DeploymentException {
  +    if(deployments.containsKey(sdi.url)) {
         // we create a new message context
         MessageContext msgContext = new MessageContext((AxisServer) 
axisServerMap.get(getRootContext()));
         // this was the deployment command
  -      Element root=(Element) info;
  +      Element root=(Element) ((Document) sdi.metaData).getDocumentElement();
         // from which we extract an undeployment counterpart
         Document undeployDoc=XMLUtils.newDocument();
         Element undeploy=undeployDoc.createElementNS("m","undeploy");
  @@ -424,7 +586,7 @@
         }
         // put command into document
         undeployDoc.appendChild(undeploy);
  -      
  +
         try
         {
            // and call the administrator
  @@ -433,67 +595,46 @@
         {
            throw new DeploymentException(COULD_NOT_UNDEPLOY,e);
         }
  +    }
      }
  -   
  -   /** deploys a given file/directory/descriptor */
  -   protected Object deploy(URL url) throws DeploymentException
  -   {
  -      
  -      if(url.getFile().toLowerCase().endsWith(XML_FILE_EXTENSION))
  -      {
  -         // pure file deployment
  -         return deployDescriptor(url,new URLClassLoader(new URL[0],
  -         Thread.currentThread().getContextClassLoader()));
  -      } else
  -      {
  -         // wsr archive deployment
  -         try
  -         {
  -            // copy the archive
  -            URL copy=getLocalCopy(url,new DeploymentInfo(url)).toURL();
  -            
  -            // and install new classloader apartment
  -            URLClassLoader newClassLoader=new URLClassLoader(new URL[]
  -            {copy},
  -            Thread.currentThread().getContextClassLoader());
  -            
  -            // extract the deployment descriptor from the file
  -            URL 
deploymentDescriptor=newClassLoader.getResource(WEB_SERVICE_DESCRIPTOR);
  -            
  -            // and  deploy the pure descriptor
  -            if(deploymentDescriptor!=null)
  -               return deployDescriptor(deploymentDescriptor,newClassLoader);
  -            else
  -               throw new DeploymentException(NO_VALID_WEB_SERVICE_DESCRIPTOR);
  -            
  -            
  -         } catch(IOException e)
  -         {
  -            throw new DeploymentException(COULD_NOT_COPY_URL);
  -         }
  -         
  -      }
  -   }
  -   
  +
      //
      // Some helper methods
      //
  -   
  +
      /** work around broken JarURLConnection caching... thx Jules for the hack ;-) */
      private URL fixURL(URL url) throws MalformedURLException
      {
  -     String urlString=url.toString();
  -     //determine the last slash
  -     int index=urlString.lastIndexOf(":")+1;
  -     // no slash, we take the last protocol or drive id
  -     if(index==0) {
  -        // we cannot fix this
  -        return url;
  -     } else {
  -      return new URL(urlString.substring(0,index)+
  +      String urlString=url.toString();
  +      //determine the last slash
  +      int index=urlString.lastIndexOf(":")+1;
  +      // no slash, we take the last protocol or drive id
  +      if(index==0)
  +      {
  +         // we cannot fix this
  +         return url;
  +      } else
  +      {
  +         return new URL(urlString.substring(0,index)+
            "/."+urlString.substring(index));
  -     }
  +      }
      }
   
  +   protected String getDeployDir() {
  +    return System.getProperty("jboss.system.home")+
  +      File.separator+"tmp"+File.separator+"deploy"+File.separator+AXIS_DEPLOY_DIR;
  +   }
  +
  +   protected void copy(InputStream in, OutputStream out)
  +   throws IOException
  +   {
  +
  +      byte[] buffer = new byte[1024];
  +      int read;
  +      while ((read = in.read(buffer)) > 0)
  +      {
  +         out.write(buffer, 0, read);
  +      }
  +   }
   
  -}
  \ No newline at end of file
  +}
  
  
  
  1.2       +3 -1      
contrib/jboss.net/src/main/org/jboss/net/axis/server/AxisServiceMBean.java
  
  Index: AxisServiceMBean.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/contrib/jboss.net/src/main/org/jboss/net/axis/server/AxisServiceMBean.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AxisServiceMBean.java     2001/10/03 13:20:31     1.1
  +++ AxisServiceMBean.java     2002/02/04 09:38:58     1.2
  @@ -5,7 +5,7 @@
   * See terms of license at gnu.org.
   */
   
  -// $Id: AxisServiceMBean.java,v 1.1 2001/10/03 13:20:31 cgjung Exp $
  +// $Id: AxisServiceMBean.java,v 1.2 2002/02/04 09:38:58 cgjung Exp $
    
   package org.jboss.net.axis.server;
   
  @@ -13,7 +13,7 @@
    * Mbean interface to the AxisService 
    * @author <a href="mailto:[EMAIL PROTECTED]";>Christoph G. Jung</a>
    * @created 27. September 2001
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   
   public interface AxisServiceMBean extends org.jboss.deployment.DeployerMBean {    
  @@ -23,4 +23,6 @@
     public void setWarDeployerName(String name);
     public String getRootContext();
     public void setRootContext(String name) throws Exception;
  +  public String getSecurityDomain();
  +  public void setSecurityDomain(String name) throws Exception;
   }
  
  
  
  1.5       +48 -44    
contrib/jboss.net/src/main/org/jboss/net/axis/server/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/contrib/jboss.net/src/main/org/jboss/net/axis/server/Constants.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Constants.java    2002/01/03 04:00:54     1.4
  +++ Constants.java    2002/02/04 09:38:58     1.5
  @@ -5,55 +5,59 @@
    * See terms of license at gnu.org.
    */
   
  -// $Id: Constants.java,v 1.4 2002/01/03 04:00:54 user57 Exp $
  +// $Id: Constants.java,v 1.5 2002/02/04 09:38:58 cgjung Exp $
   
   package org.jboss.net.axis.server;
   
   /**
  - * Some Constants for the axis package.
  - *
  + * Some Constants for the axis package
    * @author <a href="mailto:[EMAIL PROTECTED]";>Christoph G. Jung</a>
    * @created 28. September 2001
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
  -public interface Constants
  -{    
  -    String DOMAIN="jboss";
  -    String NAME = "Axis";
  -    String TYPE="service";
  -    String SERVER_DELEGATE_NAME="JMImplementation:type=MBeanServerDelegate";
  -    String SERVER_ID_ATTRIBUTE="MBeanServerId";
  -    String AXIS_DEPLOYMENT_DESCRIPTOR="META-INF/install-axis.xml";
  -    String AXIS_DEPLOY_DIR="/_axis_/";
  -    String WEB_DEPLOYMENT_DESCRIPTOR="/WEB-INF/web.xml";
  -    String DEPLOY_METHOD_NAME="deploy";
  -    String UNDEPLOY_METHOD_NAME="undeploy";
  -    String STRING_CLASS_NAME="java.lang.String";
  -    String DEFAULT_ROOT_CONTEXT="axis";
  -    String WSR_FILE_EXTENSION=".wsr";
  -    String XML_FILE_EXTENSION=".xml";
  -    String AXIS_ENGINE_ATTRIBUTE="AxisEngine";
  -    String GET_AXIS_SERVER_METHOD_NAME="getAxisServer";
  -    String AXIS_CONFIGURATION_FILE="axis-config.xml";
  -    String WEB_SERVICE_DESCRIPTOR="META-INF/web-service.xml";
  -    
  -    String AXIS_DEPLOYMENT_DESCRIPTOR_NOT_FOUND="The axis deployment descriptor is 
lacking in the service archive!";
  -    String ABOUT_TO_DEPLOY_0_UNDER_CONTEXT_1="About to deploy axis web application 
from {0} under context {1}.";
  -    String AXIS_ALREADY_STARTED="Axis has already been started.";
  -    String ABOUT_TO_UNDEPLOY_0="About to undeploy axis web application from {0}.";
  -    String COULD_NOT_STOP_AXIS="Could not correctly stop Axis.";
  -    String AXIS_ALREADY_STOPPED="Axis has already been stopped.";
  -    String SET_WAR_DEPLOYER_0="Seting WarDeployerName to {0}.";
  -    String SET_ROOT_CONTEXT_0="Seting RootContext to {0}.";
  -    String ABOUT_TO_DEPLOY_AXIS_0="About to deploy axis descriptor {0}.";
  -    String COULD_NOT_DEPLOY_DESCRIPTOR="Could not deploy axis descriptor.";
  -    String COULD_NOT_FIND_AXIS_CONFIGURATION_0="Could not find the axis 
configuration file {0}.";
  -    String NO_VALID_WEB_SERVICE_DESCRIPTOR="Could not find a valid web service 
descriptor.";
  -    String COULD_NOT_DEPLOY="Could not deploy url.";
  -    String COULD_NOT_UNDEPLOY="Could not undeploy url.";
  -    String COULD_NOT_COPY_URL="Could not download url.";
  -    String CANNOT_CHANGE_ROOT_CONTEXT="Cannot change root context while service is 
running. Stop first.";
  -    String AXIS_SERVER_CONTEXT_OCCUPIED="There is already an Axis service running 
under that root context.";
  -    String EJB_REF_MUST_HAVE_UNIQUE_NAME="An ejb-ref element must have a unique 
ejb-ref-name element.";
  -    String EJB_REF_MUST_HAVE_UNIQUE_LINK="An ejb-ref element must have a unique 
ejb-link element.";
  +
  +public interface Constants {
  +
  +    static final String DOMAIN="jboss";
  +    static final String NAME = "Axis";
  +    static final String TYPE="service";
  +    static final String 
SERVER_DELEGATE_NAME="JMImplementation:type=MBeanServerDelegate";
  +    static final String SERVER_ID_ATTRIBUTE="MBeanServerId";
  +    static final String AXIS_DEPLOYMENT_DESCRIPTOR="META-INF/install-axis.xml";
  +    static final String AXIS_DEPLOY_DIR="_axis_";
  +    static final String WEB_DEPLOYMENT_DESCRIPTOR="/WEB-INF/web.xml";
  +    static final String JBOSS_WEB_DEPLOYMENT_DESCRIPTOR="/WEB-INF/jboss-web.xml";
  +    static final String DEPLOY_METHOD_NAME="deploy";
  +    static final String UNDEPLOY_METHOD_NAME="undeploy";
  +    static final String STRING_CLASS_NAME="java.lang.String";
  +    static final String 
DEPLOYMENT_INFO_CLASS_NAME="org.jboss.deployment.DeploymentInfo";
  +    static final String DEFAULT_ROOT_CONTEXT="axis";
  +    static final String WSR_FILE_EXTENSION=".wsr";
  +    static final String XML_FILE_EXTENSION=".xml";
  +    static final String AXIS_ENGINE_ATTRIBUTE="AxisEngine";
  +    static final String GET_AXIS_SERVER_METHOD_NAME="getAxisServer";
  +    static final String AXIS_CONFIGURATION_FILE="axis-config.xml";
  +    static final String WEB_SERVICE_DESCRIPTOR="META-INF/web-service.xml";
  +
  +    static final String AXIS_DEPLOYMENT_DESCRIPTOR_NOT_FOUND="The axis deployment 
descriptor is lacking in the service archive!";
  +    static final String ABOUT_TO_DEPLOY_0_UNDER_CONTEXT_1="About to deploy axis web 
application from {0} under context {1}.";
  +    static final String AXIS_ALREADY_STARTED="Axis has already been started.";
  +    static final String ABOUT_TO_UNDEPLOY_0="About to undeploy axis web application 
from {0}.";
  +    static final String COULD_NOT_STOP_AXIS="Could not correctly stop Axis.";
  +    static final String AXIS_ALREADY_STOPPED="Axis has already been stopped.";
  +    static final String SET_WAR_DEPLOYER_0="Seting WarDeployerName to {0}.";
  +    static final String SET_ROOT_CONTEXT_0="Seting RootContext to {0}.";
  +    static final String SET_SECURITY_DOMAIN_TO_0="Setting Security Domain to {0}.";
  +    static final String ABOUT_TO_DEPLOY_AXIS_0="About to deploy axis descriptor 
{0}.";
  +    static final String COULD_NOT_DEPLOY_DESCRIPTOR="Could not deploy axis 
descriptor.";
  +    static final String COULD_NOT_FIND_AXIS_CONFIGURATION_0="Could not find the 
axis configuration file {0}.";
  +    static final String NO_VALID_WEB_SERVICE_DESCRIPTOR="Could not find a valid web 
service descriptor.";
  +    static final String COULD_NOT_DEPLOY="Could not deploy url.";
  +    static final String COULD_NOT_UNDEPLOY="Could not undeploy url.";
  +    static final String COULD_NOT_COPY_URL="Could not download url.";
  +    static final String CANNOT_CHANGE_ROOT_CONTEXT="Cannot change root context 
while service is running. Stop first.";
  +    static final String AXIS_SERVER_CONTEXT_OCCUPIED="There is already an Axis 
service running under that root context.";
  +    static final String EJB_REF_MUST_HAVE_UNIQUE_NAME="An ejb-ref element must have 
a unique ejb-ref-name element.";
  +    static final String EJB_REF_MUST_HAVE_UNIQUE_LINK="An ejb-ref element must have 
a unique ejb-link element.";
  +
   }
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to