User: cgjung  
  Date: 02/02/07 01:49:32

  Modified:    jboss.net/src/main/org/jboss/net/axis/server
                        AxisService.java Constants.java
  Log:
  jboss.net runs again (given two pending patches to the server module).
  
  Revision  Changes    Path
  1.7       +18 -7     
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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AxisService.java  4 Feb 2002 09:38:58 -0000       1.6
  +++ AxisService.java  7 Feb 2002 09:49:32 -0000       1.7
  @@ -5,7 +5,7 @@
    * See terms of license at gnu.org.
    */
   
  -// $Id: AxisService.java,v 1.6 2002/02/04 09:38:58 cgjung Exp $
  +// $Id: AxisService.java,v 1.7 2002/02/07 09:49:32 cgjung Exp $
   
   package org.jboss.net.axis.server;
   
  @@ -66,7 +66,7 @@
    *   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.6 $
  + *   @version $Revision: 1.7 $
    *   Change notes:
    *   <ul>
    *     <li> 01.02.02: CGJ, Adapted to jboss3.0.0DR1 deployment changes. Arrgh! <li>
  @@ -244,8 +244,13 @@
         // we fake a new deploymentinfo for the war deployer
         myDeploymentInfo.webContext=rootContext;
   
  -      // Call the main deployer through the JMX server
  -      Object webApplication=
  +      // Call the war deployer through the JMX server to initialise
  +      // and deploy the info
  +      getServer().invoke(new ObjectName(getWarDeployerName()),
  +      INIT_METHOD_NAME, new Object[]
  +      {myDeploymentInfo},new String[]
  +      {DEPLOYMENT_INFO_CLASS_NAME});
  +
         getServer().invoke(new ObjectName(getWarDeployerName()),
         DEPLOY_METHOD_NAME, new Object[]
         {myDeploymentInfo},new String[]
  @@ -429,10 +434,16 @@
      public void init(DeploymentInfo sdi)
       throws DeploymentException {
         try {
  -         URL metaInfos=sdi.localCl.
  -          getResource(WEB_SERVICE_DESCRIPTOR);
  +        URL metaInfos=null;
  +
  +        if(sdi.metaData==null) {
  +            metaInfos=sdi.localCl.
  +              getResource(WEB_SERVICE_DESCRIPTOR);
  +        } else {
  +          metaInfos=(URL) sdi.metaData;
  +        }
   
  -         sdi.metaData=
  +        sdi.metaData=
             XMLUtils.newDocument(metaInfos.openStream());;
   
            //Resolve what to watch
  
  
  
  1.6       +4 -8      
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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Constants.java    4 Feb 2002 09:38:58 -0000       1.5
  +++ Constants.java    7 Feb 2002 09:49:32 -0000       1.6
  @@ -5,7 +5,7 @@
    * See terms of license at gnu.org.
    */
   
  -// $Id: Constants.java,v 1.5 2002/02/04 09:38:58 cgjung Exp $
  +// $Id: Constants.java,v 1.6 2002/02/07 09:49:32 cgjung Exp $
   
   package org.jboss.net.axis.server;
   
  @@ -13,12 +13,12 @@
    * Some Constants for the axis package
    * @author <a href="mailto:[EMAIL PROTECTED]";>Christoph G. Jung</a>
    * @created 28. September 2001
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   
  -public interface Constants {
  +public interface Constants extends org.jboss.net.Constants {
   
  -    static final String DOMAIN="jboss";
  +    static final String DOMAIN="jboss.net";
       static final String NAME = "Axis";
       static final String TYPE="service";
       static final String 
SERVER_DELEGATE_NAME="JMImplementation:type=MBeanServerDelegate";
  @@ -27,10 +27,6 @@
       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";
  
  
  

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

Reply via email to