edevsagetools-commit Mailing List for eDev Sage Tools (Page 2)
Status: Beta
Brought to you by:
avdyk
You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
|
Feb
(23) |
Mar
(10) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <av...@us...> - 2007-02-19 15:31:36
|
Revision: 14 http://svn.sourceforge.net/edevsagetools/?rev=14&view=rev Author: avdyk Date: 2007-02-19 07:31:31 -0800 (Mon, 19 Feb 2007) Log Message: ----------- Modified Paths: -------------- trunk/.classpath trunk/synchro-client/pom.xml Added Paths: ----------- trunk/synchro/ trunk/synchro/pom.xml trunk/synchro-client/src/main/META-INF/ trunk/synchro-client/src/main/META-INF/manifest.mf Removed Paths: ------------- trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/ Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2007-02-19 15:28:30 UTC (rev 13) +++ trunk/.classpath 2007-02-19 15:31:31 UTC (rev 14) @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="synchro-client/src/main/java"/> + <classpathentry kind="src" path="synchro-webapp/src/main/java"/> <classpathentry kind="src" path="synchro-client/src/test/java"/> <classpathentry kind="src" path="synchro-core/src/main/java"/> <classpathentry kind="src" path="synchro-core/src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="build"/> + <classpathentry kind="output" path="target"/> </classpath> Added: trunk/synchro/pom.xml =================================================================== --- trunk/synchro/pom.xml (rev 0) +++ trunk/synchro/pom.xml 2007-02-19 15:31:31 UTC (rev 14) @@ -0,0 +1,127 @@ +<?xml version="1.0"?><project> + <modelVersion>4.0.0</modelVersion> + <groupId>be.edev.sagetools</groupId> + <artifactId>edevsagetools</artifactId> + <packaging>pom</packaging> + <name>eDev Sage Tools</name> + <version>1.0-SNAPSHOT</version> + <url>http://sagetools.edev.be</url> + <modules> + <module>synchro-core</module> + <module>synchro-client</module> + <module>synchro-webapp</module> + </modules> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.12</version> + </dependency> + <!-- Common? --> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate</artifactId> + <version>3.0.5</version> + </dependency> + <dependency> + <groupId>javax.sql</groupId> + <artifactId>jdbc-stdext</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm-attrs</artifactId> + <version>1.4.3</version> + </dependency> + <dependency> + <groupId>bsf</groupId> + <artifactId>bsf</artifactId> + <version>2.3.0</version> + </dependency> + <dependency> + <groupId>c3p0</groupId> + <artifactId>c3p0</artifactId> + <version>0.9.0.2</version> + </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.2.1</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + <version>1.4.1</version> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.3.3_01</version> + </dependency> + <!-- Only for -webapp --> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>3.1.12</version> + </dependency> + </dependencies> +</project> Modified: trunk/synchro-client/pom.xml =================================================================== --- trunk/synchro-client/pom.xml 2007-02-19 15:28:30 UTC (rev 13) +++ trunk/synchro-client/pom.xml 2007-02-19 15:31:31 UTC (rev 14) @@ -1,14 +1,14 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>be.edev.edevsagetools.synchro.client</groupId> - <artifactId>synchro-client</artifactId> + <groupId>be.edev.sagetools.synchro</groupId> + <artifactId>client</artifactId> <packaging>jar</packaging> <version>1.0-SNAPSHOT</version> <name>Sage Synchronization Client</name> - <url>http://edevsagetools.sourceforge.net</url> + <url>http://sagetools.edev.be</url> <parent> - <groupId>be.edev.edevsagetools</groupId> + <groupId>be.edev.sagetools</groupId> <artifactId>edevsagetools</artifactId> <version>1.0-SNAPSHOT</version> </parent> @@ -19,5 +19,10 @@ <version>3.8.1</version> <scope>test</scope> </dependency> + <dependency> + <groupId>${pom.groupId}</groupId> + <artifactId>core</artifactId> + <version>${pom.currentVersion}</version> + </dependency> </dependencies> </project> Added: trunk/synchro-client/src/main/META-INF/manifest.mf =================================================================== --- trunk/synchro-client/src/main/META-INF/manifest.mf (rev 0) +++ trunk/synchro-client/src/main/META-INF/manifest.mf 2007-02-19 15:31:31 UTC (rev 14) @@ -0,0 +1 @@ +Main-Class: be.edev.synchro.EdevDBSynchro This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <av...@us...> - 2007-02-19 15:24:19
|
Revision: 12 http://svn.sourceforge.net/edevsagetools/?rev=12&view=rev Author: avdyk Date: 2007-02-19 07:24:18 -0800 (Mon, 19 Feb 2007) Log Message: ----------- Added Paths: ----------- trunk/synchro-client/src/main/java/be/edev/sagetools/synchro/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <av...@us...> - 2007-02-19 15:23:47
|
Revision: 11 http://svn.sourceforge.net/edevsagetools/?rev=11&view=rev Author: avdyk Date: 2007-02-19 07:23:46 -0800 (Mon, 19 Feb 2007) Log Message: ----------- Added Paths: ----------- trunk/synchro-client/src/main/java/be/edev/sagetools/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <av...@us...> - 2007-02-19 15:22:49
|
Revision: 10 http://svn.sourceforge.net/edevsagetools/?rev=10&view=rev Author: avdyk Date: 2007-02-19 07:22:48 -0800 (Mon, 19 Feb 2007) Log Message: ----------- moving directories Removed Paths: ------------- trunk/synchro-client/src/main/java/be/edev/edevsagetools/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <av...@us...> - 2007-02-19 15:20:03
|
Revision: 9 http://svn.sourceforge.net/edevsagetools/?rev=9&view=rev Author: avdyk Date: 2007-02-19 07:19:56 -0800 (Mon, 19 Feb 2007) Log Message: ----------- changed group-id plus other additions Modified Paths: -------------- trunk/pom.xml trunk/synchro-webapp/pom.xml trunk/synchro-webapp/src/main/webapp/WEB-INF/web.xml Added Paths: ----------- trunk/synchro-webapp/src/main/filters/ trunk/synchro-webapp/src/main/java/ trunk/synchro-webapp/src/main/java/be/ trunk/synchro-webapp/src/main/java/be/edev/ trunk/synchro-webapp/src/main/java/be/edev/sagetools/ trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/ trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/ trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/SynchroServlet.java trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/UpdateSageTableServlet.java trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/ trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/DAOException.java trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/DAOFactory.java trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/HibernateInit.java trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/SynchroNettoyageDAO.java trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/SynchroSaveDAO.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2007-02-19 15:17:56 UTC (rev 8) +++ trunk/pom.xml 2007-02-19 15:19:56 UTC (rev 9) @@ -1,11 +1,11 @@ <?xml version="1.0"?><project> <modelVersion>4.0.0</modelVersion> - <groupId>be.edev.edevsagetools</groupId> + <groupId>be.edev.sagetools</groupId> <artifactId>edevsagetools</artifactId> <packaging>pom</packaging> <name>eDev Sage Tools</name> <version>1.0-SNAPSHOT</version> - <url>http://edevsagetools.sourceforge.net</url> + <url>http://sagetools.edev.be</url> <modules> <module>synchro-core</module> <module>synchro-client</module> @@ -44,5 +44,84 @@ <artifactId>log4j</artifactId> <version>1.2.12</version> </dependency> + <!-- Common? --> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate</artifactId> + <version>3.0.5</version> + </dependency> + <dependency> + <groupId>javax.sql</groupId> + <artifactId>jdbc-stdext</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm-attrs</artifactId> + <version>1.4.3</version> + </dependency> + <dependency> + <groupId>bsf</groupId> + <artifactId>bsf</artifactId> + <version>2.3.0</version> + </dependency> + <dependency> + <groupId>c3p0</groupId> + <artifactId>c3p0</artifactId> + <version>0.9.0.2</version> + </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.2.1</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + <version>1.4.1</version> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.3.3_01</version> + </dependency> + <!-- Only for -webapp --> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>3.1.12</version> + </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: trunk/synchro-webapp/pom.xml =================================================================== --- trunk/synchro-webapp/pom.xml 2007-02-19 15:17:56 UTC (rev 8) +++ trunk/synchro-webapp/pom.xml 2007-02-19 15:19:56 UTC (rev 9) @@ -1,14 +1,14 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>be.edev.edevsagetools.synchro.servlet</groupId> - <artifactId>synchro-webapp</artifactId> + <groupId>be.edev.sagetools.synchro</groupId> + <artifactId>webapp</artifactId> <packaging>war</packaging> <version>1.0-SNAPSHOT</version> <name>Sage Synchronization Servlet</name> - <url>http://edevsagetools.sourceforge.net</url> + <url>http://sagetools.edev.be</url> <parent> - <groupId>be.edev.edevsagetools</groupId> + <groupId>be.edev.sagetools</groupId> <artifactId>edevsagetools</artifactId> <version>1.0-SNAPSHOT</version> </parent> Added: trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/SynchroServlet.java =================================================================== --- trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/SynchroServlet.java (rev 0) +++ trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/SynchroServlet.java 2007-02-19 15:19:56 UTC (rev 9) @@ -0,0 +1,99 @@ +package be.edev.sagetools.synchro.servlets; + + +import java.beans.XMLDecoder; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.List; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import be.edev.sagetools.beans.Article; +import be.edev.sagetools.beans.Promo; +import be.edev.sagetools.synchro.servlets.dao.DAOFactory; +import be.edev.sagetools.synchro.servlets.dao.SynchroSaveDAO; + +public class SynchroServlet extends HttpServlet +{ + + protected Log log4 = LogFactory.getLog("SynchroServlet"); + + /** + * Commentaire pour <code>serialVersionUID</code> + */ + private static final long serialVersionUID = 8344558100991728182L; + + /** + * @param arg0 + * @param arg1 + * @throws ServletException + * @throws IOException + * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, + * javax.servlet.http.HttpServletResponse) + */ + protected void doGet(HttpServletRequest arg0, HttpServletResponse arg1) + throws IOException + { + this.doPost(arg0, arg1); + } + + /** + * @param arg0 + * @param arg1 + * @throws ServletException + * @throws IOException + * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, + * javax.servlet.http.HttpServletResponse) + */ + protected void doPost(HttpServletRequest req, HttpServletResponse res) + throws IOException + { + this.log4.debug("entree dans la synchronisation"); + XMLDecoder dec = new XMLDecoder(req.getInputStream()); + List l = (List) dec.readObject(); + int i = l.size(); + this.log4.debug("Obtention de l'iterateur sur la liste XML"); + this.log4.info("Il y a " + i + " objets a sauver"); + if (i > 0) + { + try + { + SynchroSaveDAO s = DAOFactory.getInstance().getSynchroSaveDAO(); + s.save(l); + if (l.get(0) instanceof Article) + { + this.log4.debug("On vient de recevoir des articles"); + DAOFactory.getInstance().getSynchroNettoyageDAO() + .supprimeArticlesNonPublie(); + } + else + if (l.get(0) instanceof Promo) + { + this.log4.debug("On vient de recevoir des promos"); + DAOFactory.getInstance().getSynchroNettoyageDAO() + .supprimeAnciennesPromos(); + } + } + catch (Exception e) + { + this.log4.error("Oups!... Probleme a la synchro", e); + } + } + else + { + this.log4.warn("Il n'y avait rien dans la liste."); + } + res.setContentType("text/plain"); + PrintWriter out = res.getWriter(); + out.println(i); + out.flush(); + out.close(); + } + +} Added: trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/UpdateSageTableServlet.java =================================================================== --- trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/UpdateSageTableServlet.java (rev 0) +++ trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/UpdateSageTableServlet.java 2007-02-19 15:19:56 UTC (rev 9) @@ -0,0 +1,125 @@ +package be.edev.sagetools.synchro.servlets; + + +import java.beans.XMLEncoder; +import java.io.IOException; +import java.io.OutputStream; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Date; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.HibernateException; +import org.hibernate.Session; + +import be.edev.sagetools.synchro.servlets.dao.DAOException; +import be.edev.sagetools.synchro.servlets.dao.DAOFactory; + +public class UpdateSageTableServlet extends HttpServlet +{ + + protected Log log4 = LogFactory.getLog("UpdateSageTableServlet"); + + /** + * Commentaire pour <code>serialVersionUID</code> + */ + private static final long serialVersionUID = 4920892222890925161L; + + public UpdateSageTableServlet() + { + super(); + } + + /** + * @param arg0 + * @throws ServletException + * @see javax.servlet.GenericServlet#init(javax.servlet.ServletConfig) + */ + public void init(ServletConfig config) throws ServletException + { + super.init(config); + } + + /** + * @param arg0 + * @param arg1 + * @throws ServletException + * @throws IOException + * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, + * javax.servlet.http.HttpServletResponse) + */ + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws IOException + { + String table = request.getParameter("table"); + Date lastUpdate = new Date(0); + this.log4.debug("Maj de la table: " + table); + Session s = null; + Connection c = null; + try + { + s = DAOFactory.getInstance().getSession(); + c = s.connection(); + ResultSet rs = c.createStatement().executeQuery( + "SELECT max(cbmodification) FROM " + table); + if (rs.next()) + { + java.sql.Date d = rs.getDate(1); + if (d != null) + { + lastUpdate = new java.util.Date(d.getTime()); + } + } + this.log4.debug("Valeur de la date: " + lastUpdate.toString()); + } + catch (DAOException de) + { + this.log4.error("Pas moyen d'obtenir une connexion", de); + } + catch (SQLException e) + { + this.log4.error("Probleme de mise a jour de la table: " + table, e); + } finally + { + if (c != null) + { + try + { + c.close(); + } + catch (SQLException sqlex) + { + this.log4.error("Impossible de fermer la connexion", sqlex); + } + } + if (s != null) + { + try + { + s.close(); + } + catch (HibernateException e) + { + this.log4.error("Impossible de fermer la session", e); + } + } + } + response.setContentType("text/xml"); + OutputStream out = response.getOutputStream(); + XMLEncoder e = new XMLEncoder(out); + e.writeObject(lastUpdate); + e.flush(); + e.close(); + out.flush(); + out.close(); + } + +} Added: trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/DAOException.java =================================================================== --- trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/DAOException.java (rev 0) +++ trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/DAOException.java 2007-02-19 15:19:56 UTC (rev 9) @@ -0,0 +1,48 @@ +package be.edev.sagetools.synchro.servlets.dao; + + +/** + * Exception lors de la persistence des données. + * + * @author Arnaud + */ +public class DAOException extends Exception +{ + + private static final long serialVersionUID = 1798608990237254824L; + + /** + * + */ + public DAOException() + { + super(); + } + + /** + * @param message + */ + public DAOException(String message) + { + super(message); + } + + /** + * @param message + * @param cause + */ + public DAOException(String message, Throwable cause) + { + super(message, cause); + } + + /** + * @param cause + */ + public DAOException(Throwable cause) + { + super(cause); + } + +} + Added: trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/DAOFactory.java =================================================================== --- trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/DAOFactory.java (rev 0) +++ trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/DAOFactory.java 2007-02-19 15:19:56 UTC (rev 9) @@ -0,0 +1,59 @@ +package be.edev.sagetools.synchro.servlets.dao; + +import java.sql.Connection; + +import org.hibernate.Session; + +import be.edev.sagetools.synchro.servlets.dao.hibernate.DAOFactoryHibernateImpl; + +public abstract class DAOFactory +{ + + public static final int HIBERNATE_FACTORY = 1; + + private static DAOFactory factory = null; + + protected DAOFactory() + { + super(); + } + + public static DAOFactory getInstance() throws DAOException + { + return DAOFactory.getInstance(DAOFactory.HIBERNATE_FACTORY); + } + + public synchronized static DAOFactory getInstance(int type) + throws DAOException + { + return DAOFactory.getInstance(type, null); + } + + public synchronized static DAOFactory getInstance(int type, String configFile) + throws DAOException + { + if (DAOFactory.factory == null) + { + switch (type) + { + case DAOFactory.HIBERNATE_FACTORY: + default: + DAOFactory.factory = new DAOFactoryHibernateImpl(configFile); + } + } + return DAOFactory.factory; + } + + public abstract Connection getConnection(); + + public abstract Session getSession(); + + public abstract ObjetParNomDAO getObjetParNomDAO(); + + public abstract SynchroSaveDAO getSynchroSaveDAO(); + + public abstract ObjetParIdDAO getObjetParIdDAO(); + + public abstract SynchroNettoyageDAO getSynchroNettoyageDAO(); + +} Added: trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/HibernateInit.java =================================================================== --- trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/HibernateInit.java (rev 0) +++ trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/HibernateInit.java 2007-02-19 15:19:56 UTC (rev 9) @@ -0,0 +1,49 @@ +package be.edev.sagetools.synchro.servlets.dao; + + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +public class HibernateInit extends HttpServlet +{ + + /** + * Commentaire pour <code>serialVersionUID</code> + */ + private static final long serialVersionUID = -1116225951254856563L; + + protected Log log4 = LogFactory.getLog("HibernatePlugIn"); + + /** + * @see javax.servlet.GenericServlet#destroy() + */ + public void destroy() + { + super.destroy(); + } + + /** + * @param arg0 + * @throws ServletException + * @see javax.servlet.GenericServlet#init(javax.servlet.ServletConfig) + */ + public void init(ServletConfig arg0) throws ServletException + { + super.init(arg0); + this.log4.debug("Chargement de la session Hibernate..."); + try + { + DAOFactory.getInstance(DAOFactory.HIBERNATE_FACTORY); + } + catch (DAOException daoex) + { + this.log4.error("Could not create the hibernate session", daoex); + } + this.log4.debug("Session Hibernate chargee"); + } + +} Added: trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/SynchroNettoyageDAO.java =================================================================== --- trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/SynchroNettoyageDAO.java (rev 0) +++ trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/SynchroNettoyageDAO.java 2007-02-19 15:19:56 UTC (rev 9) @@ -0,0 +1,12 @@ +package be.edev.sagetools.synchro.servlets.dao; + + + +public interface SynchroNettoyageDAO +{ + + public void supprimeArticlesNonPublie() throws DAOException; + + public void supprimeAnciennesPromos() throws DAOException; + +} Added: trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/SynchroSaveDAO.java =================================================================== --- trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/SynchroSaveDAO.java (rev 0) +++ trunk/synchro-webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/SynchroSaveDAO.java 2007-02-19 15:19:56 UTC (rev 9) @@ -0,0 +1,48 @@ +package be.edev.sagetools.synchro.servlets.dao; + + +import java.util.List; + +/** + * @author arnaud + */ +public interface SynchroSaveDAO +{ + + // requete de verification: + // select pay_libelle as 'pays', reg_libelle as 'region', app_libelle as + // 'appellation', dom_libelle as 'domaine', count(art_reference) as 'Nbr + // articles' from pays join regions on pay_id=reg_fk_pays join + // regionsappellations on reg_id=rap_fk_region join appellations on + // rap_fk_appellation=app_id join appellationsdomaines on + // app_id=ado_fk_appellation join domaines on ado_fk_domaine=dom_id join + // articles on art_fk_domaine group by dom_id; + + // nombre d'article par appellation + // select pay_libelle as 'pays', reg_libelle as 'region', app_libelle as + // 'appellation', count(art_reference) as 'Nbr articles' from pays join + // regions on pay_id=reg_fk_pays join regionsappellations on + // reg_id=rap_fk_region join appellations on rap_fk_appellation=app_id join + // articles on art_fk_appellation=app_id group by app_id order by 'Nbr + // articles' desc; + + // nombre total d'articles + // select count(art_reference) as 'Nbr total articles' from articles; + + // nombre total de domaines + // select count(dom_id) as 'Nbr de domaines' from domaines; + + // nombre total d'appellations + // select count(app_id) as 'Nbr appellations' from appellations; + + // nombre total de regions + // select count(reg_id) as 'Nbr regions' from regions; + + // nombre total de pays + // select pay_libelle as 'pays', count(art_reference) as 'Nbr articles' from + // pays join regions on reg_fk_pays = pay_id join articles on + // reg_id=art_fk_region group by pay_id; + + public void save(List list) throws DAOException; + +} Modified: trunk/synchro-webapp/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/synchro-webapp/src/main/webapp/WEB-INF/web.xml 2007-02-19 15:17:56 UTC (rev 8) +++ trunk/synchro-webapp/src/main/webapp/WEB-INF/web.xml 2007-02-19 15:19:56 UTC (rev 9) @@ -1,7 +1,78 @@ -<!DOCTYPE web-app PUBLIC - "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd" > +<?xml version="1.0" encoding="UTF-8"?> +<web-app id="WebApp_ID" version="2.4" + xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> -<web-app> - <display-name>Archetype Created Web Application</display-name> + <display-name>eDev Sage Tools</display-name> + +<!-- + <resource-ref> + <res-ref-name>jdbc/tobydb</res-ref-name> + <res-type>javax.sql.DataSource</res-type> + <res-auth>Container</res-auth> + </resource-ref> +--> + <!-- no more needed --> + <servlet> + <servlet-name>updateSageSynchro</servlet-name> + <servlet-class> + be.edev.toby.servlets.UpdateSageSynchroServlet + </servlet-class> + <init-param> + <param-name>fileName</param-name> + <param-value>/sagesynchro.jar</param-value> + </init-param> + </servlet> + <servlet> + <servlet-name>updateSageTable</servlet-name> + <servlet-class> + be.edev.toby.servlets.UpdateSageTableServlet + </servlet-class> + </servlet> + <servlet> + <servlet-name>synchro</servlet-name> + <servlet-class>be.edev.toby.servlets.SynchroServlet</servlet-class> + </servlet> + + <!-- no more needed --> + <servlet-mapping> + <servlet-name>updateSageSynchro</servlet-name> + <url-pattern>/servlet/updateSageSynchro</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>updateSageTable</servlet-name> + <url-pattern>/servlet/updateSageTable</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>synchro</servlet-name> + <url-pattern>/servlet/synchro</url-pattern> + </servlet-mapping> + + <!-- The Usual Welcome File List --> + <welcome-file-list> + <welcome-file>index.jsp</welcome-file> + </welcome-file-list> + + <!-- No Security at the moment --> + <!-- + <security-constraint> + <web-resource-collection> + <web-resource-name>Protected Area</web-resource-name> + <url-pattern>/*</url-pattern> + </web-resource-collection> + <auth-constraint> + <role-name>admin</role-name> + </auth-constraint> + </security-constraint> + <login-config> + <auth-method>BASIC</auth-method> + <realm-name>Restricted Area</realm-name> + </login-config> + <security-role> + <description>Administration de l'application</description> + <role-name>admin</role-name> + </security-role> + --> + </web-app> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <av...@us...> - 2007-02-19 15:18:01
|
Revision: 8 http://svn.sourceforge.net/edevsagetools/?rev=8&view=rev Author: avdyk Date: 2007-02-19 07:17:56 -0800 (Mon, 19 Feb 2007) Log Message: ----------- changed the name of the group-id Modified Paths: -------------- trunk/synchro-core/pom.xml Modified: trunk/synchro-core/pom.xml =================================================================== --- trunk/synchro-core/pom.xml 2007-02-19 15:17:20 UTC (rev 7) +++ trunk/synchro-core/pom.xml 2007-02-19 15:17:56 UTC (rev 8) @@ -1,14 +1,14 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>be.edev.edevsagetools.synchro.core</groupId> - <artifactId>synchro-core</artifactId> + <groupId>be.edev.sagetools.synchro</groupId> + <artifactId>core</artifactId> <packaging>jar</packaging> <version>1.0-SNAPSHOT</version> <name>Sage Synchronization Core Components</name> - <url>http://edevsagetools.sourceforge.net</url> + <url>http://sagetools.edev.be</url> <parent> - <groupId>be.edev.edevsagetools</groupId> + <groupId>be.edev.sagetools</groupId> <artifactId>edevsagetools</artifactId> <version>1.0-SNAPSHOT</version> </parent> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <av...@us...> - 2007-02-19 15:17:21
|
Revision: 7 http://svn.sourceforge.net/edevsagetools/?rev=7&view=rev Author: avdyk Date: 2007-02-19 07:17:20 -0800 (Mon, 19 Feb 2007) Log Message: ----------- moving files Added Paths: ----------- trunk/synchro-core/src/test/java/be/edev/sagetools/ trunk/synchro-core/src/test/java/be/edev/sagetools/synchro/ trunk/synchro-core/src/test/java/be/edev/sagetools/synchro/core/ trunk/synchro-core/src/test/java/be/edev/sagetools/synchro/core/AppTest.java Added: trunk/synchro-core/src/test/java/be/edev/sagetools/synchro/core/AppTest.java =================================================================== --- trunk/synchro-core/src/test/java/be/edev/sagetools/synchro/core/AppTest.java (rev 0) +++ trunk/synchro-core/src/test/java/be/edev/sagetools/synchro/core/AppTest.java 2007-02-19 15:17:20 UTC (rev 7) @@ -0,0 +1,38 @@ +package be.edev.edevsagetools.synchro.core; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <av...@us...> - 2007-02-19 15:16:47
|
Revision: 6 http://svn.sourceforge.net/edevsagetools/?rev=6&view=rev Author: avdyk Date: 2007-02-19 07:16:46 -0800 (Mon, 19 Feb 2007) Log Message: ----------- adding new directories Modified Paths: -------------- trunk/synchro-core/src/main/java/be/edev/sagetools/beans/Appellation.java trunk/synchro-core/src/main/java/be/edev/sagetools/beans/SelectedList.java trunk/synchro-core/src/main/java/be/edev/sagetools/utils/StringComparator.java Added Paths: ----------- trunk/synchro-core/src/main/java/be/edev/sagetools/synchro/ trunk/synchro-core/src/main/java/be/edev/sagetools/synchro/core/ trunk/synchro-core/src/main/java/be/edev/sagetools/synchro/core/App.java trunk/synchro-core/src/main/java/be/edev/sagetools/utils/CaracteresUtils.java trunk/synchro-core/src/main/java/be/edev/sagetools/utils/StringToNumber.java trunk/synchro-core/src/main/java/be/edev/sagetools/utils/image/ trunk/synchro-core/src/main/java/be/edev/sagetools/utils/image/ImageMagick.java trunk/synchro-core/src/main/java/be/edev/sagetools/utils/io/ trunk/synchro-core/src/main/java/be/edev/sagetools/utils/io/FindFile.java trunk/synchro-core/src/main/java/be/edev/sagetools/utils/net/ trunk/synchro-core/src/main/java/be/edev/sagetools/utils/net/EdevFTPClient.java Modified: trunk/synchro-core/src/main/java/be/edev/sagetools/beans/Appellation.java =================================================================== --- trunk/synchro-core/src/main/java/be/edev/sagetools/beans/Appellation.java 2007-02-19 15:15:50 UTC (rev 5) +++ trunk/synchro-core/src/main/java/be/edev/sagetools/beans/Appellation.java 2007-02-19 15:16:46 UTC (rev 6) @@ -18,9 +18,9 @@ private String photo; - private Set<Region> region = new HashSet<Region>(); + private Set region = new HashSet(); - private Set<Domaine> domaine = new HashSet<Domaine>(); + private Set domaine = new HashSet(); public Appellation() { @@ -80,7 +80,7 @@ * * @return retourne la valeur de region. */ - public Set<Region> getRegion() + public Set getRegion() { return this.region; } @@ -91,7 +91,7 @@ * @param region * Le region à mettre à jour. */ - public void setRegion(Set<Region> region) + public void setRegion(Set region) { this.region = region; } @@ -111,7 +111,7 @@ * * @return retourne la valeur de domaine. */ - public Set<Domaine> getDomaine() + public Set getDomaine() { return this.domaine; } @@ -122,7 +122,7 @@ * @param domaine * Le domaine à mettre à jour. */ - public void setDomaine(Set<Domaine> domaine) + public void setDomaine(Set domaine) { this.domaine = domaine; } Modified: trunk/synchro-core/src/main/java/be/edev/sagetools/beans/SelectedList.java =================================================================== --- trunk/synchro-core/src/main/java/be/edev/sagetools/beans/SelectedList.java 2007-02-19 15:15:50 UTC (rev 5) +++ trunk/synchro-core/src/main/java/be/edev/sagetools/beans/SelectedList.java 2007-02-19 15:16:46 UTC (rev 6) @@ -15,9 +15,9 @@ public class SelectedList { - private Set<Object> objects = new TreeSet<Object>(new StringComparator<Object>()); + private Set objects = new TreeSet(new StringComparator()); - private Set<Object> disabledObjects = new TreeSet<Object>(new StringComparator<Object>()); + private Set disabledObjects = new TreeSet(new StringComparator()); private Object selectedObject = null; @@ -26,11 +26,11 @@ super(); } - public SelectedList(Comparator<Object> c) + public SelectedList(Comparator c) { super(); - this.objects = new TreeSet<Object>(c); - this.disabledObjects = new TreeSet<Object>(c); + this.objects = new TreeSet(c); + this.disabledObjects = new TreeSet(c); } public boolean addDisabledObject(Object o) @@ -38,7 +38,7 @@ return this.disabledObjects.add(o); } - public boolean addAllDisabledObject(Collection<Object> o) + public boolean addAllDisabledObject(Collection o) { return this.disabledObjects.addAll(o); } @@ -86,12 +86,12 @@ /** * @deprecated utiliser plutôt addAllDisabledObject(Collection) */ - public void setDisabledObjects(Set<Object> disabledObjects) + public void setDisabledObjects(Set disabledObjects) { this.disabledObjects = disabledObjects; } - public Set<Object> getObjects() + public Set getObjects() { return this.objects; } @@ -99,7 +99,7 @@ /** * @deprecated utiliser plutôt addAllObject(Collection) */ - public void setObjects(Set<Object> objects) + public void setObjects(Set objects) { this.objects = objects; } @@ -109,7 +109,7 @@ return this.objects.add(o); } - public boolean addAllObject(Collection<Object> o) + public boolean addAllObject(Collection o) { return this.objects.addAll(o); } @@ -129,7 +129,7 @@ return this.objects.isEmpty(); } - public Iterator<Object> objectIterator() + public Iterator objectIterator() { return this.objects.iterator(); } Added: trunk/synchro-core/src/main/java/be/edev/sagetools/synchro/core/App.java =================================================================== --- trunk/synchro-core/src/main/java/be/edev/sagetools/synchro/core/App.java (rev 0) +++ trunk/synchro-core/src/main/java/be/edev/sagetools/synchro/core/App.java 2007-02-19 15:16:46 UTC (rev 6) @@ -0,0 +1,13 @@ +package be.edev.sagetools.synchro.core; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} Added: trunk/synchro-core/src/main/java/be/edev/sagetools/utils/CaracteresUtils.java =================================================================== --- trunk/synchro-core/src/main/java/be/edev/sagetools/utils/CaracteresUtils.java (rev 0) +++ trunk/synchro-core/src/main/java/be/edev/sagetools/utils/CaracteresUtils.java 2007-02-19 15:16:46 UTC (rev 6) @@ -0,0 +1,33 @@ +package be.edev.sagetools.utils; + +public class CaracteresUtils +{ + + /** + * @param s + * @return + * @deprecated utiliser plutôt la méthode avec l'entier + */ + public static String supprimeHuitCaracteres(String s) + { + return CaracteresUtils.supprimePremiersCaracteres(s, 8); + } + + /** + * Utile car vérifie si la chaîne n'est pas nulle + * + * @param s la chaîne + * @param taille + * le nombre de caractères que l'on veut supprimer en début de chaîne + * @return ("OK", 1) retourne "K" + */ + public static String supprimePremiersCaracteres(String s, int taille) + { + String ret = s; + if (ret != null && ret.length() > taille) + { + ret = s.substring(taille); + } + return ret; + } +} Modified: trunk/synchro-core/src/main/java/be/edev/sagetools/utils/StringComparator.java =================================================================== --- trunk/synchro-core/src/main/java/be/edev/sagetools/utils/StringComparator.java 2007-02-19 15:15:50 UTC (rev 5) +++ trunk/synchro-core/src/main/java/be/edev/sagetools/utils/StringComparator.java 2007-02-19 15:16:46 UTC (rev 6) @@ -2,7 +2,7 @@ import java.util.Comparator; -public class StringComparator<T> implements Comparator<T> +public class StringComparator implements Comparator { private boolean asc = true; @@ -18,7 +18,7 @@ this.asc = asc; } - public int compare(T o1, T o2) + public int compare(Object o1, Object o2) { int value = 0; if (asc) Added: trunk/synchro-core/src/main/java/be/edev/sagetools/utils/StringToNumber.java =================================================================== --- trunk/synchro-core/src/main/java/be/edev/sagetools/utils/StringToNumber.java (rev 0) +++ trunk/synchro-core/src/main/java/be/edev/sagetools/utils/StringToNumber.java 2007-02-19 15:16:46 UTC (rev 6) @@ -0,0 +1,25 @@ +package be.edev.sagetools.utils; + +public class StringToNumber +{ + + public static float parseFloat(String s) { + return Float.parseFloat(StringToNumber.virguleEnPoint(s)); + } + + public static double parseDouble(String s) { + return Double.parseDouble(StringToNumber.virguleEnPoint(s)); + } + + protected static String virguleEnPoint(String s) + { + if (s.indexOf(',') > -1) + { + StringBuffer buf = new StringBuffer(s); + buf.setCharAt(s.indexOf(','), '.'); + s = buf.toString(); + } + return s; + } + +} Added: trunk/synchro-core/src/main/java/be/edev/sagetools/utils/image/ImageMagick.java =================================================================== --- trunk/synchro-core/src/main/java/be/edev/sagetools/utils/image/ImageMagick.java (rev 0) +++ trunk/synchro-core/src/main/java/be/edev/sagetools/utils/image/ImageMagick.java 2007-02-19 15:16:46 UTC (rev 6) @@ -0,0 +1,95 @@ +package be.edev.sagetools.utils.image; + +import java.awt.Canvas; +import java.awt.Graphics2D; +import java.awt.Image; +import java.awt.MediaTracker; +import java.awt.Toolkit; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; + +import javax.imageio.ImageIO; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +public class ImageMagick +{ + + private static Log logger = LogFactory.getLog(ImageMagick.class); + + /** + * Redimensionne une image ATTENTION ImageMagick doit etre dans le path + * + * @param originalPath + * @param destinationPath + * @param size + * @throws InterruptedException + * @deprecated utiliser la version jmagickResize + */ + public static synchronized void resizeJPG(String originalPath, + String destinationPath, String size) throws IOException, + InterruptedException + { + Runtime current = Runtime.getRuntime(); + String[] commande = + { "convert", "-size", size, originalPath, "-resize", size, + destinationPath }; + String commandeComplete = commande[0]; + for (int i = 1; i < commande.length; i++) + { + commandeComplete += " " + commande[i]; + } + ImageMagick.logger.debug("commande: " + commandeComplete); + Process proc = current.exec(commandeComplete); + if (proc.waitFor() != 0) + { + ImageMagick.logger.error("Probleme au niveau du process ImageMagick"); + String error = ""; + InputStream in = proc.getErrorStream(); + int c = -1; + while ((c = in.read()) > -1) + { + error += (char) c; + } + ImageMagick.logger.error(error); + } + proc.destroy(); + proc = null; + } + + /** + * Redimensionne une image ATTENTION ImageMagick doit etre dans le path + * + * @param originalPath + * @param destinationPath + * @param size + * @throws InterruptedException + * @throws InterruptedException + * @throws IOException + */ + public static synchronized void jResize(String originalPath, + String destinationPath, int width, int height) + throws InterruptedException, IOException + { + Toolkit toolkit = Toolkit.getDefaultToolkit(); + Image orig = toolkit.getImage(originalPath); + Canvas fake = new Canvas(); + MediaTracker tracker = new MediaTracker(fake); + tracker.addImage(orig, 0); + tracker.waitForID(0); + tracker.removeImage(orig, 0); + Image scaled = orig.getScaledInstance(width, height, Image.SCALE_SMOOTH); + tracker.addImage(scaled, 1); + tracker.waitForID(1); + tracker.removeImage(scaled, 1); + BufferedImage bi = new BufferedImage(width, height, + BufferedImage.TYPE_INT_RGB); + Graphics2D biContext = bi.createGraphics(); + biContext.drawImage(scaled, 0, 0, null); + ImageIO.write(bi, "jpg", new File(destinationPath)); + } + +} Added: trunk/synchro-core/src/main/java/be/edev/sagetools/utils/io/FindFile.java =================================================================== --- trunk/synchro-core/src/main/java/be/edev/sagetools/utils/io/FindFile.java (rev 0) +++ trunk/synchro-core/src/main/java/be/edev/sagetools/utils/io/FindFile.java 2007-02-19 15:16:46 UTC (rev 6) @@ -0,0 +1,97 @@ +package be.edev.sagetools.utils.io; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FilenameFilter; +import java.io.IOException; +import java.util.Collection; +import java.util.Vector; + +public class FindFile +{ + + /** + * Retrouve un fichier dans le chemin qui commence par la chaine. + * + * @param path + * le chemin de départ + * @param query + * la chaine de départ + * @return tous les fichiers trouvés + * @throws IOException + */ + public static synchronized String[] startsWith(String path, final String query) + throws IOException + { + String[] files = null; + if (path != null && query != null) + { + Vector v = new Vector(); + FilenameFilter filter = new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + File f = new File(dir.getPath() + "/" + name); + boolean accept = f.isDirectory(); + if (!accept) + { + accept = name.startsWith(query); + } + return accept; + } + + }; + // Trouver le répertoire de départ + File depart = new File(path); + v.addAll(FindFile.listFilesInDirectory(depart, filter)); + if (v.size() > 0) + { + files = new String[v.size()]; + files = (String[]) v.toArray(files); + } + else + { + throw new FileNotFoundException(path + "/.../" + query + + "* n'a pas ete trouve"); + } + } + return files; + } + + public static synchronized Collection listFilesInDirectory(File f, + FilenameFilter filter) throws IOException + { + Vector v = new Vector(); + if (f.isDirectory()) + { + File[] files = f.listFiles(filter); + if (files != null && files.length > 0) + { + for (int i = 0; i < files.length; i++) + { + Collection c = FindFile.listFilesInDirectory(files[i], filter); + if (c != null && c.size() > 0) + { + v.addAll(c); + } + } + } + } + else + { + v.add(f.getPath()); + } + return v; + } + + public static boolean newer(String newer, String older) + { + File newerFile = new File(newer); + File olderFile = new File(older); + long newerDate = newerFile.lastModified(); + long olderDate = olderFile.lastModified(); + return newerDate > olderDate; + } + +} Added: trunk/synchro-core/src/main/java/be/edev/sagetools/utils/net/EdevFTPClient.java =================================================================== --- trunk/synchro-core/src/main/java/be/edev/sagetools/utils/net/EdevFTPClient.java (rev 0) +++ trunk/synchro-core/src/main/java/be/edev/sagetools/utils/net/EdevFTPClient.java 2007-02-19 15:16:46 UTC (rev 6) @@ -0,0 +1,61 @@ +package be.edev.sagetools.utils.net; + +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.SocketException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.net.ftp.FTPClient; + +public class EdevFTPClient +{ + + private static final Log logger = LogFactory.getLog(EdevFTPClient.class); + + public static void upload(String imageLocale, String host, + String username, String password, String dir, String filename) + throws SocketException, IOException + { + InputStream local = new FileInputStream(imageLocale); + FTPClient ftp = new FTPClient(); + ftp.connect(host); + ftp.login(username, password); + ftp.changeWorkingDirectory(dir); + ftp.setFileType(FTPClient.BINARY_FILE_TYPE); + ftp.storeFile(filename, local); + ftp.logout(); + ftp.disconnect(); + } + + public static void download(String imageLocale, String host, + String username, String password, String dir, String filename) + throws SocketException, IOException + { + FTPClient ftp = new FTPClient(); + logger.debug("connexion au host: " + host); + ftp.connect(host); + logger.debug("login et mot de passe"); + ftp.login(username, password); + logger.debug("changement de repertoire: " + dir); + ftp.changeWorkingDirectory(dir); + logger.debug("recuperation de l'inputstream"); + InputStream in = ftp.retrieveFileStream(filename); + logger.debug("creation du fichier local"); + OutputStream out = new FileOutputStream(imageLocale); + int b = -1; + while((b=in.read())>-1) { + out.write(b); + } + logger.debug("fermeture de tous les flux"); + in.close(); + out.flush(); + out.close(); + ftp.logout(); + ftp.disconnect(); + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <av...@us...> - 2007-02-19 15:15:55
|
Revision: 5 http://svn.sourceforge.net/edevsagetools/?rev=5&view=rev Author: avdyk Date: 2007-02-19 07:15:50 -0800 (Mon, 19 Feb 2007) Log Message: ----------- moving directory Removed Paths: ------------- trunk/synchro-core/src/main/java/be/edev/edevsagetools/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <av...@us...> - 2006-12-31 12:39:34
|
Revision: 4 http://svn.sourceforge.net/edevsagetools/?rev=4&view=rev Author: avdyk Date: 2006-12-31 04:39:33 -0800 (Sun, 31 Dec 2006) Log Message: ----------- generify Modified Paths: -------------- trunk/pom.xml trunk/synchro-core/src/main/java/be/edev/sagetools/beans/Appellation.java trunk/synchro-core/src/main/java/be/edev/sagetools/beans/SelectedList.java trunk/synchro-core/src/main/java/be/edev/sagetools/utils/StringComparator.java Property Changed: ---------------- trunk/ trunk/synchro-client/ trunk/synchro-core/ trunk/synchro-webapp/ Property changes on: trunk ___________________________________________________________________ Name: svn:ignore + target build Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2006-12-29 16:12:46 UTC (rev 3) +++ trunk/pom.xml 2006-12-31 12:39:33 UTC (rev 4) @@ -11,6 +11,17 @@ <module>synchro-client</module> <module>synchro-webapp</module> </modules> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> <dependencies> <dependency> <groupId>junit</groupId> Property changes on: trunk/synchro-client ___________________________________________________________________ Name: svn:ignore + target build Property changes on: trunk/synchro-core ___________________________________________________________________ Name: svn:ignore + target build Modified: trunk/synchro-core/src/main/java/be/edev/sagetools/beans/Appellation.java =================================================================== --- trunk/synchro-core/src/main/java/be/edev/sagetools/beans/Appellation.java 2006-12-29 16:12:46 UTC (rev 3) +++ trunk/synchro-core/src/main/java/be/edev/sagetools/beans/Appellation.java 2006-12-31 12:39:33 UTC (rev 4) @@ -18,9 +18,9 @@ private String photo; - private Set region = new HashSet(); + private Set<Region> region = new HashSet<Region>(); - private Set domaine = new HashSet(); + private Set<Domaine> domaine = new HashSet<Domaine>(); public Appellation() { @@ -80,7 +80,7 @@ * * @return retourne la valeur de region. */ - public Set getRegion() + public Set<Region> getRegion() { return this.region; } @@ -91,7 +91,7 @@ * @param region * Le region à mettre à jour. */ - public void setRegion(Set region) + public void setRegion(Set<Region> region) { this.region = region; } @@ -111,7 +111,7 @@ * * @return retourne la valeur de domaine. */ - public Set getDomaine() + public Set<Domaine> getDomaine() { return this.domaine; } @@ -122,7 +122,7 @@ * @param domaine * Le domaine à mettre à jour. */ - public void setDomaine(Set domaine) + public void setDomaine(Set<Domaine> domaine) { this.domaine = domaine; } Modified: trunk/synchro-core/src/main/java/be/edev/sagetools/beans/SelectedList.java =================================================================== --- trunk/synchro-core/src/main/java/be/edev/sagetools/beans/SelectedList.java 2006-12-29 16:12:46 UTC (rev 3) +++ trunk/synchro-core/src/main/java/be/edev/sagetools/beans/SelectedList.java 2006-12-31 12:39:33 UTC (rev 4) @@ -15,9 +15,9 @@ public class SelectedList { - private Set objects = new TreeSet(new StringComparator()); + private Set<Object> objects = new TreeSet<Object>(new StringComparator<Object>()); - private Set disabledObjects = new TreeSet(new StringComparator()); + private Set<Object> disabledObjects = new TreeSet<Object>(new StringComparator<Object>()); private Object selectedObject = null; @@ -26,11 +26,11 @@ super(); } - public SelectedList(Comparator c) + public SelectedList(Comparator<Object> c) { super(); - this.objects = new TreeSet(c); - this.disabledObjects = new TreeSet(c); + this.objects = new TreeSet<Object>(c); + this.disabledObjects = new TreeSet<Object>(c); } public boolean addDisabledObject(Object o) @@ -38,7 +38,7 @@ return this.disabledObjects.add(o); } - public boolean addAllDisabledObject(Collection o) + public boolean addAllDisabledObject(Collection<Object> o) { return this.disabledObjects.addAll(o); } @@ -86,12 +86,12 @@ /** * @deprecated utiliser plutôt addAllDisabledObject(Collection) */ - public void setDisabledObjects(Set disabledObjects) + public void setDisabledObjects(Set<Object> disabledObjects) { this.disabledObjects = disabledObjects; } - public Set getObjects() + public Set<Object> getObjects() { return this.objects; } @@ -99,7 +99,7 @@ /** * @deprecated utiliser plutôt addAllObject(Collection) */ - public void setObjects(Set objects) + public void setObjects(Set<Object> objects) { this.objects = objects; } @@ -109,7 +109,7 @@ return this.objects.add(o); } - public boolean addAllObject(Collection o) + public boolean addAllObject(Collection<Object> o) { return this.objects.addAll(o); } @@ -129,7 +129,7 @@ return this.objects.isEmpty(); } - public Iterator objectIterator() + public Iterator<Object> objectIterator() { return this.objects.iterator(); } Modified: trunk/synchro-core/src/main/java/be/edev/sagetools/utils/StringComparator.java =================================================================== --- trunk/synchro-core/src/main/java/be/edev/sagetools/utils/StringComparator.java 2006-12-29 16:12:46 UTC (rev 3) +++ trunk/synchro-core/src/main/java/be/edev/sagetools/utils/StringComparator.java 2006-12-31 12:39:33 UTC (rev 4) @@ -2,7 +2,7 @@ import java.util.Comparator; -public class StringComparator implements Comparator +public class StringComparator<T> implements Comparator<T> { private boolean asc = true; @@ -18,7 +18,7 @@ this.asc = asc; } - public int compare(Object o1, Object o2) + public int compare(T o1, T o2) { int value = 0; if (asc) Property changes on: trunk/synchro-webapp ___________________________________________________________________ Name: svn:ignore + target build This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <av...@us...> - 2006-12-29 16:12:48
|
Revision: 3 http://svn.sourceforge.net/edevsagetools/?rev=3&view=rev Author: avdyk Date: 2006-12-29 08:12:46 -0800 (Fri, 29 Dec 2006) Log Message: ----------- added a license Added Paths: ----------- trunk/GPL-2 Added: trunk/GPL-2 =================================================================== --- trunk/GPL-2 (rev 0) +++ trunk/GPL-2 2006-12-29 16:12:46 UTC (rev 3) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |