svn commit: r450507 - in /incubator/ode/trunk: axis2/src/main/java/org/apache/ode/axis2/ bpel-runtime/src/main/java/org/apache/ode/bpel/deploy/ bpel-runtime/src/main/java/org/apache/ode/bpel/engine/

[mriou]

Author: mriou
Date: Wed Sep 27 10:10:29 2006
New Revision: 450507

URL: http://svn.apache.org/viewvc?view=rev&rev=450507
Log:
Fixed one more bug in deployment. The ode-deployed.dat now contains relative 
paths to the deployed units.

Modified:
    incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
    
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/deploy/DeploymentManagerImpl.java
    
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java

Modified: 
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?view=diff&rev=450507&r1=450506&r2=450507
==============================================================================
--- incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java 
(original)
+++ incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java 
Wed Sep 27 10:10:29 2006
@@ -417,7 +417,8 @@
 
         _server = new BpelServerImpl();
         _server.setAutoActivate(true);
-
+        File deploymentDir = new File(_workRoot, "processes");
+        _server.setDeployDir(deploymentDir.getAbsolutePath());
     
         _executorService = Executors.newCachedThreadPool();
         _scheduler = new QuartzSchedulerImpl();

Modified: 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/deploy/DeploymentManagerImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/deploy/DeploymentManagerImpl.java?view=diff&rev=450507&r1=450506&r2=450507
==============================================================================
--- 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/deploy/DeploymentManagerImpl.java
 (original)
+++ 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/deploy/DeploymentManagerImpl.java
 Wed Sep 27 10:10:29 2006
@@ -59,7 +59,6 @@
 
     public DeploymentUnitImpl createDeploymentUnit(File 
deploymentUnitDirectory) {
         read();
-        
         _rwLock.writeLock().lock();
         try {
             DeploymentUnitImpl du = new 
DeploymentUnitImpl(deploymentUnitDirectory);
@@ -73,12 +72,10 @@
 
     public void remove(DeploymentUnitImpl du) {
         read();
-        
         _rwLock.writeLock().lock();
         try {
             if (!_knownDeployments.remove(du))
                 return;
-
             write();
             rm(du.getDeployDir());
         } finally {
@@ -88,7 +85,6 @@
 
     public Collection<DeploymentUnitImpl> getDeploymentUnits() {
         read();
-        
         _rwLock.writeLock().lock();
         try {
             return new ArrayList<DeploymentUnitImpl>(_knownDeployments);
@@ -117,7 +113,6 @@
      * 
      */
     private void read() {
-
         _rwLock.writeLock().lock();
         try {
             if (!_deployStateFile.exists()) {
@@ -126,14 +121,13 @@
             }
 
             if (_deployStateFile.lastModified() > _lastRead) {
-                
                 LineNumberReader reader = new LineNumberReader(new 
FileReader(_deployStateFile));
                 _knownDeployments.clear();
                 try {
                     String lin;
                     while ((lin = reader.readLine()) != null) {
                         try {
-                        _knownDeployments.add(new DeploymentUnitImpl(new 
File(lin)));
+                        _knownDeployments.add(new DeploymentUnitImpl(new 
File(_deployStateFile.getParentFile(), lin)));
                         } catch (Exception ex) {
                             __log.debug("Failed to load DU (skipping): " + 
lin,ex);
                             ; // skip it. 
@@ -144,7 +138,6 @@
                 } finally {
                     reader.close();
                 }
-
             }
         } catch (IOException ioex) {
             throw new RuntimeException(ioex);
@@ -163,7 +156,7 @@
             PrintWriter writer = new PrintWriter(_deployStateFile);
             try {
                 for (DeploymentUnitImpl du : _knownDeployments) {
-                    writer.println(du.getDeployDir().toString());
+                    writer.println(du.getDeployDir().getName());
                 }
             } finally {
                 writer.close();

Modified: 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java?view=diff&rev=450507&r1=450506&r2=450507
==============================================================================
--- 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
 (original)
+++ 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
 Wed Sep 27 10:10:29 2006
@@ -836,4 +836,8 @@
        _deploymentManager = dm;
     }
 
+    public void setDeployDir(String deployDir) {
+        this._deployDir = deployDir;
+    }
+
 }