mcconnell 02/02/04 02:37:04
Modified: apps/enterprise/orb build.xml
apps/enterprise/orb/src/java/org/apache/orb
DefaultFactory.java
Log:
inital implementation of the 1.1 proposal
Revision Changes Path
1.2 +1 -1 jakarta-avalon-cornerstone/apps/enterprise/orb/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/enterprise/orb/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2 Feb 2002 18:40:21 -0000 1.1
+++ build.xml 4 Feb 2002 10:37:03 -0000 1.2
@@ -85,7 +85,7 @@
<target name="orb" depends="orb.build.context" unless="orb.uptodate" >
<echo message="Building ORB Manager Implementation."/>
- <javac debug="off" destdir="${build}/orb/lib" deprecation="true">
+ <javac debug="off" destdir="${build}/orb/lib" deprecation="true"
target="1.2">
<classpath>
<path refid="project.classpath" />
</classpath>
1.2 +10 -7
jakarta-avalon-cornerstone/apps/enterprise/orb/src/java/org/apache/orb/DefaultFactory.java
Index: DefaultFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/orb/src/java/org/apache/orb/DefaultFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultFactory.java 4 Feb 2002 10:21:20 -0000 1.1
+++ DefaultFactory.java 4 Feb 2002 10:37:04 -0000 1.2
@@ -9,7 +9,6 @@
import java.io.File;
import java.net.URL;
-import java.io.File;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.logger.LogEnabled;
@@ -175,8 +174,7 @@
try
{
return (ORB) ORB.init(
- new String[0], new org.apache.orb.Properties( properties,
m_defaults )
- );
+ new String[0], new Properties( properties, m_defaults ) );
}
catch ( Throwable e )
{
@@ -205,12 +203,17 @@
//=================================================================
/**
- * Return a Context instance based on the ORB class and singleton
delcarations
- * together with containing property declarations. The context instance
is
- * returned in a form suitable for passing to an ORB.init() method as a
+ * Return a Properties instance that implements the Context interface.
+ * The return value is suitable for passing to an ORB.init() method as a
* <code>java.util.Properties</code> instance.
+ * @parent the parent context (may be null)
+ * @param configuration a configuration containing 'property' elements
+ * @param root the file path to be used in resolution of property
+ * element in the configuration that contain 'file' attributes as
+ * the property value
+ * @return Properties a Context derived by java.util.Properties
*/
- protected Properties createFactoryContext(
+ private Properties createFactoryContext(
Context parent, Configuration configuration, File root ) throws
Exception
{
Properties p = new Properties( parent );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
