CVS: plexus-components/workflow/src/java/org/apache/plexus/workflow DefaultWfms.java,1.1.1.1,1.2

Update of /cvsroot/plexus/plexus-components/workflow/src/java/org/apache/plexus/workflow
In directory eng.werken.com:/tmp/cvs-serv10931/src/java/org/apache/plexus/workflow

Modified Files:
	DefaultWfms.java 
Log Message:
o Conversion to plexus 0.4.


Index: DefaultWfms.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/workflow/src/java/org/apache/plexus/workflow/DefaultWfms.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- DefaultWfms.java	15 Feb 2003 03:52:29 -0000	1.1.1.1
+++ DefaultWfms.java	28 Apr 2003 01:54:57 -0000	1.2
@@ -2,24 +2,23 @@
 
 import com.werken.werkflow.Wfms;
 import com.werken.werkflow.WfmsRuntime;
-import com.werken.werkflow.definition.fundamental.FundamentalDefinitionLoader;
-import com.werken.werkflow.definition.ProcessDefinition;
 import com.werken.werkflow.admin.WfmsAdmin;
+import com.werken.werkflow.definition.ProcessDefinition;
 import com.werken.werkflow.engine.WorkflowEngine;
 import com.werken.werkflow.log.AvalonLog;
 import com.werken.werkflow.service.SimpleWfmsServices;
 import com.werken.werkflow.service.caserepo.CaseRepository;
 import com.werken.werkflow.service.messaging.MessagingManager;
-
+import com.werken.werkflow.syntax.fundamental.FundamentalDefinitionLoader;
 import org.apache.avalon.framework.activity.Initializable;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.plexus.service.Serviceable;
-import org.apache.plexus.service.ServiceBroker;
 import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
 import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.plexus.logging.AbstractLogEnabled;
 
 import java.io.File;
 
@@ -28,7 +27,7 @@
     implements Wfms, Serviceable, Configurable, Initializable, ThreadSafe
 {
     private WorkflowEngine engine;
-    private ServiceBroker serviceBroker;
+    private ServiceManager serviceManager;
     private Configuration configuration;
 
     public DefaultWfms()
@@ -50,15 +49,10 @@
         return getEngine().getRuntime();
     }
 
-    public void service(ServiceBroker serviceBroker)
+    public void service(ServiceManager serviceManager)
         throws ServiceException
     {
-        this.serviceBroker = serviceBroker;
-    }
-
-    public ServiceBroker getServiceBroker()
-    {
-        return this.serviceBroker;
+        this.serviceManager = serviceManager;
     }
 
     public void configure(Configuration configuration)
@@ -82,10 +76,7 @@
             throw new Exception( "no <case-repo> specified" );
         }
 
-        String caseRepoId = caseRepoConfig.getValue();
-
-        CaseRepository caseRepo = (CaseRepository) getServiceBroker().lookup( CaseRepository.ROLE,
-                                                                              caseRepoId );
+        CaseRepository caseRepo = (CaseRepository) serviceManager.lookup( CaseRepository.ROLE );
 
         String messagingManagerId = getConfiguration().getChild( "messaging-manager" ).getValue();
 
@@ -94,8 +85,8 @@
             throw new Exception( "no <messaging-manager> specified" );
         }
 
-        MessagingManager messagingManager = (MessagingManager) getServiceBroker().lookup( MessagingManager.ROLE,
-                                                                                          messagingManagerId );
+        MessagingManager messagingManager = (MessagingManager) serviceManager.lookup( MessagingManager.ROLE );
+
         SimpleWfmsServices services = new SimpleWfmsServices();
 
         services.setCaseRepository( caseRepo );
@@ -125,7 +116,8 @@
             if ( file.isDirectory() )
             {
                 getLogger().info( "Handling directory: " + file );
-                ProcessDefinition[] pd = fdl.loadDirectoryFlowArchive( file );
+
+                ProcessDefinition[] pd = fdl.load( file.toURL() ).getProcessDefinitions();
 
                 for ( int j = 0; j < pd.length; j++ )
                 {