Update copyright owner and year.

tinfi/module/opt-comp/mixins/src/main/java/org/objectweb/fractal/koch/control/interceptor/AbstractInterceptorControllerTrait.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,7 @@
 package org.objectweb.fractal.koch.control.interceptor
 
 import org.objectweb.fractal.julia.ComponentInterface
-import org.objectweb.fractal.julia.Interceptor
+import org.objectweb.fractal.julia.Interceptor
 
 /**
  * Abstract implementation of the {@link InterceptorController} interface to
@@ -37,4 +37,4 @@ trait AbstractInterceptorControllerTrait extends InterceptorController {
     override def addFcInterceptor( itf: ComponentInterface, interceptor: Interceptor ) = {}
     override def getFcInterceptors( itf: ComponentInterface ) : Array[Interceptor] = return null
     override def removeFcInterceptor( itf: ComponentInterface, interceptor: Interceptor ) : Boolean = return false
-}
\ No newline at end of file
+}

tinfi/module/opt-comp/mixins/src/main/java/org/objectweb/fractal/koch/control/interceptor/BasicInterceptorControllerTrait.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

tinfi/module/opt-comp/mixins/src/main/java/org/objectweb/fractal/koch/control/interceptor/BindingInterceptorTrait.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

tinfi/module/opt-comp/mixins/src/main/java/org/objectweb/fractal/koch/control/interceptor/InterceptorControllerImpl.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

tinfi/module/opt-comp/mixins/src/main/java/org/objectweb/fractal/koch/control/interceptor/InterceptorControllerTrait.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

tinfi/module/opt-comp/mixins/src/main/java/org/objectweb/fractal/koch/control/interceptor/LifeCycleInterceptorTrait.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

tinfi/module/opt-comp/mixins/src/main/java/org/objectweb/fractal/koch/control/membrane/BasicMembraneControllerImpl.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -35,4 +35,4 @@ import org.objectweb.fractal.api.Component
  * @since 1.4.5
  */
 class BasicMembraneControllerImpl extends BasicMembraneControllerTrait
-with MembraneController
\ No newline at end of file
+with MembraneController

tinfi/module/opt-comp/mixins/src/main/java/org/objectweb/fractal/koch/control/membrane/BasicMembraneControllerTrait.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

tinfi/module/opt-comp/mixins/src/main/java/org/ow2/frascati/tinfi/api/control/SCAIntentControllerTrait.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

tinfi/module/opt-comp/mixins/src/main/java/org/ow2/frascati/tinfi/api/control/SCAPropertyControllerTrait.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

tinfi/module/opt-comp/mixins/src/main/java/org/ow2/frascati/tinfi/control/binding/BasicBindingControllerTrait.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

tinfi/module/opt-comp/mixins/src/main/java/org/ow2/frascati/tinfi/control/binding/SCABindingControllerImpl.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

tinfi/module/opt-comp/mixins/src/main/java/org/ow2/frascati/tinfi/control/binding/SCABindingControllerTrait.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

tinfi/module/opt-comp/mixins/src/main/java/org/ow2/frascati/tinfi/control/component/ComponentContextImpl.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

tinfi/module/opt-comp/mixins/src/main/java/org/ow2/frascati/tinfi/control/component/ComponentContextTrait.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,24 +23,24 @@
 
 package org.ow2.frascati.tinfi.control.component
 
-import java.lang.reflect.Constructor
-import java.util.ArrayList
-import java.util.Collection
-import org.oasisopen.sca.ComponentContext
-import org.oasisopen.sca.RequestContext
-import org.oasisopen.sca.ServiceReference
-import org.objectweb.fractal.api.Component
-import org.objectweb.fractal.api.Interface
-import org.objectweb.fractal.api.NoSuchInterfaceException
-import org.objectweb.fractal.api.`type`.InterfaceType
-import org.objectweb.fractal.julia.BasicControllerTrait
-import org.objectweb.fractal.julia.UseComponentTrait
-import org.ow2.frascati.tinfi.TinfiComponentOutInterface
-import org.ow2.frascati.tinfi.TinfiRuntimeException
-import org.ow2.frascati.tinfi.api.control.SCAPropertyController
-import org.ow2.frascati.tinfi.control.content.SCAExtendedContentController
-import org.ow2.frascati.tinfi.control.content.UseSCAContentControllerTrait
-import org.ow2.frascati.tinfi.control.property.UseSCAPropertyControllerTrait
+import java.lang.reflect.Constructor
+import java.util.ArrayList
+import java.util.Collection
+import org.oasisopen.sca.ComponentContext
+import org.oasisopen.sca.RequestContext
+import org.oasisopen.sca.ServiceReference
+import org.objectweb.fractal.api.Component
+import org.objectweb.fractal.api.Interface
+import org.objectweb.fractal.api.NoSuchInterfaceException
+import org.objectweb.fractal.api.`type`.InterfaceType
+import org.objectweb.fractal.julia.BasicControllerTrait
+import org.objectweb.fractal.julia.UseComponentTrait
+import org.ow2.frascati.tinfi.TinfiComponentOutInterface
+import org.ow2.frascati.tinfi.TinfiRuntimeException
+import org.ow2.frascati.tinfi.api.control.SCAPropertyController
+import org.ow2.frascati.tinfi.control.content.SCAExtendedContentController
+import org.ow2.frascati.tinfi.control.content.UseSCAContentControllerTrait
+import org.ow2.frascati.tinfi.control.property.UseSCAPropertyControllerTrait
 import org.ow2.frascati.tinfi.oasis.ServiceReferenceImpl
 
 /**

tinfi/module/opt-comp/mixins/src/main/java/org/ow2/frascati/tinfi/control/content/LifeCycleSCAContentTrait.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

tinfi/module/opt-comp/mixins/src/main/java/org/ow2/frascati/tinfi/control/content/RequestContextSCAContentTrait.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,8 +22,8 @@
  */
 
 package org.ow2.frascati.tinfi.control.content
-
-import org.oasisopen.sca.RequestContext
+
+import org.oasisopen.sca.RequestContext
 
 /**
  * Request context management.

tinfi/module/opt-comp/mixins/src/main/java/org/ow2/frascati/tinfi/control/content/SCABasicContentControllerTrait.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,31 +22,31 @@
  */
 
 package org.ow2.frascati.tinfi.control.content
-
-import org.oasisopen.sca.RequestContext
-import org.oasisopen.sca.ServiceReference
-import org.oasisopen.sca.annotation.Property
-import org.ow2.frascati.tinfi.control.content.scope.ScopeManager
-import org.objectweb.fractal.api.Interface
-import org.objectweb.fractal.api.NoSuchInterfaceException
-import org.objectweb.fractal.api.`type`.ComponentType
-import org.objectweb.fractal.api.`type`.InterfaceType
-import org.objectweb.fractal.julia.BasicControllerTrait
-import org.objectweb.fractal.julia.ComponentInterface
-import org.objectweb.fractal.julia.InitializationContext
-import org.objectweb.fractal.julia.Interceptor
-import org.objectweb.fractal.julia.UseComponentTrait
-import org.ow2.frascati.tinfi.TinfiComponentOutInterface
-import org.ow2.frascati.tinfi.api.control.ContentInstantiationException
-import org.ow2.frascati.tinfi.control.content.scope.CompositeScopeManager
-import org.ow2.frascati.tinfi.control.content.scope.ScopeManager
-import org.ow2.frascati.tinfi.control.content.scope.StatelessScopeManager
-import org.ow2.frascati.tinfi.oasis.ServiceReferenceImpl
-import org.ow2.frascati.tinfi.osoa.ConversationScopeManager
-import org.ow2.frascati.tinfi.osoa.RequestScopeManager
-import org.ow2.frascati.tinfi.reflect.InjectionPoint
+
+import org.oasisopen.sca.RequestContext
+import org.oasisopen.sca.ServiceReference
+import org.oasisopen.sca.annotation.Property
+import org.ow2.frascati.tinfi.control.content.scope.ScopeManager
+import org.objectweb.fractal.api.Interface
+import org.objectweb.fractal.api.NoSuchInterfaceException
+import org.objectweb.fractal.api.`type`.ComponentType
+import org.objectweb.fractal.api.`type`.InterfaceType
+import org.objectweb.fractal.julia.BasicControllerTrait
+import org.objectweb.fractal.julia.ComponentInterface
+import org.objectweb.fractal.julia.InitializationContext
+import org.objectweb.fractal.julia.Interceptor
+import org.objectweb.fractal.julia.UseComponentTrait
+import org.ow2.frascati.tinfi.TinfiComponentOutInterface
+import org.ow2.frascati.tinfi.api.control.ContentInstantiationException
+import org.ow2.frascati.tinfi.control.content.scope.CompositeScopeManager
+import org.ow2.frascati.tinfi.control.content.scope.ScopeManager
+import org.ow2.frascati.tinfi.control.content.scope.StatelessScopeManager
+import org.ow2.frascati.tinfi.oasis.ServiceReferenceImpl
+import org.ow2.frascati.tinfi.osoa.ConversationScopeManager
+import org.ow2.frascati.tinfi.osoa.RequestScopeManager
+import org.ow2.frascati.tinfi.reflect.InjectionPoint
 import org.ow2.frascati.tinfi.reflect.InjectionPointMap
-import scala.collection.mutable.HashMap
+import scala.collection.mutable.HashMap
 
 /**
  * Trait implementing the functionalities of the {@link

tinfi/module/opt-comp/mixins/src/main/java/org/ow2/frascati/tinfi/control/content/SCAContentControllerImpl.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

tinfi/module/opt-comp/mixins/src/main/java/org/ow2/frascati/tinfi/control/content/SCAContentControllerTrait.scala

 /***
  * OW2 FraSCAti Tinfi
- * Copyright (C) 2011 INRIA, USTL
+ * Copyright (C) 2011-2012 Inria, Univ. Lille 1
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,7 +23,7 @@
 
 package org.ow2.frascati.tinfi.control.content
 
-import org.objectweb.fractal.julia.BasicControllerTrait
+import org.objectweb.fractal.julia.BasicControllerTrait
 
 /**
  * Trait implementing the {@link SCAExtendedContentController} control