Title: Nachricht
sorry, the second diff was wrong:
 

RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/deployment/MainDeployer.java,v

retrieving revision 1.9

diff -r1.9 MainDeployer.java

365c365,371

< public void deploy(DeploymentInfo deployment)

---

> /** deploys an already given deployment structure

> * works in two phases:

> * - first sets up the classloaders

> * - then starts the modules (the actual deploy action)

> */

>

> public void deploy(DeploymentInfo deployment)

367,368c373,377

< {

< boolean debug = log.isDebugEnabled();

---

> {

> if(preDeploy(deployment)) {

> doDeploy(deployment);

> }

> }

370,373c379,386

< try {

< // If we are already deployed return

< if (deployments.containsKey(deployment.url)) return;

<

---

> /** first phase of deployment: set up the classloaders */

> protected boolean preDeploy(DeploymentInfo deployment) throws DeploymentException {

> // If we are already deployed return

> if (deployments.containsKey(deployment.url)) {

> return false;

> } else {

> boolean debug = log.isDebugEnabled();

> try {

375c388

<

---

>

378c391

<

---

>

381,393d393

<

< // What deployer is able to deploy this file

< findDeployer(deployment);

<

< if(deployment.deployer != null) deployment.deployer.init(deployment);

<

< // create subdeployments as needed

< deploySubPackages(deployment);

<

< // Deploy this SDI, if it is a deployable type

< if (deployment.deployer != null) deployment.deployer.deploy(deployment);

<

< deployment.status="Deployed";

395,400c395,399

< if (debug) {

< log.debug("Done deploying " + deployment.shortName);

< }

< }

< catch (DeploymentException e)

< {

---

> // proceed with second phase

> return true;

> }

> catch (DeploymentException e)

> {

402c401

<

---

>

404,406c403,405

< }

< finally

< {

---

> }

> finally

> {

409c408

<

---

>

412c411

<

---

>

418,419c417,418

< log.debug("Watching new file: " + deployment.url);

< }

---

> log.debug("Watching new file: " + deployment.url);

> }

420a420

> }

423c423,453

<

---

>

> /** second phase: perform the actual deployment */

> protected void doDeploy(DeploymentInfo deployment) throws DeploymentException {

> try{

> boolean debug = log.isDebugEnabled();

>

> // What deployer is able to deploy this file

> findDeployer(deployment);

>

> if(deployment.deployer != null) deployment.deployer.init(deployment);

>

> // create subdeployments as needed

> deploySubPackages(deployment);

>

> // Deploy this SDI, if it is a deployable type

> if (deployment.deployer != null) deployment.deployer.deploy(deployment);

>

> deployment.status="Deployed";

>

> if (debug) {

> log.debug("Done deploying " + deployment.shortName);

> }

> }

> catch (DeploymentException e)

> {

> deployment.status="Deployment FAILED reason: "+e.getMessage();

>

> throw e;

> }

> }

>

611,612c641,646

< subDeployments.add(sub);

<

---

> // only the classloaders are prepared at this time

> // second-phase deployment follows later

> if(preDeploy(sub)) {

> subDeployments.add(sub);

> }

>

641c675

< try{ deploy((DeploymentInfo) lt.next());}

---

> try{ doDeploy((DeploymentInfo) lt.next());}

 

Reply via email to