mcconnell 02/02/04 06:17:48
Modified: apps/enterprise/orb build.xml
apps/enterprise/orb/src/java/org/apache/orb
DefaultFactory.java
Log:
updated implementation of the 1.1 proposal
Revision Changes Path
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 4 Feb 2002 10:37:03 -0000 1.2
+++ build.xml 4 Feb 2002 14:17:48 -0000 1.3
@@ -95,7 +95,7 @@
</javac>
<copy todir="${build}/orb/lib">
<fileset dir="${src}/java">
- <include name="org/apache/orb/config.xml"/>
+ <include name="org/apache/orb/*.xinfo"/>
</fileset>
</copy>
<jar file="${dist}/${orb.manager.jar}" basedir="${build}/orb/lib" />
1.3 +21 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultFactory.java 4 Feb 2002 10:37:04 -0000 1.2
+++ DefaultFactory.java 4 Feb 2002 14:17:48 -0000 1.3
@@ -164,17 +164,36 @@
/**
* Creation of a new ORB instance based on the supplied properties.
+ * NOTE: Semantic of this interface are under discussion.
+ * @param props initialization properties
+ */
+ public ORB createORB( )
+ {
+ return createORB( new String[0], null );
+ }
+
+ /**
+ * Creation of a new ORB instance based on the supplied properties.
* @param props initialization properties
*/
public ORB createORB( java.util.Properties properties )
{
+ return createORB( new String[0], properties );
+ }
+
+ /**
+ * Creation of a new ORB instance based on the supplied properties.
+ * @param args common line arguments
+ * @param props initialization properties
+ */
+ public ORB createORB( String[] args, java.util.Properties properties )
+ {
final String pre = "ORB creation";
if( getLogger().isDebugEnabled() ) getLogger().debug( pre );
try
{
- return (ORB) ORB.init(
- new String[0], new Properties( properties, m_defaults ) );
+ return (ORB) ORB.init( args, new Properties( properties,
m_defaults ) );
}
catch ( Throwable e )
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
