User: mnf999 Date: 01/12/18 19:36:12 Modified: src/main/org/jboss/deployment ServiceDeployer.java Log: Factored out the ServiceDeploymentInfo, rewrote the deployer to do create and start as part of the "page" deployment Revision Changes Path 1.18 +476 -553 jboss/src/main/org/jboss/deployment/ServiceDeployer.java Index: ServiceDeployer.java =================================================================== RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/deployment/ServiceDeployer.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ServiceDeployer.java 2001/12/09 05:24:25 1.17 +++ ServiceDeployer.java 2001/12/19 03:36:11 1.18 @@ -1,9 +1,9 @@ /* - * JBoss, the OpenSource J2EE webOS - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ +* JBoss, the OpenSource J2EE webOS +* +* Distributable under LGPL license. +* See terms of license at gnu.org. +*/ package org.jboss.deployment; @@ -43,289 +43,307 @@ import org.xml.sax.SAXException; /** - * This is the main Service Deployer API. - * - * @see org.jboss.system.Service - * @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a> - * @author <a href="mailto:[EMAIL PROTECTED]";>David Maplesden</a> - * @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a> - * @version $Revision: 1.17 $ <p> - * - * <b>20010830 marc fleury:</b> - * <ul>initial import - * <li> - * </ul> - * - * <p><b>20010905 david maplesden:</b> - * <ul> - * <li>Changed deployment procedure to deploy all listed mbeans, then - * initialise them all before finally starting them all. Changed services - * sets to lists to maintain ordering. - * </ul> - * - * <b>20010908 david jencks</b> - * <ol> - * <li> fixed tabs to spaces and log4j logging. Made the urlToServiceSet - * map actually use the url supplied to deploy. Made postRegister use - * deploy. Made undeploy work, and implemented sar dependency management - * and recursive deploy/undeploy. - * </ol> - * - * <p><b>20010907 david maplesden:</b> - * <ul> - * <li>Added support for "depends" tag - * </ul> - * - */ +* This is the main Service Deployer API. +* +* @see org.jboss.system.Service +* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a> +* @author <a href="mailto:[EMAIL PROTECTED]";>David Maplesden</a> +* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a> +* @version $Revision: 1.18 $ <p> +* +* <b>20010830 marc fleury:</b> +* <ul>initial import +* <li> +* </ul> +* +* <p><b>20010905 david maplesden:</b> +* <ul> +* <li>Changed deployment procedure to deploy all listed mbeans, then +* initialise them all before finally starting them all. Changed services +* sets to lists to maintain ordering. +* </ul> +* +* <b>20010908 david jencks</b> +* <ol> +* <li> fixed tabs to spaces and log4j logging. Made the urlToServiceSet +* map actually use the url supplied to deploy. Made postRegister use +* deploy. Made undeploy work, and implemented sar dependency management +* and recursive deploy/undeploy. +* </ol> +* +* <p><b>20010907 david maplesden:</b> +* <ul> +* <li>Added support for "depends" tag +* </ul> +* +* <p><b>20011210 marc fleury:</b> +* <ul> +* <li>Removing the classpath dependency to explicit jars +* </ul> +* <p><b>20011211 marc fleury:</b> +* <ul> +* <li>rewrite +* </ul> +*/ public class ServiceDeployer - extends DeployerMBeanSupport - implements ServiceDeployerMBean +extends DeployerMBeanSupport +implements ServiceDeployerMBean { // Attributes -------------------------------------------------------- private ObjectName objectName; - + //Find all the deployment info for a url - private final Map urlToSarDeploymentInfoMap = new HashMap(); - + private final Map urlToServiceDeploymentInfoMap = new HashMap(); + //Find what package an mbean came from. private final Map objectNameToSupplyingPackageMap = new HashMap(); - - - + + + // Public -------------------------------------------------------- - + /** - * Gets the Name of the ServiceDeployer object - * - * @return returns "ServiceDeployer" - */ + * Gets the Name of the ServiceDeployer object + * + * @return returns "ServiceDeployer" + */ public String getName() { return "ServiceDeployer"; } - + /** - * Gets the FilenameFilter that the AutoDeployer uses to decide which files - * will be deployed by the ServiceDeployer. Currently .jsr, .sar, and files - * ending in service.xml are accepted. - * - * @return The FileNameFilter for use by the AutoDeployer. - */ + * Gets the FilenameFilter that the AutoDeployer uses to decide which files + * will be deployed by the ServiceDeployer. Currently .jsr, .sar, and files + * ending in service.xml are accepted. + * + * @return The FileNameFilter for use by the AutoDeployer. + */ public FilenameFilter getDeployableFilter() { return - new FilenameFilter() - { - /** - * Determines which files are accepted by the Deployer. - * - * @param dir Directory of candidate file. - * @param filename Filename of candidate file. - * @return Whether candidate file should be deployed by - * this deployer. - */ - public boolean accept(File dir, String filename) - { - filename = filename.toLowerCase(); - return (filename.endsWith(".sar") - || filename.endsWith("service.xml")); - } - }; + new FilenameFilter() + { + /** + * Determines which files are accepted by the Deployer. + * + * @param dir Directory of candidate file. + * @param filename Filename of candidate file. + * @return Whether candidate file should be deployed by + * this deployer. + */ + public boolean accept(File dir, String filename) + { + filename = filename.toLowerCase(); + return (filename.endsWith(".sar") + || filename.endsWith("service.xml")); + } + }; } - - + + /** - * Deploys a package identified by a url string. This stops if a previous - * version exists. The package can be a *service.xml file, a sar service - * archive, or a plain jar or zip file with no deployment descriptor. - * In any case, all classes found in the package or sar subpackages are - * added to the extensible classloader. If there are classpath elements - * in the configuration file, the named packages are loaded - * (in separate classloaders) unless they have been explicitly undeployed, - * in which case deployment of this package is suspended until they have been - * redeployed. Then the mbeans named in the configuration file are created - * using the ServiceController. Dependencies between mbeans are handled by - * the ServiceController. - * - * @param urlString The location of the package to deploy - * @exception MalformedURLException Thrown if a malformed url string is - * supplied. - * @exception IOException Thrown if some read operation failed. - * @exception DeploymentException Thrown if the package could not be - * deployed. - */ + * Deploys a package identified by a url string. This stops if a previous + * version exists. The package can be a *service.xml file, a sar service + * archive, or a plain jar or zip file with no deployment descriptor. + * In any case, all classes found in the package or sar subpackages are + * added to the extensible classloader. If there are classpath elements + * in the configuration file, the named packages are loaded + * (in separate classloaders) unless they have been explicitly undeployed, + * in which case deployment of this package is suspended until they have been + * redeployed. Then the mbeans named in the configuration file are created + * using the ServiceController. Dependencies between mbeans are handled by + * the ServiceController. + * + * @param urlString The location of the package to deploy + * @exception MalformedURLException Thrown if a malformed url string is + * supplied. + * @exception IOException Thrown if some read operation failed. + * @exception DeploymentException Thrown if the package could not be + * deployed. + */ public Object deploy(URL url) - throws MalformedURLException, IOException, DeploymentException + throws MalformedURLException, IOException, DeploymentException { - boolean debug = log.isDebugEnabled(); + ServiceDeploymentInfo sdi = getSdi(url, true); - SarDeploymentInfo sdi = getSdi(url, true); - if (sdi.state == MBEANSLOADED) + if (sdi.state == ServiceDeploymentInfo.MBEANSLOADED) { - if (debug) { - log.debug("document " + url + " is already deployed, undeploy " + - "first if you wish to redeploy"); - } - + log.debug("document " + url + " is already deployed, undeploy first if you wish to redeploy"); return sdi; } - - if (sdi.state == EMPTY || sdi.state == GHOST) + + // Install the files, get the deployment descriptor + if (sdi.state == ServiceDeploymentInfo.EMPTY ) { - deployLocalClasses(url, null, true); - //Let others waiting on our classes finish deploying. - resolveSuspensions(url, sdi); - } // end of if () - - - if(sdi.dd != null){ - boolean suspended = deployNeededPackages(url, sdi); - + // This install everything from this URL and parses the XML dd contained in it + // If the file contains classes these classes are added to the SDI + loadFiles(url); + } + + // The deployment descriptor was loaded by deployLocalClasses + if(sdi.dd != null) + { + // In case there is a dependent classpath defined parse it + // This creates + parseXMLClasspath(url, sdi); + //Copy local directory if local-directory element is present try { NodeList lds = sdi.dd.getElementsByTagName("local-directory"); - if (debug) { - log.debug("about to copy " + lds.getLength() + " local directories"); - } + log.debug("about to copy " + lds.getLength() + " local directories"); for (int i = 0; i< lds.getLength(); i++) { - Element ld = (Element)lds.item(i); - String path = ld.getAttribute("path"); - if (debug) { - log.debug("about to copy local directory at " + path); - } - File jbossHomeDir = new File(System.getProperty("jboss.system.home")); - File localBaseDir = new File(jbossHomeDir, "db"+File.separator); - //Get the url of the local copy from the classloader. - URL localUrl = (URL)sdi.getClassUrls().get(0); - if (debug) { - log.debug("copying from " + localUrl.toString() + path); - log.debug("copying to " + localBaseDir); - } - - inflateJar(localUrl, localBaseDir, path); + Element ld = (Element)lds.item(i); + String path = ld.getAttribute("path"); + log.debug("about to copy local directory at " + path); + File jbossHomeDir = new File(System.getProperty("jboss.system.home")); + File localBaseDir = new File(jbossHomeDir, "db"+File.separator); + //Get the url of the local copy from the classloader. + URL localUrl = (URL)sdi.getClassUrls().get(0); + log.debug("copying from " + localUrl.toString() + path); + log.debug("copying to " + localBaseDir); + + inflateJar(localUrl, localBaseDir, path); } // end of for () - - + + } catch (Exception e) { - log.error("Problem copying local directory", e); + log.error("Problem copying local directory", e); } // end of try-catch - //if we are suspended, we must wait till all classes are available. - if (!suspended) + + // install the MBeans in this descriptor + log.debug("addMBeans: url " + url); + + List mbeans = sdi.mbeans; + mbeans.clear(); + + NodeList nl = sdi.dd.getElementsByTagName("mbean"); + + for (int i = 0; i < nl.getLength(); i++) { - addMBeans(url, sdi); - } // end of if () - + + Element mbean = (Element)nl.item(i); + + log.debug("deploying with ServiceController mbean " + mbean); + + ObjectName service = (ObjectName)invoke( + getServiceControllerName(), + "install", + new Object[]{mbean}, + new String[]{"org.w3c.dom.Element"}); + + if (service != null) + { + mbeans.add(service); + objectNameToSupplyingPackageMap.put(service, url); + } + } + // create the services + Iterator iterator = sdi.mbeans.iterator(); + while (iterator.hasNext()) + { + ObjectName service = (ObjectName) iterator.next(); + + // The service won't be created until explicitely dependent mbeans are created + invoke( + getServiceControllerName(), + "create", + new Object[]{service}, + new String[]{"javax.management.ObjectName"}); + } + + // start the services + Iterator iterator2 = sdi.mbeans.iterator(); + while (iterator2.hasNext()) + { + ObjectName service2 = (ObjectName) iterator2.next(); + + // The service won't be started until explicitely dependent mbeans are started + invoke( + getServiceControllerName(), + "start", + new Object[]{service2}, + new String[]{"javax.management.ObjectName"}); + } } return sdi; } - - private void resolveSuspensions(URL url, SarDeploymentInfo sdi) - throws DeploymentException + + + private ServiceDeploymentInfo loadFiles(URL url) + throws DeploymentException { - Iterator suspensions = (sdi.weSupplyClassesTo).iterator(); - while (suspensions.hasNext()) - { - //check if all suspension dependencies resolved and if so call - //addMBeans on it. - URL suspendedUrl = (URL) suspensions.next(); - SarDeploymentInfo suspendedSdi = getSdi(suspendedUrl, false); - if (suspendedSdi.state != SUSPENDED) - { - throw new DeploymentException("Depending module " + suspendedUrl + " is not marked as suspended when deploying url: " + url); - } // end of if () - - boolean canDeploySuspended = true; - Iterator others = suspendedSdi.weNeedClassesFrom.iterator(); - while (others.hasNext()) - { - URL otherUrl = (URL)others.next(); - SarDeploymentInfo otherSdi = getSdi(otherUrl, false); - if (otherUrl != url && otherSdi.state != LOCALCLASSESLOADED - && otherSdi.state != CLASSESLOADED - && otherSdi.state != MBEANSLOADED) - { - canDeploySuspended = false; - break; - } // end of if () - - } // end of while () - if (canDeploySuspended) - { - addMBeans(suspendedUrl, suspendedSdi); - } // end of if () - } // end of while () - } - - - private SarDeploymentInfo deployLocalClasses(URL url, URL needsme, boolean reloadSuspended) - throws DeploymentException - { - boolean debug = log.isDebugEnabled(); - SarDeploymentInfo sdi = getSdi(url, false); - if (reloadSuspended || sdi.state == EMPTY || sdi.state == GHOST) + ServiceDeploymentInfo sdi = getSdi(url, true); + + if (sdi.state == ServiceDeploymentInfo.EMPTY) { try { - log.info("Deploying: " + url); - - if(url.toString().endsWith("/")) //adding directory to classpath + log.debug("deploying document " + url); + + // A service can be as simple as a directory from which to load classes + if(url.toString().endsWith("/")) { sdi.addClassUrl(url); sdi.createClassLoader(); - sdi.state = CLASSESLOADED; + sdi.state = ServiceDeploymentInfo.CLASSESLOADED; } - else + else // That "service" is a file { - - File localCopy = getLocalCopy(url, sdi); - URL localUrl = localCopy.toURL(); - String localName = localCopy.getName();//just the filename, no path - extractPackages(localUrl, sdi); - if (debug) { - log.debug("jars from deployment: " + sdi.getClassUrls()); - log.debug("xml's from deployment: " + sdi.getXmlUrls()); - } - - //OK, what are we trying to deploy? + + // Create a local copy of that File, the sdi keeps track of the copy directory + File localFile = getLocalCopy(url, sdi); + + // unpack SARs + extractPackages(localFile.toURL(), sdi); + + log.debug("jars from deployment: " + sdi.getClassUrls()); + log.debug("xml's from deployment: " + sdi.getXmlUrls()); + + //OK, what are we trying to deploy? create the Deployement Descriptor + //A plain xml file with mbean classpath elements and mbean config. - if (localName.endsWith("service.xml")) + if (localFile.getName().endsWith("service.xml")) { - sdi.dd = getDocument(localUrl); - sdi.state = LOCALCLASSESLOADED; + sdi.dd = getDocument(localFile.toURL()); + sdi.state = ServiceDeploymentInfo.CLASSESLOADED; } + //a service archive with classes, jars, and META-INF/jboss-service.xml //configuration file - else if (localName.endsWith(".sar")) + else if (localFile.getName().endsWith(".sar")) { sdi.createClassLoader(); - docfound: + docfound: { for (Iterator i = sdi.getXmlUrls().iterator(); i.hasNext();) { URL docUrl = (URL)i.next(); if (docUrl.getFile().endsWith("META-INF/jboss-service.xml")) { + sdi.dd = getDocument(docUrl); + break docfound; } // end of if () - + } // end of for () throw new DeploymentException("No META-INF/jboss-service.xml found in alleged sar!"); } - sdi.state = LOCALCLASSESLOADED; + sdi.state = ServiceDeploymentInfo.CLASSESLOADED; log.debug("got document jboss-service.xml from cl"); } - + //Or maybe its just a jar to be put in the extensible classloader. - else if(localName.endsWith(".jar") - || localName.endsWith(".zip")) + else if(localFile.getName().endsWith(".jar") + || localFile.getName().endsWith(".zip")) { sdi.createClassLoader(); - sdi.state = CLASSESLOADED; + sdi.state = ServiceDeploymentInfo.CLASSESLOADED; } //Not for us. else @@ -336,77 +354,136 @@ } catch (Exception ignored) { - log.error("Problem deploying url " + url + ", no valid service.xml file found.", ignored); - throw new DeploymentException("No valid service.xml file found" + ignored.getMessage()); + log.error("Problem deploying url " + url, ignored); + throw new DeploymentException(ignored.getMessage()); } - + } // end of if (EMPTY) - - //in any case, we may need to add class dependency info - if ((needsme != null) && !sdi.weSupplyClassesTo.contains(needsme)) - { - sdi.weSupplyClassesTo.add(needsme); - } // end of if () - + return sdi; - + } - - private boolean deployNeededPackages(URL url, SarDeploymentInfo sdi) throws DeploymentException + + private void parseXMLClasspath(URL url, ServiceDeploymentInfo sdi) throws DeploymentException { - boolean debug = log.isDebugEnabled(); Document dd = sdi.dd; - Collection weNeedClassesFrom = sdi.weNeedClassesFrom; - weNeedClassesFrom.clear(); - NodeList classpaths = dd.getElementsByTagName("classpath"); - for (int i = 0; i < classpaths.getLength(); i++) - { - Element classpath = (Element)classpaths.item(i); - if (debug) { - log.debug("found classpath " + classpath); + + Collection classpath = sdi.classpath; + classpath.clear(); + + NodeList classpaths = dd.getElementsByTagName("classpath"); + for (int i = 0; i < classpaths.getLength(); i++) + { + Element classpathElement = (Element)classpaths.item(i); + log.debug("found classpath " + classpath); + + //String codebase = System.getProperty("jboss.system.libraryDirectory"); + String codebase = ""; + String archives = ""; + + //Does it specify a codebase? + if (classpathElement != null) + { + + log.debug("setting up classpath " + classpath); + // Load the codebase + codebase = classpathElement.getAttribute("codebase").trim(); + + if ("".equals(codebase)) codebase = "lib/ext"; + + // Do we have a relative codebase? + if (!(codebase.startsWith("http:") || codebase.startsWith("file:"))) + { + // put the jboss/system base in front of it + codebase = System.getProperty("jboss.system.installationURL")+codebase; } - String codebase = ""; - String archives = ""; - - //Does it specify a codebase? - if (classpath != null) + //if codebase is ".", construct codebase from current url. + if (".".equals(codebase)) { - if (debug) { - log.debug("setting up classpath " + classpath); - } - - // Load the codebase - codebase = classpath.getAttribute("codebase").trim(); - - //if codebase is ".", construct codebase from current url. - if (".".equals(codebase)) + //does this work with http??? + // marcf: for http we could just get the substring to the last "/" + codebase = new File(url.getProtocol() + "://" + url.getFile()).getParent(); + } + + // Let's make sure the formatting of the codebase ends with the / + if (codebase.startsWith("file:") && !codebase.endsWith(File.separator)) + { + codebase += File.separator; + } + else if (codebase.startsWith("http:") && !codebase.endsWith("/")) + { + codebase += "/"; + } + log.debug("codebase is " + codebase); + //Load the archives + archives = classpathElement.getAttribute("archives").trim(); + log.debug("archives are " + archives); + } + + if (codebase.startsWith("file:") && archives.equals("*")) + { + try + { + File dir = new File(codebase.substring(5)); + // The patchDir can only be a File one, local + File[] jars = dir.listFiles( + new java.io.FileFilter() + { + /** + * filters for jar and zip files in the local directory. + * + * @param pathname Path to the candidate file. + * @return True if the file is a jar or zip + * file. + */ + public boolean accept(File pathname) + { + String name2 = pathname.getName(); + return name2.endsWith(".jar") || name2.endsWith(".zip"); + } + } + ); + for (int j = 0; jars != null && j < jars.length; j++) { - //does this work with http??? - codebase = new File(url.getProtocol() + "://" + url.getFile()).getParent(); + classpath.add(jars[j].getCanonicalFile().toURL()); } - - // Let's make sure the formatting of the codebase ends with the / - if (codebase.startsWith("file:") && !codebase.endsWith(File.separator)) + } + catch (Exception e) + { + log.error("problem listing files in directory", e); + throw new DeploymentException(e.getMessage()); + } + } + + // We have an archive whatever the codebase go ahead and load the libraries + else if (!archives.equals("")) + { + + // We have a real codebase specified in xml + // We add it to the classpath so we load files from it (http/file will work) + if (!codebase.equals("")) + { + try { - codebase += File.separator; + // Add the codebase to the classpath + classpath.add( new URL(codebase)); } - else if (codebase.startsWith("http:") && !codebase.endsWith("/")) + catch (Exception e2) { - codebase += "/"; - } - if (debug) { - log.debug("codebase is " + codebase); - } + log.error("Couldn't create URL for codebase "+codebase, e2); + throw new DeploymentException(e2.getMessage()); - //Load the archives - archives = classpath.getAttribute("archives").trim(); - if (debug) { - log.debug("archives are " + archives); } } - - if (codebase.startsWith("file:") && archives.equals("*")) + + // Still no codebase? safeguard + if (codebase.equals("")) codebase = System.getProperty("jboss.system.libraryDirectory"); + + if (archives.equals("*") || archives.equals("")) { + // Safeguard + if (!codebase.startsWith("file:") && archives.equals("*")) throw new DeploymentException("No wildcard permitted in http deployment you must specify individual jars"); + try { File dir = new File(codebase.substring(5)); @@ -415,26 +492,22 @@ new java.io.FileFilter() { /** - * filters for jar and zip files in the local directory. - * - * @param pathname Path to the candidate file. - * @return True if the file is a jar or zip - * file. - */ + * filters for jar and zip files in the local directory. + * + * @param pathname Path to the candidate file. + * @return True if the file is a jar or zip + * file. + */ public boolean accept(File pathname) { String name2 = pathname.getName(); return name2.endsWith(".jar") || name2.endsWith(".zip"); } } - ); + ); for (int j = 0; jars != null && j < jars.length; j++) { - File jar = jars[j]; - URL u = jar.getCanonicalFile().toURL(); - if (!weNeedClassesFrom.contains(u)) { - weNeedClassesFrom.add(u); - } // end of if () + classpath.add(jars[j].getCanonicalFile().toURL()); } } catch (Exception e) @@ -443,233 +516,141 @@ throw new DeploymentException(e.getMessage()); } } - - else if(codebase.length() > 0 && archives.equals("")) + + + else // A real archive listing (as opposed to wildcard) { - try - { - URL u = new URL(codebase); - if (!weNeedClassesFrom.contains(u)) - { - weNeedClassesFrom.add(u); - } - } - catch (MalformedURLException mfue) - { - log.error("couldn't resolve package reference: ", mfue); - } - } - - // We have an archive whatever the codebase go ahead and load the libraries - else if (!archives.equals("")) - { - // Still no codebase? get the system default - if (codebase.equals("")) - { - codebase = System.getProperty("jboss.system.libraryDirectory"); - } - - StringTokenizer st = new StringTokenizer(archives, ","); + StringTokenizer jars = new StringTokenizer(archives, ","); //iterate through the packages in archives - while (st.hasMoreTokens()) + while (jars.hasMoreTokens()) { - String jar = st.nextToken().trim(); - String urlString = codebase + jar; - try - { - URL u = new URL(urlString); - if (!weNeedClassesFrom.contains(u)) - { - weNeedClassesFrom.add(u); - } // end of if () - } catch (MalformedURLException mfue) - { - log.error("couldn't resolve package reference: ", mfue); - } // end of try-catch - } - } - - else //codebase is empty and archives is empty - { - throw new DeploymentException("Loading from an empty codebase with no jars specified. Please fix jboss-service.xml in your configuration"); + // The format is simple codebase + jar + try { classpath.add(new URL(codebase +jars.nextToken().trim()));} + + catch (MalformedURLException mfue) { log.error("couldn't resolve package reference: ", mfue);} // end of try-catch + } } } - //Ok, now we've found the list of urls we need... deploy their classes. - Iterator jars = weNeedClassesFrom.iterator(); - boolean suspended = false; - URL neededUrl = null; - while (jars.hasNext()) - { - try - { - neededUrl = (URL)jars.next(); - SarDeploymentInfo jarSdi = getSdi(neededUrl, true); - //find out if any of these were undeployed... if so we can't deploy them nor our mbeans - if (jarSdi.state == GHOST) { - suspended = true; - if (debug) { - log.debug("did not deploy classes for " + neededUrl + ", it's a ghost, we are suspended"); - } - } // end of if () - else - { - deployLocalClasses(neededUrl, url, false); - if (debug) { - log.debug("deployed classes for " + neededUrl); - } - - } // end of else - - } catch (DeploymentException e) { - log.error("problem deploying classes for " + neededUrl, e); - //put in list of failures TODO - } // end of try-catch - - - } // end of while () - return suspended; + + else //codebase is empty and archives is empty but we did have a classpath entry + { + throw new DeploymentException("A classpath entry was declared but no codebase and no jars specified. Please fix jboss-service.xml in your configuration"); + } + } + + //Ok, now we've found the list of urls we need... deploy their classes. + Iterator jars = classpath.iterator(); + + URL neededUrl = null; + while (jars.hasNext()) + { + try + { + + neededUrl = (URL)jars.next(); + + loadFiles(neededUrl); + + log.debug("deployed classes for " + neededUrl); + + + } catch (DeploymentException e) { + log.error("problem deploying classes for " + neededUrl, e); + //put in list of failures TODO + } // end of try-catch + } // end of while () } - + + /** - * Undeploys the package at the url string specified. This will: Undeploy - * packages depending on this one. Stop, destroy, and unregister all the - * specified mbeans Unload this package and packages this package deployed - * via the classpath tag. Keep track of packages depending on this one that - * we undeployed so that they can be redeployed should this one be - * redeployed. - * - * @param urlString The location of the package to be - * undeployed (used to index the packages, not to read service.xml on - * undeploy! - * @exception MalformedURLException Thrown if the url string is not valid. - * @exception IOException Thrown if something could not be read. - * @exception DeploymentException Thrown if the package could not be - * undeployed - */ + * Undeploys the package at the url string specified. This will: Undeploy + * packages depending on this one. Stop, destroy, and unregister all the + * specified mbeans Unload this package and packages this package deployed + * via the classpath tag. Keep track of packages depending on this one that + * we undeployed so that they can be redeployed should this one be + * redeployed. + * + * @param urlString The location of the package to be + * undeployed (used to index the packages, not to read service.xml on + * undeploy! + * @exception MalformedURLException Thrown if the url string is not valid. + * @exception IOException Thrown if something could not be read. + * @exception DeploymentException Thrown if the package could not be + * undeployed + */ public void undeploy(URL url, Object localurlObject) - throws MalformedURLException, IOException, DeploymentException + throws MalformedURLException, IOException, DeploymentException { - log.info("Undeploying: " + url); - - SarDeploymentInfo sdi = getSdi(url, false); - - //first of all, undeploy the depending (via depends tag) packages' mbeans and our mbeans. + log.debug("undeploying document " + url); + + ServiceDeploymentInfo sdi = getSdi(url, false); + + //first of all, undeploy the mbeans. removeMBeans(url, sdi); - - //Now undeploy mbeans from packages we supply classes to. - //Mark them suspended.. they are waiting for our classes to come back. - Iterator suppliedToPackages = sdi.weSupplyClassesTo.iterator(); - while (suppliedToPackages.hasNext()) - { - URL suppliedToPackage = (URL)suppliedToPackages.next(); - SarDeploymentInfo suppliedToSdi = getSdi(suppliedToPackage, false); - if (suppliedToSdi.state == MBEANSLOADED) - { - removeMBeans(suppliedToPackage, suppliedToSdi); - suppliedToSdi.state = SUSPENDED; - } // end of if () - - } // end of while () - - //Now tell packages we need classes from we are leaving: - //if they are ghosts (undeployed but remembering we need them) - //and we are the last dependency, we can forget about them completely. - //if they are not explicitly deployed (use parents isDeployed), - //and we are the last dependency, we can undeploy them also. - Iterator weNeedClassesFrom = sdi.weNeedClassesFrom.iterator(); - while (weNeedClassesFrom.hasNext()) - { - URL packageWeUse = (URL)weNeedClassesFrom.next(); - SarDeploymentInfo packageWeUseInfo = getSdi(packageWeUse, false); - packageWeUseInfo.weSupplyClassesTo.remove(url); - //if we're the last dependency for that package... - if (packageWeUseInfo.weSupplyClassesTo.isEmpty()) - { - //and it was undeployed - if (packageWeUseInfo.state == GHOST) - { - //bye bye - urlToSarDeploymentInfoMap.remove(packageWeUse); - } // end of if () - //or if it was implicitly deployed through a classpath - else if (!isDeployed(packageWeUse.toString())) //getFile??? - { - //bye bye - undeploy(packageWeUse, null); - } // end of if () - } // end of if () - - - } // end of while () - //Ok, we're done with upwards and downwards dependencies: - //we can decide if we're a ghost, and remove our classloader, and maybe ourselves. + + // Those that provide classes must be removed + // FIXME track the dependencies in the service libraries ServiceLibraries.getLibraries().removeClassLoader(sdi.removeClassLoader()); + //delete the copied directories if possible. sdi.cleanup(getLog()); - - //sdi.classloader = null; - if (sdi.weSupplyClassesTo.isEmpty()) - { - //no one is using us, we can disappear without a trace - urlToSarDeploymentInfoMap.remove(url); - } // end of if () - else - { - //someone is still suspended on us, we turn into a ghost so they - //can be deployed if we are redeployed. - sdi.state = GHOST; - } // end of else + //Hey, man, we're all cleaned up! } - - + + /** - * MBeanRegistration interface. Get the mbean server. - * - * @param server Our mbean server. - * @param name our proposed object name. - * @return our actual object name - * @exception java.lang.Exception Thrown if we are supplied an invalid name. - */ + * MBeanRegistration interface. Get the mbean server. + * + * @param server Our mbean server. + * @param name our proposed object name. + * @return our actual object name + * @exception java.lang.Exception Thrown if we are supplied an invalid name. + */ public ObjectName preRegister(MBeanServer server, ObjectName name) - throws java.lang.Exception + throws java.lang.Exception { super.preRegister(server, name); log.debug("ServiceDeployer preregistered with mbean server"); objectName = name == null ? new ObjectName(OBJECT_NAME) : name; - + return objectName; } - - + + /** - * PostRegister initialized the ServiceDeployed mbean and tries to load a - * spine package to set up basic jboss. At the moment the spine package - * should be jboss-service.xml or (deprecated) jboss.jcml. Soon we should - * have an actual sar with the code as well as configuration info. - * - * @param registrationDone Description of Parameter - */ + * PostRegister initialized the ServiceDeployed mbean and tries to load a + * spine package to set up basic jboss. At the moment the spine package + * should be jboss-service.xml or (deprecated) jboss.jcml. Soon we should + * have an actual sar with the code as well as configuration info. + * + * @param registrationDone Description of Parameter + */ public void postRegister(java.lang.Boolean registrationDone) { try { super.postRegister(registrationDone); + //Start us up, which also sets up the deploy temp directory - getServer().invoke(getServiceControllerName(), - "registerAndStartService", - new Object[] {objectName, null}, - new String[] {"javax.management.ObjectName", - "java.lang.String"}); + invoke(getServiceControllerName(), + "create", + new Object[] {objectName}, + new String[] {"javax.management.ObjectName"}); + + invoke(getServiceControllerName(), + "start", + new Object[] {objectName}, + new String[] {"javax.management.ObjectName"}); } catch (Exception e) { log.error("Problem postregistering ServiceDeployer", e); } } - + protected Document getDocument(URL url) - throws DeploymentException + throws DeploymentException { try { @@ -694,69 +675,34 @@ throw new DeploymentException(e.getMessage()); } // end of try-catch } - - + + // Private -------------------------------------------------------- - private void addMBeans(URL url, SarDeploymentInfo sdi) throws DeploymentException + + + + private void removeMBeans(URL url, ServiceDeploymentInfo sdi) throws DeploymentException { - boolean debug = log.isDebugEnabled(); - if (debug) { - log.debug("addMBeans: url " + url); - } - - List mbeans = sdi.mbeans; - mbeans.clear(); - NodeList nl = sdi.dd.getElementsByTagName("mbean"); - for (int i = 0; i < nl.getLength(); i++) - { - - Element mbean = (Element)nl.item(i); - if (debug) { - log.debug("deploying with ServiceController mbean " + mbean); - } - ObjectName service = (ObjectName)invoke(getServiceControllerName(), - "deploy", - new Object[]{mbean}, - new String[]{"org.w3c.dom.Element"}); - // marcf: I don't think we should keep track and undeploy... - //david jencks what do you mean by this??? - if (service != null) - { - mbeans.add(service); - objectNameToSupplyingPackageMap.put(service, url); - } - } - sdi.state = MBEANSLOADED; - } - - - private void removeMBeans(URL url, SarDeploymentInfo sdi) throws DeploymentException - { - boolean debug = log.isDebugEnabled(); - if (debug) { - log.debug("removeMBeans: url " + url); - } - + log.debug("removeMBeans: url " + url); List services = sdi.mbeans; int lastService = services.size(); //stop services in reverse order. for (ListIterator i = services.listIterator(lastService); i.hasPrevious();) { ObjectName name = (ObjectName)i.previous(); - if (debug) { - log.debug("undeploying mbean " + name); - } - + log.debug("undeploying mbean " + name); invoke(getServiceControllerName(), - "undeploy", - new Object[] {name}, - new String[] {"javax.management.ObjectName"}); + "undeploy", + new Object[] {name}, + new String[] {"javax.management.ObjectName"}); //we don't supply it any more, maybe someone else will later. objectNameToSupplyingPackageMap.remove(name); } - sdi.state = CLASSESLOADED; + sdi.state = ServiceDeploymentInfo.CLASSESLOADED; } - + + + /** * Parse an object name from the given element attribute 'name'. * @@ -773,14 +719,14 @@ String name = ((org.w3c.dom.Text)element.getFirstChild()).getData().trim(); if (name == null || name.trim().equals("")) { throw new org.jboss.system.ConfigurationException - ("Depends element must have a value."); + ("Name element must have a value."); } return new ObjectName(name); } - - + + /* Calls server.invoke, unwraps exceptions, and returns server output - */ + */ private Object invoke(ObjectName name, String method, Object[] args, String[] sig) { try @@ -813,17 +759,17 @@ } return null; } - - - private SarDeploymentInfo getSdi(URL url, boolean createIfMissing) throws DeploymentException + + + private ServiceDeploymentInfo getSdi(URL url, boolean createIfMissing) throws DeploymentException { - SarDeploymentInfo sdi = (SarDeploymentInfo)urlToSarDeploymentInfoMap.get(url); + ServiceDeploymentInfo sdi = (ServiceDeploymentInfo)urlToServiceDeploymentInfoMap.get(url); if (sdi == null) { if (createIfMissing) { - sdi = new SarDeploymentInfo(url); - urlToSarDeploymentInfoMap.put(url, sdi); + sdi = new ServiceDeploymentInfo(url); + urlToServiceDeploymentInfoMap.put(url, sdi); } // end of if () else { @@ -831,29 +777,6 @@ } // end of else } return sdi; - } - - private static final int EMPTY = 0; - private static final int LOCALCLASSESLOADED = 1; - private static final int CLASSESLOADED = 2; - private static final int MBEANSLOADED = 3; - private static final int SUSPENDED = 4; - private static final int GHOST = 5; //undeployed but packages are suspended on us. - - - protected static class SarDeploymentInfo - extends DeployerMBeanSupport.DeploymentInfo - { - Collection weNeedClassesFrom = new ArrayList(); - Collection weSupplyClassesTo = new ArrayList(); - List mbeans = new ArrayList(); - Document dd; - int state = EMPTY; - - public SarDeploymentInfo(URL key) - { - super(key); - } } }
_______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
