mcconnell 02/05/18 07:21:34
Modified: enterprise/orb build.xml
enterprise/orb/src/java/org/apache/orb
DefaultORBFactory.java ORB.xinfo
Log:
updated to leverage comon/lib and Block independence
Revision Changes Path
1.13 +4 -2 jakarta-avalon-apps/enterprise/orb/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/enterprise/orb/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 18 May 2002 11:20:27 -0000 1.12
+++ build.xml 18 May 2002 14:21:34 -0000 1.13
@@ -85,8 +85,10 @@
<fileset dir="${lib}">
<include name="*.jar" />
</fileset>
- <fileset dir="${tools.lib.path}">
- <include name="*.jar" />
+ <fileset dir="${common.path}/lib">
+ <include name="logkit.jar" />
+ <include name="avalon-framework.jar" />
+ <include name="excalibur-configuration.jar" />
</fileset>
</path>
1.4 +7 -5
jakarta-avalon-apps/enterprise/orb/src/java/org/apache/orb/DefaultORBFactory.java
Index: DefaultORBFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/enterprise/orb/src/java/org/apache/orb/DefaultORBFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultORBFactory.java 14 May 2002 07:29:14 -0000 1.3
+++ DefaultORBFactory.java 18 May 2002 14:21:34 -0000 1.4
@@ -22,8 +22,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.phoenix.Block;
-import org.apache.avalon.phoenix.BlockContext;
import org.apache.avalon.excalibur.configuration.CascadingConfiguration;
@@ -61,7 +59,7 @@
*/
public class DefaultORBFactory extends AbstractLogEnabled
-implements Block, LogEnabled, Contextualizable, Configurable, Initializable,
+implements LogEnabled, Contextualizable, Configurable, Initializable,
Disposable, ORBFactoryService
{
@@ -116,9 +114,13 @@
public void contextualize( Context context ) throws ContextException
{
this.m_context = context;
- if( context instanceof BlockContext )
+ try
{
- m_root = ((BlockContext)context).getBaseDirectory();
+ m_root = (File) context.get("app.home");
+ }
+ catch( ContextException e )
+ {
+ // ignore
}
}
1.5 +0 -2
jakarta-avalon-apps/enterprise/orb/src/java/org/apache/orb/ORB.xinfo
Index: ORB.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/enterprise/orb/src/java/org/apache/orb/ORB.xinfo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ORB.xinfo 15 May 2002 06:57:08 -0000 1.4
+++ ORB.xinfo 18 May 2002 14:21:34 -0000 1.5
@@ -25,7 +25,5 @@
<service name="org.apache.orb.POAContext" />
</services>
- <implementation policy="SINGLETON"/>
-
</blockinfo>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
