CVS: jcontainer/loom/engine/src/java/org/jcontainer/loom/components/extensions DefaultExtensionManager.java,1.14,1.15
Peter Donald <pdonald-yCVjj/[email protected]>
| Newsgroups | gmane.comp.java.jcontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/extensions
In directory hogshead.codehaus.org:/tmp/cvs-serv22919/engine/src/java/org/jcontainer/loom/components/extensions
Modified Files:
DefaultExtensionManager.java
Log Message:
Dont passing in apps/work/etc directorys via ResourceLocator - rather treat them as configuration variables loaded from kernel.xml
Index: DefaultExtensionManager.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/extensions/DefaultExtensionManager.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- DefaultExtensionManager.java 29 Oct 2003 21:55:26 -0000 1.14
+++ DefaultExtensionManager.java 29 Oct 2003 22:20:41 -0000 1.15
@@ -89,11 +89,11 @@
import java.io.File;
import java.util.ArrayList;
import org.jcontainer.dna.Active;
-import org.jcontainer.dna.Composable;
+import org.jcontainer.dna.Configurable;
+import org.jcontainer.dna.Configuration;
+import org.jcontainer.dna.ConfigurationException;
import org.jcontainer.dna.LogEnabled;
import org.jcontainer.dna.Logger;
-import org.jcontainer.dna.MissingResourceException;
-import org.jcontainer.dna.ResourceLocator;
import org.jcontainer.loom.components.extensions.pkgmgr.ExtensionManager;
import org.jcontainer.loom.components.extensions.pkgmgr.OptionalPackage;
import org.realityforge.salt.i18n.ResourceManager;
@@ -107,33 +107,31 @@
*/
public class DefaultExtensionManager
extends org.jcontainer.loom.components.extensions.pkgmgr.impl.DefaultExtensionManager
- implements LogEnabled, Composable, Active, ExtensionManager
+ implements LogEnabled, Configurable, Active, ExtensionManager
{
private final static Resources REZ =
ResourceManager.getPackageResources( DefaultExtensionManager.class );
private Logger m_logger;
- private File m_rawPath;
+ private File m_extDir;
public void enableLogging( final Logger logger )
{
m_logger = logger;
}
- /**
- * @dna.dependency type="File" qualifier="home"
- */
- public void compose( ResourceLocator locator )
- throws MissingResourceException
+ public void configure( Configuration configuration )
+ throws ConfigurationException
{
- final File home = (File)locator.lookup( File.class.getName() + "/home" );
- m_rawPath = new File( home, "ext" );
+ final String extDir =
+ configuration.getChild( "extensions-dir" ).getValue();
+ m_extDir = new File( extDir );
}
public void initialize()
throws Exception
{
- setPath( new File[]{m_rawPath} );
+ setPath( new File[]{m_extDir} );
rescanPath();
}