Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 72620 invoked from network); 21 Jun 2002 03:01:17 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 21 Jun 2002 03:01:17 -0000 Received: (qmail 7746 invoked by uid 97); 21 Jun 2002 03:01:29 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 7727 invoked by uid 97); 21 Jun 2002 03:01:28 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 7707 invoked by uid 97); 21 Jun 2002 03:01:27 -0000 X-Antivirus: nagoya (v4198 created Apr 24 2002) Date: 21 Jun 2002 03:01:09 -0000 Message-ID: <20020621030109.16007.qmail@icarus.apache.org> From: donaldp@apache.org To: jakarta-ant-myrmidon-cvs@apache.org Subject: cvs commit: jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/executor DefaultExecutionFrame.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N donaldp 2002/06/20 20:01:09 Modified: container/src/java/org/apache/myrmidon/components/executor DefaultExecutionFrame.java Log: Rework the ugly hack so that scoping occurs in frame in hardwired ugly manner. Revision Changes Path 1.20 +33 -14 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/executor/DefaultExecutionFrame.java Index: DefaultExecutionFrame.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/executor/DefaultExecutionFrame.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- DefaultExecutionFrame.java 21 Jun 2002 00:45:16 -0000 1.19 +++ DefaultExecutionFrame.java 21 Jun 2002 03:01:09 -0000 1.20 @@ -17,6 +17,11 @@ import org.apache.myrmidon.interfaces.event.TaskEventManager; import org.apache.myrmidon.interfaces.executor.ExecutionFrame; import org.apache.myrmidon.interfaces.property.PropertyStore; +import org.apache.myrmidon.interfaces.service.AntServiceKernel; +import org.apache.myrmidon.interfaces.type.TypeManager; +import org.apache.myrmidon.interfaces.type.TypeRegistry; +import org.apache.myrmidon.interfaces.role.RoleManager; +import org.apache.myrmidon.interfaces.role.RoleRegistry; /** * Frames in which tasks are executed. @@ -122,25 +127,39 @@ public ExecutionFrame createPartition( final String name, final File baseDirectory ) { - final String newName = getName() + "/" + name; - - final DefaultServiceManager dsm = new DefaultServiceManager( m_serviceManager ); + //What an UGLY Hack!!! try { - //What an UGLY Hack!!! - final PropertyStore basePropertyStore = - (PropertyStore)m_serviceManager.lookup( PropertyStore.ROLE ); - final PropertyStore propertyStore = basePropertyStore.createChildStore(); - dsm.put( PropertyStore.ROLE, propertyStore ); + final PropertyStore basePS = (PropertyStore)lookup( PropertyStore.ROLE ); + final PropertyStore ps = basePS.createChildStore(); + + final RoleManager baseRM = (RoleManager)lookup( RoleManager.ROLE ); + final RoleManager rm = baseRM; + + final TypeManager baseTM = (TypeManager)lookup( TypeManager.ROLE ); + final TypeManager tm = baseTM.getChildTypeManager( rm ); + + final AntServiceKernel baseSK = (AntServiceKernel)lookup( AntServiceKernel.ROLE ); + final AntServiceKernel sk = baseSK.createChild(); + + final DefaultServiceManager dsm = new DefaultServiceManager( m_serviceManager ); + dsm.put( PropertyStore.ROLE, ps ); + dsm.put( AntServiceKernel.ROLE, sk ); + + dsm.put( RoleManager.ROLE, rm ); + dsm.put( RoleRegistry.ROLE, rm ); + + dsm.put( TypeManager.ROLE, tm ); + dsm.put( TypeRegistry.ROLE, tm ); + + return new DefaultExecutionFrame( getName() + "/" + name, + baseDirectory, + dsm ); } - catch( final ServiceException se ) + catch( final TaskException se ) { throw new IllegalStateException( se.toString() ); } - - return new DefaultExecutionFrame( newName, - baseDirectory, - dsm ); } public ExecutionFrame createChildFrame( String name ) -- To unsubscribe, e-mail: For additional commands, e-mail: