mcconnell 2002/09/06 23:48:16
Modified: enterprise/orb build.xml
enterprise/orb/lib openorb-1.3.0.jar openorb_tools-1.3.0.jar
enterprise/orb/src/etc factory.mf
enterprise/orb/src/examples/hello/java/hello HelloDemo.xinfo
HelloInitializer.java
enterprise/orb/src/java/org/apache/orb ORB.java ORB.xinfo
package.html
Log:
Upgrade of the implementation to support the excalibur/meta type descriptors and
Merlin packaged deployment descriptors.
Revision Changes Path
1.17 +40 -100 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 11 Jun 2002 04:25:34 -0000 1.16
+++ build.xml 7 Sep 2002 06:48:14 -0000 1.17
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<project name="orb" default="help" basedir=".">
+<project name="orb" default="build" basedir=".">
<property file="local.properties"/>
<property file="build.properties"/>
@@ -7,7 +7,10 @@
<!-- common target wrappers -->
<property name="enterprise.path" value=".."/>
+ <property name="excalibur.path"
value="${enterprise.path}/../../jakarta-avalon-excalibur"/>
+ <property name="assembly.path" value="${excalibur.path}/assembly"/>
<property name="common.path" value="${enterprise.path}/../common"/>
+
<target name="checkstyle">
<ant antfile="${common.path}/util/checkstyle.xml">
<property name="checkstyle.failOnViolation" value="false"/>
@@ -46,10 +49,10 @@
</echo>
</target>
- <property name="VERSION" value="${MAJOR}.${MINOR}.${MICRO}"/>
+ <property name="VERSION" value="${MAJOR}.${MINOR}"/>
<property name="compiler.jar" value="psdl-${VERSION}.jar"/>
- <property name="orb.manager.jar" value="orb-manager-${VERSION}.jar"/>
+ <property name="project.jar" value="orb-${VERSION}.jar"/>
<property name="orb.examples.jar" value="orb-examples.jar"/>
<property name="enterprise" value=".." />
@@ -64,10 +67,9 @@
<property name="etc" value="${src}/etc" />
<property name="build.dir" value="build" />
- <property name="dist" value="dist" />
<property name="overview.html" value="${etc}/overview.html" />
- <property name="javadoc.root.path" value="${dist}/javadoc" />
+ <property name="javadoc.root.path" value="${dist}/api" />
<property name="avalon.href" value="http://jakarta.apache.org/avalon/api/"; />
<property name="jdk.href" value="http://java.sun.com/j2se/1.4/docs/api/"; />
@@ -78,39 +80,34 @@
<property name="openorb.build.src" value="${src}" />
<property name="idl.class" value="org.openorb.compiler.IdlCompiler" />
-
<path id="project.classpath">
- <fileset dir="${enterprise}/../common/lib">
- <include name="avalon-framework.jar" />
- <include name="logkit.jar" />
- <include name="merlin.jar" />
+ <fileset dir="${common.path}/lib">
+ <include name="logkit*.jar" />
+ <include name="avalon-framework*.jar" />
</fileset>
<fileset dir="${lib}">
<include name="*.jar" />
</fileset>
- <fileset dir="${common.path}/lib">
- <include name="logkit.jar" />
- <include name="avalon-framework.jar" />
- <include name="merlin.jar" />
+ <fileset dir="${excalibur.path}">
+ <include name="assembly/build/lib/merlin-2.0a.jar" />
+ <include name="configuration/build/lib/excalibur-configuration-1.0.jar" />
</fileset>
</path>
<!-- MAIN TARGETS -->
<target name="all" depends="clean,dist"/>
- <target name="build" depends="orb"/>
+ <target name="build" depends="merlin.update,orb"/>
<target name="dist" depends="build,examples,support,javadoc"/>
<target name="clean">
<delete dir="${build.dir}"/>
- <delete dir="${dist}"/>
</target>
<!-- PREPARE -->
<target name="prepare" >
<mkdir dir="${build.dir}" />
- <mkdir dir="${dist}" />
</target>
<!-- ORB BLOCK/MANGER -->
@@ -118,12 +115,15 @@
<target name="orb.context" depends="prepare" >
<mkdir dir="${build.dir}/orb" />
<mkdir dir="${build.dir}/orb/src" />
+ <!--
+ <mkdir dir="${build.dir}/activation" />
<mkdir dir="${build.dir}/corbaloc" />
+ -->
<mkdir dir="${build.dir}/orb/lib" />
</target>
<target name="orb.build.context" depends="orb.context">
- <uptodate property="orb.uptodate" targetfile="${dist}/${orb.manager.jar}">
+ <uptodate property="orb.uptodate" targetfile="${build.dir}/${project.jar}">
<srcfiles dir="${src}/java">
<include name="org/apache/orb/**/*.*"/>
</srcfiles>
@@ -133,34 +133,10 @@
<srcfiles dir="${build.dir}/orb/src">
<include name="org/apache/orb/**/*.*"/>
</srcfiles>
- <srcfiles dir="${build.dir}/corbaloc">
- <include name="org/apache/orb/**/*.*"/>
- </srcfiles>
</uptodate>
</target>
- <target name="idl.context" depends="orb.context">
- <uptodate property="corbaloc.idl.modified" targetfile="${idl}/corbaloc.idl">
- <srcfiles dir="${build.dir}/corbaloc">
- <include name="**/*"/>
- </srcfiles>
- </uptodate>
- </target>
-
- <target name="corbaloc.idl" depends="idl.context" if="corbaloc.idl.modified">
- <java failonerror="true" classname="${idl.class}" fork="true">
- <classpath>
- <path refid="project.classpath"/>
- </classpath>
- <arg line="-silence"/>
- <arg line="-native URL java.net.URL"/>
- <arg line="-d ${build.dir}/corbaloc"/>
- <arg line="-I ${idl}"/>
- <arg line="corbaloc.idl" />
- </java>
- </target>
-
- <target name="orb" depends="corbaloc.idl,orb.build.context" unless="orb.uptodate"
>
+ <target name="orb" depends="orb.context" unless="orb.uptodate" >
<echo message="Building ORB Manager Implementation."/>
<mkdir dir="${build.dir}/orb/lib"/>
<javac debug="off" destdir="${build.dir}/orb/lib" deprecation="true"
target="1.2">
@@ -169,25 +145,26 @@
<pathelement path="${build.dir}/orb/lib" />
</classpath>
<src path="${build.dir}/orb/src" />
- <src path="${build.dir}/corbaloc" />
<src path="${src}/java" />
<include name="org/apache/orb/**"/>
</javac>
<copy todir="${build.dir}/orb/lib">
<fileset dir="${src}/java">
- <include name="org/apache/orb/*.xinfo"/>
+ <include name="org/apache/orb/**/*.xinfo"/>
+ <include name="org/apache/orb/**/*.xconfig"/>
+ <include name="org/apache/orb/**/*.xprofile"/>
<include name="org/apache/orb/**/*.xml"/>
<include name="org/apache/orb/**/orb.properties"/>
</fileset>
</copy>
- <jar jarfile="${dist}/${orb.manager.jar}" basedir="${build.dir}/orb/lib"
+ <jar jarfile="${build.dir}/${project.jar}" basedir="${build.dir}/orb/lib"
manifest="${etc}/factory.mf" />
</target>
<target name="examples" depends="hello.build"/>
<target name="hello.build.context" >
- <uptodate property="hello.uptodate" targetfile="${dist}/${orb.examples.jar}">
+ <uptodate property="hello.uptodate"
targetfile="${build.dir}/${orb.examples.jar}">
<srcfiles dir="${src}/examples">
<include name="hello/**/*.*"/>
</srcfiles>
@@ -218,7 +195,7 @@
<javac debug="off" destdir="${build.dir}/examples/lib" deprecation="true"
target="1.2">
<classpath>
<path refid="project.classpath" />
- <pathelement path="${dist}/${orb.manager.jar}" />
+ <pathelement path="${build.dir}/${project.jar}" />
</classpath>
<src path="${build.dir}/examples/src" />
<src path="${src}/examples/hello/java" />
@@ -229,7 +206,7 @@
<include name="**/*.xinfo"/>
</fileset>
</copy>
- <jar jarfile="${dist}/${orb.examples.jar}" basedir="${build.dir}/examples/lib"
/>
+ <jar jarfile="${build.dir}/${orb.examples.jar}"
basedir="${build.dir}/examples/lib" />
</target>
<target name="hello" depends="hello.build">
@@ -237,45 +214,17 @@
<java classname="hello.HelloDemo" fork="true">
<classpath>
<path refid="project.classpath" />
- <pathelement path="${dist}/${orb.examples.jar}" />
- <pathelement path="${dist}/${orb.manager.jar}" />
+ <pathelement path="${build.dir}/${orb.examples.jar}" />
+ <pathelement path="${build.dir}/${project.jar}" />
</classpath>
<arg value="-ORBDebug=0"/>
</java>
</target>
- <target name="load-hello" depends="loader.validation,examples"
if="merlin.available">
-
- <!--
- After loading jar files declared under a fileset, apply lifecycle
- pipeline processing to the class referenced in the target attribute.
- -->
-
- <load target="hello.HelloDemo" priority="${hello.priority}"
- disposal="${hello.disposal}" verbose="${hello.verbose}">
-
- <!--
- For all of the jar files in the fileset, load the jar file
- into the classloader.
- -->
-
- <fileset dir="${lib}">
- <include name="openorb-1.3.0.jar"/>
- </fileset>
-
- <fileset dir="${dist}">
- <include name="${orb.manager.jar}"/>
- <include name="${orb.examples.jar}"/>
- </fileset>
-
- </load>
-
- </target>
-
<!-- UTILITY TARGETS -->
<target name="support">
- <copy todir="${dist}">
+ <copy todir="${build.dir}">
<fileset dir="${etc}">
<include name="README.TXT"/>
</fileset>
@@ -304,15 +253,19 @@
bottom="<a href='{@docRoot}/LICENSE.HTML'/>License, Disclaimer and due
credits.</a>"
additionalparam="-breakiterator -J-Xmx128m"
packagenames="org.*"
- excludepackagenames="org.omg.*,org.apache.avalon.excalibur.*"
+ excludepackagenames="org.omg.*"
>
<sourcepath path="${src}/java"/>
<sourcepath path="${build.dir}/orb/src"/>
+ <!--
+ <sourcepath path="${build.dir}/corbaloc"/>
+ <sourcepath path="${build.dir}/activation"/>
+ -->
<sourcepath path="${openorb.src}"/>
<sourcepath path="${openorb.build.src}"/>
<classpath>
<path refid="project.classpath" />
- <pathelement path="${dist}/${orb.manager.jar}" />
+ <pathelement path="${build.dir}/${project.jar}" />
</classpath>
<link href="${jdk.href}" />
<link href="${avalon.href}" />
@@ -333,26 +286,13 @@
</java>
</target>
- <target name="loader.context">
- <available property="merlin.available" file="${ant.home}/lib/merlin.jar"/>
+ <target name="merlin.context">
+ <available property="merlin.available"
file="${assembly.path}/build/lib/merlin-2.0a.jar"/>
</target>
- <target name="loader.defintion" depends="loader.context" if="merlin.available">
- <taskdef resource="merlin.properties"/>
+ <target name="merlin.update" depends="merlin.context" if="merlin.available">
+ <echo message="updating merlin"/>
+ <copy toDir="${common.path}/lib"
file="${assembly.path}/build/lib/merlin-2.0a.jar"/>
</target>
- <target name="loader.validation" depends="loader.defintion"
unless="merlin.available">
- <echo>
-
- Merlin is not installed in your Ant library.
- In order to use the "load" task the following jar files
- must be added to your ${ant.home}/lib directory:
-
- - merlin.jar
- - avalon-framework.jar
- - logkit.jar
- - xerces.jar (pre JRE 1.4 only)
- </echo>
- </target>
-
</project>
1.6 +5073 -4702jakarta-avalon-apps/enterprise/orb/lib/openorb-1.3.0.jar
<<Binary file>>
1.6 +857 -672 jakarta-avalon-apps/enterprise/orb/lib/openorb_tools-1.3.0.jar
<<Binary file>>
1.3 +2 -4 jakarta-avalon-apps/enterprise/orb/src/etc/factory.mf
Index: factory.mf
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/enterprise/orb/src/etc/factory.mf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- factory.mf 12 Mar 2002 22:18:01 -0000 1.2
+++ factory.mf 7 Sep 2002 06:48:16 -0000 1.3
@@ -8,8 +8,6 @@
Implementation-Vendor: OSM SARL
Implementation-Version: 1.0
-Name: org/apache/orb/DefaultORBFactory.class
-Avalon-Block: true
-
Name: org/apache/orb/ORB.class
-Avalon-Block: true
+Avalon: Type
+
1.5 +10 -21
jakarta-avalon-apps/enterprise/orb/src/examples/hello/java/hello/HelloDemo.xinfo
Index: HelloDemo.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/enterprise/orb/src/examples/hello/java/hello/HelloDemo.xinfo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HelloDemo.xinfo 22 May 2002 13:03:05 -0000 1.4
+++ HelloDemo.xinfo 7 Sep 2002 06:48:16 -0000 1.5
@@ -1,30 +1,19 @@
<?xml version="1.0"?>
+<!DOCTYPE component-info
+ PUBLIC "-//AVALON/Component Info DTD Version 1.0//EN"
+ "http://jakarta.apache.org/avalon/componentinfo_1_0.dtd"; >
-<!--
- File: HelloDemo.xinfo
- License: etc/LICENSE.TXT
- Copyright: Copyright (C) The Apache Software Foundation. All rights reserved.
- Copyright: OSM SARL 2001-2002, All Rights Reserved.
- @author Stephen McConnell
- @version 1.0 12/03/2001
--->
+<component-info>
-<blockinfo>
-
- <block>
+ <component>
<name>hello</name>
- <version>1.0</version>
- </block>
-
- <!--
- services that are offered by this block
- -->
+ </component>
<services>
- <service name="hello.Hello"/>
+ <service>
+ <reference type="hello.Hello"/>
+ </service>
</services>
- <implementation policy="SINGLETON" />
-
-</blockinfo>
+</component-info>
1.7 +0 -1
jakarta-avalon-apps/enterprise/orb/src/examples/hello/java/hello/HelloInitializer.java
Index: HelloInitializer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/enterprise/orb/src/examples/hello/java/hello/HelloInitializer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HelloInitializer.java 29 May 2002 17:52:27 -0000 1.6
+++ HelloInitializer.java 7 Sep 2002 06:48:16 -0000 1.7
@@ -45,7 +45,6 @@
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.orb.ORB;
-import org.apache.orb.ORBFactoryService;
import org.apache.excalibur.configuration.CascadingConfiguration;
1.7 +3 -32
jakarta-avalon-apps/enterprise/orb/src/java/org/apache/orb/ORB.java
Index: ORB.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/enterprise/orb/src/java/org/apache/orb/ORB.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ORB.java 5 Jun 2002 03:22:05 -0000 1.6
+++ ORB.java 7 Sep 2002 06:48:16 -0000 1.7
@@ -15,7 +15,6 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
@@ -71,8 +70,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephen McConnell</a>
*/
public class ORB extends org.openorb.CORBA.ORB
-implements Component, Configurable, Contextualizable, Initializable, Startable,
Disposable,
-ORBContext, POAContext, ServiceManager
+implements Configurable, Contextualizable, Initializable, Startable, Disposable,
+POAContext, ServiceManager
{
//=================================================================
@@ -366,7 +365,7 @@
catch( Throwable e )
{
throw new ServiceException(
- "Could not locate service with key: " + key );
+ key, "Could not locate service with key: " + key );
}
}
@@ -398,33 +397,5 @@
final String error = "Unable to resolve root POA.";
throw new CascadingRuntimeException( error, e );
}
- }
-
- //=================================================================
- // ORBContext
- //=================================================================
-
- /**
- * Returns the ORB.
- * @return ORB the object request broker
- */
- public ORB getORB( )
- {
- return this;
- }
-
- /**
- * Returns a context value given a key.
- * @param key the context key
- * @return Object the context value
- * @exception ContextException if the key is unkwnown within the context
- */
- public Object get( Object key ) throws ContextException
- {
- if( key.equals( ORBContext.ORB_KEY ) )
- {
- return this;
- }
- throw new ContextException( "Key not recognized: " + key );
}
}
1.6 +13 -20
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ORB.xinfo 18 May 2002 14:21:34 -0000 1.5
+++ ORB.xinfo 7 Sep 2002 06:48:16 -0000 1.6
@@ -1,29 +1,22 @@
<?xml version="1.0"?>
+<!DOCTYPE type
+ PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
+ "http://jakarta.apache.org/avalon/type_1_0.dtd"; >
-<!--
- File: ORBServer.xinfo
- License: etc/LICENSE.TXT
- Copyright: Copyright (C) The Apache Software Foundation. All rights reserved.
- Copyright: OSM SARL 2001-2002, All Rights Reserved.
- @author Stephen McConnell
- @version 1.0 12/03/2001
--->
+<type>
-<blockinfo>
-
- <block>
+ <component>
<name>orb</name>
- <version>1.0</version>
- </block>
-
- <!--
- services that are offered by this block
- -->
+ </component>
<services>
- <service name="org.apache.orb.ORB" version="2.4"/>
- <service name="org.apache.orb.POAContext" />
+ <service>
+ <reference type="org.apache.orb.ORB" version="2.4"/>
+ </service>
+ <service>
+ <reference type="org.apache.orb.POAContext"/>
+ </service>
</services>
-</blockinfo>
+</type>
1.2 +1 -1
jakarta-avalon-apps/enterprise/orb/src/java/org/apache/orb/package.html
Index: package.html
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/enterprise/orb/src/java/org/apache/orb/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 28 Feb 2002 16:29:38 -0000 1.1
+++ package.html 7 Sep 2002 06:48:16 -0000 1.2
@@ -1,4 +1,4 @@
<body>
-<p>An ORB Factory Block that can be used as a formal Phoenix server block or
embedded component.</p>
+<p>An implementation of a compliant CORBA ORB with support for component lifecycle
management and deployment within a standard Avalon container.
</body>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
