From glandais@users.labs.libre-entreprise.org Mon Jun 15 08:42:48 2026
From: glandais@users.labs.libre-entreprise.org
To: simexplorer-si-commits@list.forge.codelutin.com
Subject: [Simexplorer-si-commits] r25 - in trunk/simexplorer-si-template:
	simexplorer-si-template-ejb/src/java/META-INF
	simexplorer-si-template-ejb/src/java/org/codelutin/test/dao
	simexplorer-si-template-ejb/src/java/org/codelutin/test/entities
	simexplorer-si-template-ejb/src/java/org/codelutin/test/service
	simexplorer-si-template-web/src
	simexplorer-si-template-web/src/java/org/codelutin/test/tools	=?utf-8?q?sim?=
 =?utf-8?q?explorer-si-template-web/src/java/org/codelutin/test/web/pages/pr?=
 =?utf-8?q?ojectManagement?=	simexplorer-si-template-web/src/py
Date: Sun, 04 Nov 2007 18:19:39 +0100
Message-ID: <20071104171939.8EB6E461A76@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6289225849164499597=="

--===============6289225849164499597==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: glandais
Date: 2007-11-04 17:19:39 +0000 (Sun, 04 Nov 2007)
New Revision: 25

Added:
   trunk/simexplorer-si-template/simexplorer-si-template-web/src/python/
   trunk/simexplorer-si-template/simexplorer-si-template-web/src/python/clien=
t.py
Modified:
   trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/META-IN=
F/orm.xml
   trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/org/cod=
elutin/test/dao/DaoProject.java
   trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/org/cod=
elutin/test/entities/Task.java
   trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/org/cod=
elutin/test/service/IServiceProject.java
   trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/org/cod=
elutin/test/service/ServiceProject.java
   trunk/simexplorer-si-template/simexplorer-si-template-web/src/java/org/cod=
elutin/test/tools/ContextListener.java
   trunk/simexplorer-si-template/simexplorer-si-template-web/src/java/org/cod=
elutin/test/web/pages/projectManagement/ProjectList.java
   trunk/simexplorer-si-template/simexplorer-si-template-web/src/java/org/cod=
elutin/test/web/pages/projectManagement/ProjectView.java
   trunk/simexplorer-si-template/simexplorer-si-template-web/src/webcontent/p=
rojectManagement/ProjectView.tml
Log:
Mise en disponiblit?\195?\169 du webservice

Modified: trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/=
META-INF/orm.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/META-I=
NF/orm.xml	2007-10-31 19:29:01 UTC (rev 24)
+++ trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/META-I=
NF/orm.xml	2007-11-04 17:19:39 UTC (rev 25)
@@ -10,28 +10,24 @@
=20
 	<package>org.codelutin.test.entities</package>
=20
-	<mapped-superclass class=3D"BaseEntity">
+	<entity class=3D"BaseEntity">
 		<attributes>
 			<id name=3D"id">
 				<generated-value strategy=3D"IDENTITY" />
 			</id>
 			<transient name=3D"new" />
 		</attributes>
-	</mapped-superclass>
+	</entity>
=20
 	<entity class=3D"Task">
-		<table name=3D"TASKS" />
 		<attributes>
-			<id name=3D"id">
-				<generated-value strategy=3D"IDENTITY" />
-			</id>
 			<basic name=3D"time">
 				<temporal>TIME</temporal>
 			</basic>
 			<basic name=3D"name"></basic>
-			<many-to-one name=3D"parent" target-entity=3D"Task"
+			<many-to-one name=3D"parent" target-entity=3D"BaseEntity"
 				fetch=3D"LAZY" />
-			<one-to-many name=3D"enfants" target-entity=3D"Task">
+			<one-to-many name=3D"enfants" target-entity=3D"BaseEntity">
 			 	<cascade>
 			 		<cascade-all/>
 			 	</cascade>
@@ -40,7 +36,6 @@
 	</entity>
 =09
 	<entity class=3D"Project">
-		<table name=3D"PROJECTS"/>
 		<attributes>
 			<basic name=3D"cost"></basic>
 		</attributes>

Modified: trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/=
org/codelutin/test/dao/DaoProject.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/org/co=
delutin/test/dao/DaoProject.java	2007-10-31 19:29:01 UTC (rev 24)
+++ trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/org/co=
delutin/test/dao/DaoProject.java	2007-11-04 17:19:39 UTC (rev 25)
@@ -14,28 +14,40 @@
 @Stateless
 public class DaoProject implements IDaoProject {
=20
-	@PersistenceContext(unitName=3D"persistence-unit")
+	@PersistenceContext(unitName =3D "persistence-unit")
 	private EntityManager em;
=20
+	/*
+	private void initializeTask(Task task) {
+		Set<Task> children =3D task.getEnfants();
+		for (Iterator iterator =3D children.iterator(); iterator.hasNext();) {
+			Task child =3D (Task) iterator.next();
+			child.getName().toString();
+		}
+	}
+	*/
+
 	public void deleteOne(Integer id) {
 		Task task =3D em.find(Task.class, id);
 		if (task =3D=3D null) {
-			throw new DaoException(String.format("Task n?[%d] inconnue", id), 2);
+			throw new DaoException(String.format("Task [%d] inconnue", id), 2);
 		}
 		em.remove(task);
 	}
=20
 	public List<Task> getAll() {
-		return em.createQuery("select t from Task t").getResultList();
+		List<Task> tasks =3D em.createQuery("select t from Task t")
+				.getResultList();
+		for (Iterator iterator =3D tasks.iterator(); iterator.hasNext();) {
+			Task task =3D (Task) iterator.next();
+			//initializeTask(task);
+		}
+		return tasks;
 	}
=20
 	public Task getTask(Integer id) {
 		Task task =3D em.find(Task.class, id);
-		Set<Task> children =3D task.getEnfants();
-		for (Iterator iterator =3D children.iterator(); iterator.hasNext();) {
-			Task child =3D (Task) iterator.next();
-			child.getName().toString();
-		}
+		//initializeTask(task);
 		return task;
 	}
=20
@@ -47,13 +59,20 @@
 	public Task updateOne(Task task) {
 		Task p =3D em.find(Task.class, task.getId());
 		if (p =3D=3D null) {
-			throw new DaoException(String.format("task n?[%d] inconnue", task.getId()=
), 2);
+			throw new DaoException(String.format("task [%d] inconnue", task
+					.getId()), 2);
 		}
 		return em.merge(task);
 	}
=20
 	public List<Project> getAllProjects() {
-		return em.createQuery("select p from Project p").getResultList();
+		List<Project> projects =3D em.createQuery("select p from Project p")
+				.getResultList();
+		for (Iterator iterator =3D projects.iterator(); iterator.hasNext();) {
+			Project project =3D (Project) iterator.next();
+			//initializeTask(project);
+		}
+		return projects;
 	}
=20
 }

Modified: trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/=
org/codelutin/test/entities/Task.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/org/co=
delutin/test/entities/Task.java	2007-10-31 19:29:01 UTC (rev 24)
+++ trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/org/co=
delutin/test/entities/Task.java	2007-11-04 17:19:39 UTC (rev 25)
@@ -9,13 +9,13 @@
=20
 	private Date time;
 	private String name;
-	private Task parent;
-	private Set<Task> enfants;
+	private BaseEntity parent;
+	private Set<BaseEntity> enfants;
 =09
-	public Task getParent() {
+	public BaseEntity getParent() {
 		return parent;
 	}
-	public void setParent(Task parent) {
+	public void setParent(BaseEntity parent) {
 		this.parent =3D parent;
 	}
 	public Date getTime() {
@@ -35,10 +35,10 @@
 		return res;
 	}
 =09
-	public Set<Task> getEnfants() {
+	public Set<BaseEntity> getEnfants() {
 		return enfants;
 	}
-	public void setEnfants(Set<Task> enfants) {
+	public void setEnfants(Set<BaseEntity> enfants) {
 		this.enfants =3D enfants;
 	}
 	public String getName() {

Modified: trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/=
org/codelutin/test/service/IServiceProject.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/org/co=
delutin/test/service/IServiceProject.java	2007-10-31 19:29:01 UTC (rev 24)
+++ trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/org/co=
delutin/test/service/IServiceProject.java	2007-11-04 17:19:39 UTC (rev 25)
@@ -9,7 +9,7 @@
=20
 public interface IServiceProject {
=20
-	public List<Task> getAll();
+	public Task[] getAll();
=20
 	public Task saveOne(Task task);
=20
@@ -19,7 +19,7 @@
 =09
 	public Date getTotalTime(Integer id);
=20
-	public List<Project> getAllProjects();
+	public Project[] getAllProjects();
=20
 	public Project getProject(Integer projectId);
=20

Modified: trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/=
org/codelutin/test/service/ServiceProject.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/org/co=
delutin/test/service/ServiceProject.java	2007-10-31 19:29:01 UTC (rev 24)
+++ trunk/simexplorer-si-template/simexplorer-si-template-ejb/src/java/org/co=
delutin/test/service/ServiceProject.java	2007-11-04 17:19:39 UTC (rev 25)
@@ -9,47 +9,61 @@
 import javax.ejb.Stateless;
 import javax.ejb.TransactionAttribute;
 import javax.ejb.TransactionAttributeType;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
=20
 import org.codelutin.test.dao.IDaoProject;
+import org.codelutin.test.entities.BaseEntity;
 import org.codelutin.test.entities.Project;
 import org.codelutin.test.entities.Task;
=20
 @Stateless
 @TransactionAttribute(TransactionAttributeType.REQUIRED)
+ at WebService(name=3D"CodeLutinTest", serviceName=3D"ServiceProject")
+ at SOAPBinding(style=3DStyle.RPC)
 public class ServiceProject implements IServiceProject {
=20
 	@EJB
 	private IDaoProject dao;
 =09
+	@WebMethod
 	public void deleteOne(Integer id) {
 		dao.deleteOne(id);
 	}
=20
-	public List<Task> getAll() {
-		return dao.getAll();
+	@WebMethod
+	public Task[] getAll() {
+		List<Task> tasks =3D dao.getAll();=20
+		return tasks.toArray(new Task[0]);
 	}
=20
+	@WebMethod
 	public Task saveOne(Task task) {
 		return dao.saveOne(task);
 	}
=20
+	@WebMethod
 	public Task updateOne(Task task) {
 		return dao.updateOne(task);
 	}
=20
-	public List<Project> getAllProjects() {
-		return dao.getAllProjects();
+	@WebMethod
+	public Project[] getAllProjects() {
+		return dao.getAllProjects().toArray(new Project[0]);
 	}
=20
+	@WebMethod
 	public Date getTotalTime(Integer id) {
 		Date total =3D new Date(0);
 	=09
 		Task t =3D dao.getTask(id);
 		total.setTime(total.getTime() + t.getTime().getTime());
-		Set<Task> enfants =3D t.getEnfants();
+		Set<BaseEntity> enfants =3D t.getEnfants();
 		if (enfants !=3D null && enfants.size() > 0) {
-			for (Iterator<Task> iterator =3D enfants.iterator(); iterator.hasNext();)=
 {
-				Task enfant =3D iterator.next();
+			for (Iterator<BaseEntity> iterator =3D enfants.iterator(); iterator.hasNe=
xt();) {
+				BaseEntity enfant =3D iterator.next();
 				total.setTime(total.getTime() + getTotalTime(enfant.getId()).getTime());
 			}
 		}
@@ -57,6 +71,7 @@
 		return total;
 	}
=20
+	@WebMethod
 	public Project getProject(Integer projectId) {
 		return (Project) dao.getTask(projectId);
 	}

Modified: trunk/simexplorer-si-template/simexplorer-si-template-web/src/java/=
org/codelutin/test/tools/ContextListener.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/simexplorer-si-template/simexplorer-si-template-web/src/java/org/co=
delutin/test/tools/ContextListener.java	2007-10-31 19:29:01 UTC (rev 24)
+++ trunk/simexplorer-si-template/simexplorer-si-template-web/src/java/org/co=
delutin/test/tools/ContextListener.java	2007-11-04 17:19:39 UTC (rev 25)
@@ -14,6 +14,7 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
=20
+import org.codelutin.test.entities.BaseEntity;
 import org.codelutin.test.entities.Project;
 import org.codelutin.test.entities.Task;
 import org.codelutin.test.service.IServiceProject;
@@ -32,10 +33,10 @@
 			IServiceProject serviceProjets =3D (IServiceProject) context
 					.lookup("ServiceProject/local");
 		=09
-			List<Task> tasks =3D serviceProjets.getAll();
-			for (Iterator iterator =3D tasks.iterator(); iterator.hasNext();) {
-				Task name =3D (Task) iterator.next();
-				serviceProjets.deleteOne(name.getId());
+			Task[] tasks =3D serviceProjets.getAll();
+			for (int i =3D 0; i < tasks.length; i++) {
+				Task task =3D tasks[i];
+				serviceProjets.deleteOne(task.getId());
 			}
 		=09
 			generateTasks(serviceProjets, null, 0, "");
@@ -55,8 +56,8 @@
=20
 	}
 =09
-	private Set<Task> generateTasks(IServiceProject serviceProjets, Task parent=
, int level, String arbo) {
-		HashSet<Task> tasks =3D new HashSet<Task>();
+	private Set<BaseEntity> generateTasks(IServiceProject serviceProjets, Task =
parent, int level, String arbo) {
+		HashSet<BaseEntity> tasks =3D new HashSet<BaseEntity>();
 	=09
 		Random r =3D new Random();
 		int nTasks =3D 2 + r.nextInt(2);
@@ -77,7 +78,7 @@
 		=09
 			serviceProjets.saveOne(task);
 			if ((level < 3)) {// || (r.nextInt(100)<50)) {
-				Set<Task> enfants =3D generateTasks(serviceProjets, task, level + 1, arb=
o + i + ".");
+				Set<BaseEntity> enfants =3D generateTasks(serviceProjets, task, level + =
1, arbo + i + ".");
 				task.setEnfants(enfants);
 			}		=09
 			serviceProjets.updateOne(task);

Modified: trunk/simexplorer-si-template/simexplorer-si-template-web/src/java/=
org/codelutin/test/web/pages/projectManagement/ProjectList.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/simexplorer-si-template/simexplorer-si-template-web/src/java/org/co=
delutin/test/web/pages/projectManagement/ProjectList.java	2007-10-31 19:29:01=
 UTC (rev 24)
+++ trunk/simexplorer-si-template/simexplorer-si-template-web/src/java/org/co=
delutin/test/web/pages/projectManagement/ProjectList.java	2007-11-04 17:19:39=
 UTC (rev 25)
@@ -22,7 +22,7 @@
 		return new Date();
 	}
=20
-	public List<Project> getProjects() {	=09
+	public Project[] getProjects() {	=09
 		return getServiceProjets().getAllProjects();
 	}
=20

Modified: trunk/simexplorer-si-template/simexplorer-si-template-web/src/java/=
org/codelutin/test/web/pages/projectManagement/ProjectView.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/simexplorer-si-template/simexplorer-si-template-web/src/java/org/co=
delutin/test/web/pages/projectManagement/ProjectView.java	2007-10-31 19:29:01=
 UTC (rev 24)
+++ trunk/simexplorer-si-template/simexplorer-si-template-web/src/java/org/co=
delutin/test/web/pages/projectManagement/ProjectView.java	2007-11-04 17:19:39=
 UTC (rev 25)
@@ -1,5 +1,7 @@
 package org.codelutin.test.web.pages.projectManagement;
=20
+import java.util.Date;
+
 import org.apache.tapestry.annotations.Persist;
 import org.codelutin.test.entities.Project;
 import org.codelutin.test.entities.Task;
@@ -28,4 +30,8 @@
 		this.project =3D project;
 	}
 =09
+	public Date getTotalTime() {
+		return getServiceProjets().getTotalTime(project.getId());
+	}
+=09
 }

Added: trunk/simexplorer-si-template/simexplorer-si-template-web/src/python/c=
lient.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/simexplorer-si-template/simexplorer-si-template-web/src/python/clie=
nt.py	                        (rev 0)
+++ trunk/simexplorer-si-template/simexplorer-si-template-web/src/python/clie=
nt.py	2007-11-04 17:19:39 UTC (rev 25)
@@ -0,0 +1,7 @@
+from SOAPpy import WSDL
+wsdlFile =3D 'http://localhost:8080/simexplorer-si-template-ejb/ServiceProje=
ct?wsdl'
+server =3D WSDL.Proxy(wsdlFile)
+print 'Liste des m=C3=A9thodes du service'
+server.methods.keys()
+exit()
+

Modified: trunk/simexplorer-si-template/simexplorer-si-template-web/src/webco=
ntent/projectManagement/ProjectView.tml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/simexplorer-si-template/simexplorer-si-template-web/src/webcontent/=
projectManagement/ProjectView.tml	2007-10-31 19:29:01 UTC (rev 24)
+++ trunk/simexplorer-si-template/simexplorer-si-template-web/src/webcontent/=
projectManagement/ProjectView.tml	2007-11-04 17:19:39 UTC (rev 25)
@@ -4,6 +4,14 @@
 	<h1 class=3D"Title">${message:pagetitle}</h1>
 =09
 	<hr class=3D"Ligne"/>
+
+	<h1 class=3D"Title">Projet ${project.id} : ${project.name}</h1>
+	<h1 class=3D"Title">Temps propre : ${project.time}</h1>
+	<h1 class=3D"Title">Temps total : ${totalTime}</h1>
+
+	<hr class=3D"Ligne"/>
+
+	<h1 class=3D"Title">T=C3=A2ches :</h1>
 	=09
 		<table class=3D"Large">
 			<tr class=3D"First">
@@ -11,11 +19,6 @@
 				<td>${message:name}</td>
 				<td>${message:time}</td>
 			</tr>
-			<tr class=3D"First">
-				<td>${project.id}</td>
-				<td>${project.name}</td>
-				<td>${project.time}</td>
-			</tr>
 			<t:loop source=3D"project.enfants" value=3D"task">
 				<tr>
 					<td>${task.id}</td>


--===============6289225849164499597==--