geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r159416 - in geronimo/trunk/specs/corba: maven.xml src/idl/CosTSInteroperation.idl src/idl/CosTransactions.idl src/idl/Security.idl src/idl/geronimo-orb.idl src/idl/orb.idl
Date Tue, 29 Mar 2005 19:25:08 GMT
Author: dain
Date: Tue Mar 29 11:25:06 2005
New Revision: 159416

URL: http://svn.apache.org/viewcvs?view=rev&rev=159416
Log:
Fixed idl build problems on apple
Cleaned up the maven.xml file

Added:
    geronimo/trunk/specs/corba/src/idl/geronimo-orb.idl
      - copied, changed from r159400, geronimo/trunk/specs/corba/src/idl/orb.idl
Removed:
    geronimo/trunk/specs/corba/src/idl/orb.idl
Modified:
    geronimo/trunk/specs/corba/maven.xml
    geronimo/trunk/specs/corba/src/idl/CosTSInteroperation.idl
    geronimo/trunk/specs/corba/src/idl/CosTransactions.idl
    geronimo/trunk/specs/corba/src/idl/Security.idl

Modified: geronimo/trunk/specs/corba/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/specs/corba/maven.xml?view=diff&r1=159415&r2=159416
==============================================================================
--- geronimo/trunk/specs/corba/maven.xml (original)
+++ geronimo/trunk/specs/corba/maven.xml Tue Mar 29 11:25:06 2005
@@ -21,13 +21,33 @@
 
 <project default="default"
     xmlns:j="jelly:core"
-    xmlns:ant="jelly:ant"
+    xmlns:define="jelly:define"
+    xmlns:maven="jelly:maven"
+    xmlns:idlj="corba:idlj"
     >
 
-    <!-- <property name="idlj.verbose" value="-verbose"/> -->
-    <property name="idlj.verbose" value="-verbose"/> 
+    <property name="idlj.verbose" value="-verbose"/>
     <property name="pkg.prefix" value="org.omg"/>
 
+    <preGoal name="java:compile">
+        <attainGoal name="interop:idlj"/>
+    </preGoal>
+
+    <goal name="interop:idlj">
+        <idlj:idlj idlFile="IOP"/>
+        <idlj:idlj idlFile="GIOP"/>
+        <idlj:idlj idlFile="IIOP"/>
+        <idlj:idlj idlFile="CosNaming"/>
+        <idlj:idlj idlFile="CSI"/>
+        <idlj:idlj idlFile="GSSUP"/>
+        <idlj:idlj idlFile="CSIIOP"/>
+        <idlj:idlj idlFile="TimeBase"/>
+        <idlj:idlj idlFile="Security"/>
+        <idlj:idlj idlFile="SSLIOP"/>
+        <idlj:idlj idlFile="CosTransactions"/>
+        <idlj:idlj idlFile="CosTSInteroperation"/>
+    </goal>
+
     <!--
       #
       # Be carefull about changing the package prefix.  When generating the java
@@ -36,249 +56,91 @@
       # prefix, but the idlj tool would generate the GIOP in a wrong package:
       # o.a.g.i.org.omg.o.a.g.i for some strange reason.
     -->
-
-    <!--
-      # Todo:
-      #
-      # 1. It would be nice to improve the iop, giop, iiop, cosnaming targets as their
-      #    build goals are almost the same.  Maybe we could figure out how to use a for
-      #    script statement....
-      #
-    -->
-
-    <goal name="interop:idlj:iop">
-      <ant:echo message="Interop :: idlj :: IOP"/>
-      <ant:ant antfile="build.xml">
-        <ant:property name="maven.build.src" value="${maven.build.src}"/>
-        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
-        <ant:property name="maven.basedir" value="${basedir}"/>
-        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
-        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
-        <ant:property name="idl.file" value="IOP"/>
-      </ant:ant>
-    </goal>
-
-    <goal name="interop:idlj:giop">
-      <ant:echo message="Interop :: idlj :: GIOP"/>
-      <ant:ant antfile="build.xml">
-        <ant:property name="maven.build.src" value="${maven.build.src}"/>
-        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
-        <ant:property name="maven.basedir" value="${basedir}"/>
-        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
-        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
-        <ant:property name="idl.file" value="GIOP"/>
-      </ant:ant>
-    </goal>
-
-    <goal name="interop:idlj:iiop">
-      <ant:echo message="Interop :: idlj :: IIOP"/>
-      <ant:ant antfile="build.xml">
-        <ant:property name="maven.build.src" value="${maven.build.src}"/>
-        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
-        <ant:property name="maven.basedir" value="${basedir}"/>
-        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
-        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
-        <ant:property name="idl.file" value="IIOP"/>
-      </ant:ant>
-    </goal>
-
-    <goal name="interop:idlj:cosnaming">
-      <ant:echo message="Interop :: idlj :: CosNaming"/>
-      <ant:ant antfile="build.xml">
-        <ant:property name="maven.build.src" value="${maven.build.src}"/>
-        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
-        <ant:property name="maven.basedir" value="${basedir}"/>
-        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
-        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
-        <ant:property name="idl.file" value="CosNaming"/>
-      </ant:ant>
-    </goal>
-
-    <goal name="interop:idlj:csiv2">
-      <attainGoal name="interop:idlj:csiv2:csi"/>
-      <attainGoal name="interop:idlj:csiv2:gssup"/>
-      <attainGoal name="interop:idlj:csiv2:csiiop"/>
-    </goal>
-
-    <goal name="interop:idlj:csiv2:csi">
-      <ant:echo message="Interop :: idlj :: CSIv2 :: CSI"/>
-      <ant:ant antfile="build.xml">
-        <ant:property name="maven.build.src" value="${maven.build.src}"/>
-        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
-        <ant:property name="maven.basedir" value="${basedir}"/>
-        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
-        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
-        <ant:property name="idl.file" value="CSI"/>
-      </ant:ant>
-    </goal>
-
-    <goal name="interop:idlj:csiv2:gssup">
-      <ant:echo message="Interop :: idlj :: CSIv2 :: GSSUP"/>
-      <ant:ant antfile="build.xml">
-        <ant:property name="maven.build.src" value="${maven.build.src}"/>
-        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
-        <ant:property name="maven.basedir" value="${basedir}"/>
-        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
-        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
-        <ant:property name="idl.file" value="GSSUP"/>
-      </ant:ant>
-    </goal>
-        
-    <goal name="interop:idlj:csiv2:csiiop">
-      <ant:echo message="Interop :: idlj :: CSIv2 :: CSIIIOP"/>
-      <ant:ant antfile="build.xml">
-        <ant:property name="maven.build.src" value="${maven.build.src}"/>
-        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
-        <ant:property name="maven.basedir" value="${basedir}"/>
-        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
-        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
-        <ant:property name="idl.file" value="CSIIOP"/>
-      </ant:ant>
-    </goal>
-
-    <goal name="interop:idlj:security-service">
-      <attainGoal name="interop:idlj:security-service:timebase"/>
-      <attainGoal name="interop:idlj:security-service:securityservice"/>
-      <attainGoal name="interop:idlj:security-service:ssliop"/>
-    </goal>
-
-    <goal name="interop:idlj:security-service:timebase">
-      <ant:echo message="Interop :: idlj :: SecurityService :: TimeBase"/>
-      <ant:ant antfile="build.xml">
-        <ant:property name="maven.build.src" value="${maven.build.src}"/>
-        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
-        <ant:property name="maven.basedir" value="${basedir}"/>
-        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
-        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
-        <ant:property name="idl.file" value="TimeBase"/>
-      </ant:ant>
-    </goal>
-
-    <goal name="interop:idlj:security-service:securityservice">
-      <ant:echo message="Interop :: idlj :: SecurityService :: SecurityService"/>
-      <ant:ant antfile="build.xml">
-        <ant:property name="maven.build.src" value="${maven.build.src}"/>
-        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
-        <ant:property name="maven.basedir" value="${basedir}"/>
-        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
-        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
-        <ant:property name="idl.file" value="Security"/>
-      </ant:ant>
-    </goal>
-
-    <goal name="interop:idlj:security-service:ssliop">
-      <ant:echo message="Interop :: idlj :: SecurityService :: SSLIOP"/>
-      <ant:ant antfile="build.xml">
-        <ant:property name="maven.build.src" value="${maven.build.src}"/>
-        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
-        <ant:property name="maven.basedir" value="${basedir}"/>
-        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
-        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
-        <ant:property name="idl.file" value="SSLIOP"/>
-      </ant:ant>
-    </goal>
-
-    <goal name="interop:idlj:costxn:costransactions">
-      <ant:echo message="Interop :: idlj :: CosTx :: CosTransactions"/>
-      <ant:ant antfile="build.xml">
-        <ant:property name="maven.build.src" value="${maven.build.src}"/>
-        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
-        <ant:property name="maven.basedir" value="${basedir}"/>
-        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
-        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
-        <ant:property name="idl.file" value="CosTransactions"/>
-      </ant:ant>
-    </goal>
-
-    <goal name="interop:idlj:costxn:costsinterop">
-      <ant:echo message="Interop :: idlj :: CosTx :: CosTSInteroperation"/>
-      <ant:ant antfile="build.xml">
-        <ant:property name="maven.build.src" value="${maven.build.src}"/>
-        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
-        <ant:property name="maven.basedir" value="${basedir}"/>
-        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
-        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
-        <ant:property name="idl.file" value="CosTransactions"/>
-      </ant:ant>
-    </goal>
-
-    <goal name="interop:idlj:costxn">
-      <attainGoal name="interop:idlj:costxn:costransactions"/>
-      <attainGoal name="interop:idlj:costxn:costsinterop"/>
-    </goal>
-
-    <goal name="interop:java:compile">
-        <ant:echo message="Interop :: Compile"/>
-        <ant:javac srcdir="${maven.build.src}" destdir="${maven.build.dest}"
-            classpath="${maven.build.dest};${maven.build.src}"/>
-    </goal>
-
-    <goal name="interop:idlj">
-        <attainGoal name="interop:idlj:iop"/>
-        <attainGoal name="interop:idlj:giop"/>
-        <attainGoal name="interop:idlj:iiop"/>
-        <attainGoal name="interop:idlj:cosnaming"/>
-        <attainGoal name="interop:idlj:csiv2"/>
-        <attainGoal name="interop:idlj:security-service"/>
-        <attainGoal name="interop:idlj:costxn"/>
-    </goal>
-
-    <goal name="interop:stub:generate-compile">
-      <ant:exec dir="${maven.basedir}" executable="java">
-          <ant:arg value="-cp"/>
-          <ant:arg path="${maven.build.dest};${maven.repo.local}\geronimo-spec\jars\geronimo-spec-ejb-2.1-rc3.jar;${maven.repo.local}\commons-logging\jars\commons-logging-1.0.4.jar"/>
-          <ant:arg value="org.apache.geronimo.interop.rmi.iiop.compiler.StubCompiler"/>
-          <ant:arg value="-g"/>
-          <ant:arg value="-c"/>
-          <ant:arg value="-s"/>
-          <ant:arg value="-v"/>
-          <ant:arg value="-o"/>
-          <ant:arg value="-r"/>
-          <ant:arg path="${maven.repo.local}"/>
-          <ant:arg value="-gs"/>
-          <ant:arg path="target/stubs"/>
-          <ant:arg value="-gc"/>
-          <ant:arg path="target/classes"/>
-          <ant:arg value="IDL:org.apache.geronimo.interop.CosNaming.NamingContext"/>
-      </ant:exec>
-    </goal>
-
-    <goal name="interop:skel:generate-compile">
-      <ant:exec dir="${maven.basedir}" executable="java">
-          <ant:arg value="-cp"/>
-          <ant:arg path="${maven.build.dest};${maven.repo.local}\geronimo-spec\jars\geronimo-spec-ejb-2.1-rc3.jar;${maven.repo.local}\commons-logging\jars\commons-logging-1.0.4.jar"/>
-          <ant:arg value="org.apache.geronimo.interop.rmi.iiop.compiler.SkelCompiler"/>
-          <ant:arg value="-g"/>
-          <ant:arg value="-c"/>
-          <ant:arg value="-s"/>
-          <ant:arg value="-v"/>
-          <ant:arg value="-o"/>
-          <ant:arg value="-r"/>
-          <ant:arg path="${maven.repo.local}"/>
-          <ant:arg value="-gs"/>
-          <ant:arg path="target/skels"/>
-          <ant:arg value="-gc"/>
-          <ant:arg path="target/classes"/>
-          <ant:arg value="IDL:org.apache.geronimo.interop.CosNaming.NamingContext"/>
-      </ant:exec>
-    </goal>
-
-    <preGoal name="java:compile">
-        <attainGoal name="interop:idlj"/>
-        <attainGoal name="interop:java:compile"/>
-    </preGoal>
-
-    <postGoal name="java:compile">
-      <!--
-      <attainGoal name="interop:stub:generate-compile"/>
-      <attainGoal name="interop:skel:generate-compile"/>
-      -->
-    </postGoal>
-
-    <!--
-    <goal name="showprops">
-      <ant:echoproperties/>
-    </goal>
-    -->
-
+    <define:taglib uri="corba:idlj">
+        <define:tag name="idlj">
+            <j:if test="${context.getVariable('idlFile') == null}">
+                <fail>Missing required attribute: idlFile=${idlFile}</fail>
+            </j:if>
+
+            <!-- Create an output directory for the generated sources-->
+            <property name="maven.idl.target" value="${maven.build.dir}/idl"/>
+            <mkdir dir="${maven.idl.target}"/>
+
+            <!-- Add the output directory the the maven list of sources -->
+            <j:if test="${context.getVariable('idl.src.added') == null}">
+                <j:if test="${context.antProject.getReference('maven.compile.src.set')
!= null}">
+                    <path id="maven.idl.compile.src.set" location="${maven.idl.target}"/>
+                    <maven:addPath id="maven.compile.src.set" refid="maven.idl.compile.src.set"/>
+                </j:if>
+                <j:if test="${context.antProject.getReference('maven.compile.src.set')
== null}">
+                    <echo message="Maven cannot find the generated sources unless you
provide a dummy source directory in project.xml"/>
+                </j:if>
+                <property name="idl.src.added" value="true"/>
+            </j:if>
+
+            <!-- check if we are up to date -->
+            <uptodate property="idl.build.not.required"
+                srcfile="${maven.src.dir}/idl/${idlFile}.idl"
+                targetfile="${maven.idl.target}/${idlFile}.ts"/>
+
+            <!-- if we are not up to date generate the source -->
+            <j:if test="${context.getVariable('idl.build.not.required') != 'true'}">
+                <echo>
+
+
+Interop :: idlj :: ${idlFile}</echo>
+                <exec dir="${basedir}" executable="idlj" failonerror='true'>
+                    <arg value="-td"/>
+                    <arg file="${maven.idl.target}"/>
+                    <arg value="-i"/>
+                    <arg file="${java.home}/lib"/>
+                    <arg value="-i"/>
+                    <arg file="${maven.src.dir}/idl"/>
+                    <arg value="${idlj.verbose}"/>
+                    <arg value="-pkgPrefix"/>
+                    <arg value="IOP"/>
+                    <arg value="${pkg.prefix}"/>
+                    <arg value="-pkgPrefix"/>
+                    <arg value="IIOP"/>
+                    <arg value="${pkg.prefix}"/>
+                    <arg value="-pkgPrefix"/>
+                    <arg value="GIOP"/>
+                    <arg value="${pkg.prefix}"/>
+                    <arg value="-pkgPrefix"/>
+                    <arg value="CosNaming"/>
+                    <arg value="${pkg.prefix}"/>
+                    <arg value="-pkgPrefix"/>
+                    <arg value="CSI"/>
+                    <arg value="${pkg.prefix}"/>
+                    <arg value="-pkgPrefix"/>
+                    <arg value="GSSUP"/>
+                    <arg value="${pkg.prefix}"/>
+                    <arg value="-pkgPrefix"/>
+                    <arg value="CSIIOP"/>
+                    <arg value="${pkg.prefix}"/>
+                    <arg value="-pkgPrefix"/>
+                    <arg value="TimeBase"/>
+                    <arg value="${pkg.prefix}"/>
+                    <arg value="-pkgPrefix"/>
+                    <arg value="Security"/>
+                    <arg value="${pkg.prefix}"/>
+                    <arg value="-pkgPrefix"/>
+                    <arg value="SSLIOP"/>
+                    <arg value="${pkg.prefix}"/>
+                    <arg value="-pkgPrefix"/>
+                    <arg value="CosTransactions"/>
+                    <arg value="${pkg.prefix}"/>
+                    <arg value="-pkgPrefix"/>
+                    <arg value="CosTSInteroperation"/>
+                    <arg value="${pkg.prefix}"/>
+                    <arg value="-pkgPrefix"/>
+                    <arg value="CosTSPortability"/>
+                    <arg value="${pkg.prefix}"/>
+                    <arg file="${maven.src.dir}/idl/${idlFile}.idl"/>
+                </exec>
+                <!-- We generated the source, so touch the timestamp file -->
+                <touch file="${maven.idl.target}/${idlFile}.ts"/>
+            </j:if>
+        </define:tag>
+    </define:taglib>
 </project>

Modified: geronimo/trunk/specs/corba/src/idl/CosTSInteroperation.idl
URL: http://svn.apache.org/viewcvs/geronimo/trunk/specs/corba/src/idl/CosTSInteroperation.idl?view=diff&r1=159415&r2=159416
==============================================================================
--- geronimo/trunk/specs/corba/src/idl/CosTSInteroperation.idl (original)
+++ geronimo/trunk/specs/corba/src/idl/CosTSInteroperation.idl Tue Mar 29 11:25:06 2005
@@ -1,7 +1,7 @@
 // PIDL for CosTSInteroperation Module, p 10-59 
 // CORBAservices, Transaction Service V1.0, 3/94
 
-#include <orb.idl>
+#include "geronimo-orb.idl"
 #include <IOP.idl>
 #include <CosTransactions.idl>
 

Modified: geronimo/trunk/specs/corba/src/idl/CosTransactions.idl
URL: http://svn.apache.org/viewcvs/geronimo/trunk/specs/corba/src/idl/CosTransactions.idl?view=diff&r1=159415&r2=159416
==============================================================================
--- geronimo/trunk/specs/corba/src/idl/CosTransactions.idl (original)
+++ geronimo/trunk/specs/corba/src/idl/CosTransactions.idl Tue Mar 29 11:25:06 2005
@@ -1,4 +1,4 @@
-#include <orb.idl>
+#include "geronimo-orb.idl"
 
 module CosTransactions {
 // DATATYPES

Modified: geronimo/trunk/specs/corba/src/idl/Security.idl
URL: http://svn.apache.org/viewcvs/geronimo/trunk/specs/corba/src/idl/Security.idl?view=diff&r1=159415&r2=159416
==============================================================================
--- geronimo/trunk/specs/corba/src/idl/Security.idl (original)
+++ geronimo/trunk/specs/corba/src/idl/Security.idl Tue Mar 29 11:25:06 2005
@@ -46,8 +46,8 @@
 
 #ifndef _SECURITY_IDL_
 #define _SECURITY_IDL_
-#include <orb.idl>
-#include <TimeBase.idl>
+#include "geronimo-orb.idl"
+#include "TimeBase.idl"
 #pragma prefix "omg.org"
 
 module Security {

Copied: geronimo/trunk/specs/corba/src/idl/geronimo-orb.idl (from r159400, geronimo/trunk/specs/corba/src/idl/orb.idl)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/specs/corba/src/idl/geronimo-orb.idl?view=diff&rev=159416&p1=geronimo/trunk/specs/corba/src/idl/orb.idl&r1=159400&p2=geronimo/trunk/specs/corba/src/idl/geronimo-orb.idl&r2=159416
==============================================================================
--- geronimo/trunk/specs/corba/src/idl/orb.idl (original)
+++ geronimo/trunk/specs/corba/src/idl/geronimo-orb.idl Tue Mar 29 11:25:06 2005
@@ -1,25 +1,25 @@
-#ifndef _ORB_IDL_
-#define _ORB_IDL_
-
-// Some definitions from the CORBA module as needed
-// by other modules. This file is for declaration
-// purposes only!!
-
-module CORBA
-{
-	typedef unsigned long ServiceOption;
-	typedef unsigned long ServiceDetailType;
-
-	typedef unsigned long PolicyType;
-
-	// actually, Current is pseudo, but we need it this way so everything compiles
-	interface Current {};
-	
-	interface Policy
-	{
-		readonly attribute PolicyType policy_type;
-		Policy copy();
-		void destroy();
-	};
-};
-#endif // _ORB_IDL_
+#ifndef _GERONIMO_ORB_IDL_
+#define _GERONIMO_ORB_IDL_
+
+// Some definitions from the CORBA module as needed
+// by other modules. This file is for declaration
+// purposes only!!
+
+module CORBA
+{
+	typedef unsigned long ServiceOption;
+	typedef unsigned long ServiceDetailType;
+
+	typedef unsigned long PolicyType;
+
+	// actually, Current is pseudo, but we need it this way so everything compiles
+	interface Current {};
+	
+	interface Policy
+	{
+		readonly attribute PolicyType policy_type;
+		Policy copy();
+		void destroy();
+	};
+};
+#endif // _ORB_IDL_



Mime
View raw message