donaldp 2002/07/13 22:44:22
Modified: lib excalibur-extension-1.0a.jar
src/conf kernel.xml
src/java/org/apache/avalon/phoenix/components/classloader
DefaultClassLoaderManager.java
src/java/org/apache/avalon/phoenix/components/embeddor
ManagementRegistration.java
src/java/org/apache/avalon/phoenix/components/extensions
DefaultExtensionManager.java
Log:
Update to location of new ExtensionManager code.
Revision Changes Path
1.8 +237 -212 jakarta-avalon-phoenix/lib/excalibur-extension-1.0a.jar
<<Binary file>>
1.14 +7 -7 jakarta-avalon-phoenix/src/conf/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/conf/kernel.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kernel.xml 13 Jul 2002 21:39:31 -0000 1.13
+++ kernel.xml 14 Jul 2002 05:44:22 -0000 1.14
@@ -27,11 +27,11 @@
</component>
-->
- <!-- There are two kernels
- org.apache.avalon.phoenix.components.kernel.DefaultKernel
+ <!-- There are two kernels
+ org.apache.avalon.phoenix.components.kernel.DefaultKernel
- The default one.
- org.apache.avalon.phoenix.components.kernel.beanshell.BeanShellKernel
- - One with a beanshell view at the application level.
+ org.apache.avalon.phoenix.components.kernel.beanshell.BeanShellKernel
+ - One with a beanshell view at the application level.
-->
<component role="org.apache.avalon.phoenix.interfaces.Kernel"
class="@KERNEL-CLASS@"
@@ -65,12 +65,12 @@
<component role="org.apache.avalon.phoenix.interfaces.ClassLoaderManager"
class="org.apache.avalon.phoenix.components.classloader.DefaultClassLoaderManager"
logger="classes"/>
- <component role="org.apache.avalon.excalibur.extension.PackageRepository"
+ <component
role="org.apache.avalon.excalibur.packagemanager.ExtensionManager"
class="org.apache.avalon.phoenix.components.extensions.DefaultExtensionManager"
logger="packages"/>
<!--
- <component role="org.apache.avalon.excalibur.extension.PackageRepository"
- class="org.apache.avalon.excalibur.extension.NoopPackageRepository"
+ <component
role="org.apache.avalon.excalibur.packagemanager.ExtensionManager"
+
class="org.apache.avalon.excalibur.packagemanager.impl.NoopPackageRepository"
logger="packages"/>
-->
</embeddor>
1.36 +5 -5
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java
Index: DefaultClassLoaderManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- DefaultClassLoaderManager.java 28 Jun 2002 07:57:02 -0000 1.35
+++ DefaultClassLoaderManager.java 14 Jul 2002 05:44:22 -0000 1.36
@@ -16,9 +16,9 @@
import java.util.Arrays;
import java.util.jar.Manifest;
import org.apache.avalon.excalibur.extension.Extension;
-import org.apache.avalon.excalibur.extension.OptionalPackage;
-import org.apache.avalon.excalibur.extension.PackageManager;
-import org.apache.avalon.excalibur.extension.PackageRepository;
+import org.apache.avalon.excalibur.packagemanager.OptionalPackage;
+import org.apache.avalon.excalibur.packagemanager.PackageManager;
+import org.apache.avalon.excalibur.packagemanager.ExtensionManager;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.configuration.Configuration;
@@ -87,8 +87,8 @@
public void service( final ServiceManager serviceManager )
throws ServiceException
{
- final PackageRepository packageRepository =
- (PackageRepository)serviceManager.lookup( PackageRepository.ROLE );
+ final ExtensionManager packageRepository =
+ (ExtensionManager)serviceManager.lookup( ExtensionManager.ROLE );
m_packageManager = new PackageManager( packageRepository );
}
1.3 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/ManagementRegistration.java
Index: ManagementRegistration.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/ManagementRegistration.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ManagementRegistration.java 13 Jul 2002 10:03:29 -0000 1.2
+++ ManagementRegistration.java 14 Jul 2002 05:44:22 -0000 1.3
@@ -9,7 +9,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.excalibur.extension.PackageRepository;
+import org.apache.avalon.excalibur.packagemanager.ExtensionManager;
import org.apache.avalon.phoenix.interfaces.ConfigurationRepository;
import org.apache.avalon.phoenix.interfaces.Deployer;
import org.apache.avalon.phoenix.interfaces.DeployerMBean;
@@ -33,7 +33,7 @@
"Kernel",
new Class[]{KernelMBean.class} );
public static final ManagementRegistration EXTENSION_MANAGER =
- new ManagementRegistration( PackageRepository.ROLE,
+ new ManagementRegistration( ExtensionManager.ROLE,
"ExtensionManager",
new Class[]{ExtensionManagerMBean.class} );
public static final ManagementRegistration EMBEDDOR =
1.3 +5 -6
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/extensions/DefaultExtensionManager.java
Index: DefaultExtensionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/extensions/DefaultExtensionManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultExtensionManager.java 14 Jul 2002 01:36:29 -0000 1.2
+++ DefaultExtensionManager.java 14 Jul 2002 05:44:22 -0000 1.3
@@ -8,8 +8,7 @@
package org.apache.avalon.phoenix.components.extensions;
import java.io.File;
-import org.apache.avalon.excalibur.extension.DefaultPackageRepository;
-import org.apache.avalon.excalibur.extension.PackageRepository;
+import org.apache.avalon.excalibur.packagemanager.ExtensionManager;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.logger.LogEnabled;
@@ -24,9 +23,9 @@
* @version $Revision$ $Date$
*/
public class DefaultExtensionManager
- extends DefaultPackageRepository
+ extends org.apache.avalon.excalibur.packagemanager.impl.DefaultExtensionManager
implements LogEnabled, Parameterizable, Initializable, Disposable,
- PackageRepository, ExtensionManagerMBean
+ ExtensionManager, ExtensionManagerMBean
{
private Logger m_logger;
private String m_rawPath;
@@ -48,7 +47,7 @@
throws Exception
{
setPath( m_rawPath );
- scanPath();
+ rescanPath();
}
public void dispose()
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
