CVS update of aokell/features/fcinterface/ct (3 files)

[Lionel Seinturier <seintur@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Saturday, February 25, 2006 @ 22:19:14
  Author: seintur
    Path: /cvsroot/fractal/aokell/features/fcinterface/ct

   Added: fcinterface.properties
Modified: fcinterface.xml
          
src/org/objectweb/fractal/aokell/tools/interf/InterfaceGenerator.java

Compile-time generated component interfaces and componentized membranes are 
now supported.


-----------------------------------------------------------------------+
 fcinterface.properties                                                |   52 
++++++++++
 fcinterface.xml                                                       |   14 
+-
 src/org/objectweb/fractal/aokell/tools/interf/InterfaceGenerator.java |   34 
------
 3 files changed, 63 insertions(+), 37 deletions(-)


Index: aokell/features/fcinterface/ct/fcinterface.properties
diff -u /dev/null aokell/features/fcinterface/ct/fcinterface.properties:1.1
--- /dev/null   Sat Feb 25 22:19:14 2006
+++ aokell/features/fcinterface/ct/fcinterface.properties       Sat Feb 25 
22:19:14 2006
@@ -0,0 +1,52 @@
+============================================================================
+AOKell
+Copyright (C) 2005-2006 INRIA, France Telecom
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Contact: Lionel.Seinturier@xxxxxxx
+
+Author: Lionel Seinturier
+============================================================================
+
+fcinterface.ct.aokell.interfaces.oo \
+       org.objectweb.fractal.api.factory.GenericFactory \
+       org.objectweb.fractal.api.type.TypeFactory \
+       
org.objectweb.fractal.aokell.lib.control.attribute.AttributeControllerItf \
+       org.objectweb.fractal.aokell.lib.control.binding.BindingControllerItf 
\
+       org.objectweb.fractal.aokell.lib.control.component.ComponentItf \
+       org.objectweb.fractal.aokell.lib.control.content.ContentControllerItf 
\
+       org.objectweb.fractal.aokell.lib.control.factory.FactoryItf \
+       
org.objectweb.fractal.aokell.lib.control.lifecycle.LifeCycleControllerItf \
+       org.objectweb.fractal.aokell.lib.control.name.NameControllerItf \
+       org.objectweb.fractal.aokell.lib.control.superc.SuperControllerItf
+
+fcinterface.ct.aokell.interfaces.comp \
+       org.objectweb.fractal.api.factory.GenericFactory \
+       org.objectweb.fractal.api.type.TypeFactory \
+       
org.objectweb.fractal.aokell.lib.control.attribute.AttributeControllerItf \
+       org.objectweb.fractal.aokell.lib.control.binding.BindingControllerItf 
\
+       org.objectweb.fractal.aokell.lib.control.component.ComponentItf \
+       org.objectweb.fractal.aokell.lib.control.content.ContentControllerItf 
\
+       org.objectweb.fractal.aokell.lib.control.factory.FactoryItf \
+       
org.objectweb.fractal.aokell.lib.control.lifecycle.LifeCycleControllerItf \
+       org.objectweb.fractal.aokell.lib.control.name.NameControllerItf \
+       org.objectweb.fractal.aokell.lib.control.superc.SuperControllerItf \
+       \
+       org.objectweb.fractal.api.Component \
+       org.objectweb.fractal.api.control.BindingController \
+       org.objectweb.fractal.api.control.ContentController \
+       org.objectweb.fractal.api.control.NameController \
+       
org.objectweb.fractal.aokell.lib.control.membrane.MembraneControllerItf
Index: aokell/features/fcinterface/ct/fcinterface.xml
diff -u aokell/features/fcinterface/ct/fcinterface.xml:1.2 
aokell/features/fcinterface/ct/fcinterface.xml:1.3
--- aokell/features/fcinterface/ct/fcinterface.xml:1.2  Mon Feb 20 05:50:19 
2006
+++ aokell/features/fcinterface/ct/fcinterface.xml      Sat Feb 25 22:19:14 
2006
@@ -22,6 +22,14 @@
 <!-- =================================================================== -->
 
 <project name="fcinterface.ct" default="compile.fcinterface.ct">
+ 
+    <property file="features/fcinterface/ct/fcinterface.properties" />
+    <condition property="fcinterface.ct.aokell.interfaces" 
value="${fcinterface.ct.aokell.interfaces.oo}">
+        <not> <isset property="feature.membrane.comp" /> </not>
+    </condition>
+    <condition property="fcinterface.ct.aokell.interfaces" 
value="${fcinterface.ct.aokell.interfaces.comp}">
+        <isset property="feature.membrane.comp" />
+    </condition>
 
     <target name="compile.fcinterface.ct">
 
@@ -37,13 +45,11 @@
     </target>
  
     <target name="compile.fcinterface.required" 
unless="compile.fcinterface.notrequired">
-        
+     
         <!-- Generate the Java implementations of the Fractal interfaces -->
         <java 
classname="org.objectweb.fractal.aokell.tools.interf.InterfaceGenerator" 
fork="yes">
             <classpath refid="classpath" />
-            <arg value="-system" />
-            <arg value="-d" />
-            <arg value="${out.generated}/fcinterface/ct" />
+            <arg line="-d ${out.generated}/fcinterface/ct 
${fcinterface.ct.aokell.interfaces}" />
         </java>        
         
         <!-- Compile the generated Java code -->
Index: 
aokell/features/fcinterface/ct/src/org/objectweb/fractal/aokell/tools/interf/InterfaceGenerator.java
diff -u 
aokell/features/fcinterface/ct/src/org/objectweb/fractal/aokell/tools/interf/InterfaceGenerator.java:1.1
 
aokell/features/fcinterface/ct/src/org/objectweb/fractal/aokell/tools/interf/InterfaceGenerator.java:1.2
--- 
aokell/features/fcinterface/ct/src/org/objectweb/fractal/aokell/tools/interf/InterfaceGenerator.java:1.1
    Sat Feb 11 06:43:52 2006
+++ 
aokell/features/fcinterface/ct/src/org/objectweb/fractal/aokell/tools/interf/InterfaceGenerator.java
        Sat Feb 25 22:19:14 2006
@@ -40,19 +40,9 @@
 import org.objectweb.fractal.adl.FactoryFactory;
 import org.objectweb.fractal.aokell.AOKell;
 import org.objectweb.fractal.aokell.lib.InterfaceImpl;
-import 
org.objectweb.fractal.aokell.lib.control.attribute.AttributeControllerItf;
-import org.objectweb.fractal.aokell.lib.control.binding.BindingControllerItf;
-import org.objectweb.fractal.aokell.lib.control.component.ComponentItf;
-import org.objectweb.fractal.aokell.lib.control.content.ContentControllerItf;
-import org.objectweb.fractal.aokell.lib.control.factory.FactoryItf;
-import 
org.objectweb.fractal.aokell.lib.control.lifecycle.LifeCycleControllerItf;
-import org.objectweb.fractal.aokell.lib.control.name.NameControllerItf;
-import org.objectweb.fractal.aokell.lib.control.superc.SuperControllerItf;
 import org.objectweb.fractal.aokell.lib.interf.AOKellGeneratedItf;
 import org.objectweb.fractal.api.Component;
 import org.objectweb.fractal.api.Type;
-import org.objectweb.fractal.api.factory.GenericFactory;
-import org.objectweb.fractal.api.type.TypeFactory;
 
 /**
  * Starting from an ADL description, this tool determines component 
interfaces
@@ -75,14 +65,13 @@
     private static void usage() {
         System.out.println(
                 "java "+InterfaceGenerator.class.getName()+
-                " [-d dir] [-system] type[s]");
+                " [-d dir] type[s]");
         System.out.println("Description: ");
         System.out.println("  Generate component interface implementations 
referenced by the given types");
         System.out.println("  Types may be Fractal ADL ");
         System.out.println("Option:");
         System.out.print("  -d dir : the directory where files will be 
generated");
         System.out.println("(default generated/)");
-        System.out.println("  -system: generate AOKell system component 
interfaces");
     }
     
     public static void main(String[] args) throws Exception {
@@ -104,7 +93,6 @@
     
     public void compile() throws IOException, ClassNotFoundException {       
 
         
-        boolean system = false;
         for (int i = 0; i < args.length; i++) {
             if( args[i].equals("-d") ) {
                 if( i == args.length-1 ) {
@@ -114,9 +102,6 @@
                 i++;
                 generatedDirname = args[i];
             }
-            else if( args[i].equals("-system") ) {
-                system = true;
-            }
             else {
                 try {
                     generateFromJava(args[i]);
@@ -136,23 +121,6 @@
             }
         }
         
-        /*
-         * Interfaces used by AOKell.
-         */
-        if(system) {
-            generateImplementedInterface(GenericFactory.class.getName());
-            generateImplementedInterface(TypeFactory.class.getName());
-            
-            
generateImplementedInterface(AttributeControllerItf.class.getName());
-            
generateImplementedInterface(BindingControllerItf.class.getName());
-            generateImplementedInterface(ComponentItf.class.getName());
-            
generateImplementedInterface(ContentControllerItf.class.getName());
-            
generateImplementedInterface(LifeCycleControllerItf.class.getName());
-            generateImplementedInterface(NameControllerItf.class.getName());
-            generateImplementedInterface(SuperControllerItf.class.getName());
-            generateImplementedInterface(FactoryItf.class.getName());
-        }
-
         System.out.println("Done.");
     }