December 2011 - Sandbox-commits - mailman.cloud.codelutin.com

r513 - jforum-2.3.3
by athimel＠users.nuiton.org 08 Dec '11

08 Dec '11

Author: athimel Date: 2011-12-08 17:04:32 +0100 (Thu, 08 Dec 2011) New Revision: 513 Url: http://nuiton.org/repositories/revision/sandbox/513 Log: Remove src Removed: jforum-2.3.3/src/

1 0

r512 - jforum-2.3.3
by athimel＠users.nuiton.org 08 Dec '11

08 Dec '11

Author: athimel Date: 2011-12-08 17:03:42 +0100 (Thu, 08 Dec 2011) New Revision: 512 Url: http://nuiton.org/repositories/revision/sandbox/512 Log: Prepare jForum 2.3.3 integration Added: jforum-2.3.3/pom.xml jforum-2.3.3/src/ Added: jforum-2.3.3/pom.xml =================================================================== --- jforum-2.3.3/pom.xml (rev 0) +++ jforum-2.3.3/pom.xml 2011-12-08 16:03:42 UTC (rev 512) @@ -0,0 +1,293 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>net.jforum</groupId> + <artifactId>jforum</artifactId> + <version>2.3.3</version> + <packaging>war</packaging> + <name>JForum</name> + <description>JForum is a powerful and robust discussion board system implemented in Javatm. It provides an attractive interface, an efficient forum engine, an easy to use administrative panel, an advanced permission control system and much more. </description> + <url>http://jforum2.googlecode.com</url> + <issueManagement> + <system>Google Code</system> + <url>http://code.google.com/p/jforum2/issues/list</url> + </issueManagement> + <scm> + <connection>svn</connection> + <url>http://jforum2.googlecode.com/svn/</url> + </scm> + <repositories> + <repository> + <id>jboss</id> + <name>jboss public</name> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> + </repository> + <repository> + <id>jahia</id> + <name>jahia</name> + <url>http://maven.jahia.org/maven2/</url> + </repository> + <repository> + <id>mule-deps</id> + <name>mule-deps</name> + <url>http://dist.codehaus.org/mule/dependencies/maven2/</url> + </repository> + </repositories> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <type>jar</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4.4</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.2</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>org.freemarker</groupId> + <artifactId>freemarker</artifactId> + <version>2.3.18</version> + </dependency> + <dependency> + <groupId>org.htmlparser</groupId> + <artifactId>htmlparser</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analyzers</artifactId> + <version>3.5.0</version> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-highlighter</artifactId> + <version>3.5.0</version> + </dependency> + <dependency> + <groupId>org.beanshell</groupId> + <artifactId>bsh</artifactId> + <version>2.0b4</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>c3p0</groupId> + <artifactId>c3p0</artifactId> + <version>0.9.1.2</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>2.2.6</version> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>9.0-801.jdbc3</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.quartz-scheduler</groupId> + <artifactId>quartz</artifactId> + <version>2.1.1</version> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.2.5.GA</version> + <exclusions> + <exclusion> + <artifactId>jgroups</artifactId> + <groupId>jgroups</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache-core</artifactId> + <version>2.4.6</version> + </dependency> + <dependency> + <groupId>com.octo.captcha</groupId> + <artifactId>jcaptcha</artifactId> + <version>1.0</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.6.4</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.6.4</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + <type>jar</type> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> + <version>10.2.0.4.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>2.12.2.Final</version> + </dependency> + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache-jgroupsreplication</artifactId> + <version>1.4</version> + <type>jar</type> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1.1</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + </dependencies> + <build> + <finalName>jforum</finalName> + <resources> + <resource> + <directory>src/main/resources</directory> + <excludes> + <exclude>templates/*</exclude> + </excludes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.1.1</version> + <configuration> + <archiveClasses>true</archiveClasses> + <packagingExcludes>WEB-INF/web.xml</packagingExcludes> + <webResources> + <resource> + <directory>.</directory> + <includes> + <include>license.txt</include> + </includes> + </resource> + </webResources> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.5</version> + <executions> + <execution> + <id>copy-config</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/config</outputDirectory> + <resources> + <resource> + <directory>src/main/config</directory> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-templates</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/${project.build.finalName}/templates</outputDirectory> + <resources> + <resource> + <directory>src/main/resources/templates</directory> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-upgrade</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/${project.build.finalName}/upgrade</outputDirectory> + <resources> + <resource> + <directory>upgrade</directory> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + + </executions> + </plugin> + </plugins> + </build> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> +</project> \ No newline at end of file

1 0

r511 - /
by athimel＠users.nuiton.org 08 Dec '11

08 Dec '11

Author: athimel Date: 2011-12-08 17:02:16 +0100 (Thu, 08 Dec 2011) New Revision: 511 Url: http://nuiton.org/repositories/revision/sandbox/511 Log: Prepare jForum 2.3.3 integration Added: jforum-2.3.3/

1 0

r510 - in masc: . masc-api masc-api/src/main/java/fr/inra/masc masc-api/src/main/java/fr/inra/masc/services
by sletellier＠users.nuiton.org 07 Dec '11

07 Dec '11

Author: sletellier Date: 2011-12-07 12:01:38 +0100 (Wed, 07 Dec 2011) New Revision: 510 Url: http://nuiton.org/repositories/revision/sandbox/510 Log: - Creating masc config - Initialize services Added: masc/masc-api/src/main/java/fr/inra/masc/MascConfig.java masc/masc-api/src/main/java/fr/inra/masc/MascTechnicalException.java masc/masc-api/src/main/java/fr/inra/masc/services/DexiEvalInvokerService.java masc/masc-api/src/main/java/fr/inra/masc/services/DexiInvokerService.java masc/masc-api/src/main/java/fr/inra/masc/services/ImageGeneratorService.java masc/masc-api/src/main/java/fr/inra/masc/services/LoadModelService.java masc/masc-api/src/main/java/fr/inra/masc/services/MascService.java masc/masc-api/src/main/java/fr/inra/masc/services/MascServiceContext.java masc/masc-api/src/main/java/fr/inra/masc/services/MascServiceFactory.java masc/masc-api/src/main/java/fr/inra/masc/services/OptionCRUDService.java masc/masc-api/src/main/java/fr/inra/masc/services/ReportGeneratorService.java masc/masc-api/src/main/java/fr/inra/masc/services/SaveModelService.java Removed: masc/masc-api/src/main/java/fr/inra/masc/services/ImportService.java Modified: masc/masc-api/pom.xml masc/pom.xml Modified: masc/masc-api/pom.xml =================================================================== --- masc/masc-api/pom.xml 2011-12-01 09:04:18 UTC (rev 509) +++ masc/masc-api/pom.xml 2011-12-07 11:01:38 UTC (rev 510) @@ -24,6 +24,23 @@ <description>Masc - API module</description> <dependencies> + +  + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + </dependencies>  Added: masc/masc-api/src/main/java/fr/inra/masc/MascConfig.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/MascConfig.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/MascConfig.java 2011-12-07 11:01:38 UTC (rev 510) @@ -0,0 +1,211 @@ +package fr.inra.masc; + +import com.google.common.base.Preconditions; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.*; + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.Properties; + +/** + * Masc configuration. + * + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class MascConfig { + + /** Logger. */ + protected static final Log log = + LogFactory.getLog(MascConfig.class); + + /** Delegate application config object containing configuration. */ + protected ApplicationConfig applicationConfig; + + public MascConfig() { + this("masc.properties"); + } + + public MascConfig(String file) { + + applicationConfig = new ApplicationConfig(); + applicationConfig.setConfigFileName(file); + + if (log.isInfoEnabled()) { + log.info(this + " is initializing..."); + } + try { + applicationConfig.loadDefaultOptions(MascConfigOption.class); + applicationConfig.parse(); + } catch (ArgumentsParserException e) { + throw new MascTechnicalException( + "Could not parse configuration", e); + } + + if (log.isDebugEnabled()) { + log.debug("parsed options in config file" + applicationConfig.getOptions()); + } + } + + @Override + public String toString() { + return ReflectionToStringBuilder.toString(this); + } + + public Properties getProperties() { + Properties result = applicationConfig.getFlatOptions(); + return result; + } + + public Version getApplicationVersion() { + String versionStr = applicationConfig.getOption(MascConfigOption.VERSION.key); + String s = VersionUtil.removeSnapshot(versionStr); + Version v = VersionUtil.valueOf(s); + Preconditions.checkNotNull(v); + return v; + } + + public URL getApplicationSite() { + URL url = applicationConfig.getOptionAsURL(MascConfigOption.SITE_URL.key); + Preconditions.checkNotNull(url); + return url; + } + + public String getDexiPath() { + String dexyPath = applicationConfig.getOption(MascConfigOption.DEXI_APP_PATH.key); + Preconditions.checkNotNull(dexyPath); + return dexyPath; + } + + public String getDexiEvalPath() { + String dexyEvalPath = applicationConfig.getOption(MascConfigOption.DEXI_EVAL_APP_PATH.key); + Preconditions.checkNotNull(dexyEvalPath); + return dexyEvalPath; + } + + public boolean getOptionAsBoolean(String propertyName) { + Boolean result = applicationConfig.getOptionAsBoolean(propertyName); + return result != null && result; + } + + /** + * Creates a directory given the configuration given key. + * + * @param key the configuration option key which contains the location of + * the directory to create + */ + protected void createDirectory(MascConfigOption key) { + + File directory = applicationConfig.getOptionAsFile(key.getKey()); + + Preconditions.checkNotNull( + directory, + "Could not find directory " + directory + " (key " + + key + + "in your configuration file named echobase.properties)" + ); + if (log.isInfoEnabled()) { + log.info(key + " = " + directory); + } + try { + FileUtil.createDirectoryIfNecessary(directory); + } catch (IOException e) { + throw new MascTechnicalException( + "Could not create directory " + directory, e); + } + } + + /** + * All Masc configuration options. + * + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ + public enum MascConfigOption implements ApplicationConfig.OptionDef { + + /** Main directory where to put echobase data (logs, and others...). */ + VERSION("project.version", + "Version de l'application", + "", Version.class), + SITE_URL("project.siteUrl", + "URL du site de l'application", + "", URL.class), + DEXI_APP_PATH("masc.dexi.path", + "Chemin de l'application masc", + "", String.class), + DEXI_EVAL_APP_PATH("masc.dexiEval.path", + "Chemin de l'application masc eval", + "", String.class); + + /** Configuration key. */ + protected final String key; + + /** I18n key of option description */ + protected final String description; + + /** Type of option */ + protected final Class<?> type; + + /** Default value of option. */ + protected String defaultValue; + + MascConfigOption(String key, + String description, + String defaultValue, + Class<?> type) { + this.key = key; + this.description = description; + this.defaultValue = defaultValue; + this.type = type; + } + + @Override + public String getKey() { + return key; + } + + @Override + public Class<?> getType() { + return type; + } + + @Override + public String getDescription() { + return description; + } + + @Override + public String getDefaultValue() { + return defaultValue; + } + + @Override + public boolean isTransient() { + return true; + } + + @Override + public boolean isFinal() { + return true; + } + + @Override + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + + @Override + public void setTransient(boolean newValue) { + // not used + } + + @Override + public void setFinal(boolean newValue) { + // not used + } + } +} Added: masc/masc-api/src/main/java/fr/inra/masc/MascTechnicalException.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/MascTechnicalException.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/MascTechnicalException.java 2011-12-07 11:01:38 UTC (rev 510) @@ -0,0 +1,25 @@ +package fr.inra.masc; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class MascTechnicalException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + public MascTechnicalException() { + } + + public MascTechnicalException(String message) { + super(message); + } + + public MascTechnicalException(String message, Throwable cause) { + super(message, cause); + } + + public MascTechnicalException(Throwable cause) { + super(cause); + } +} Added: masc/masc-api/src/main/java/fr/inra/masc/services/DexiEvalInvokerService.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/services/DexiEvalInvokerService.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/services/DexiEvalInvokerService.java 2011-12-07 11:01:38 UTC (rev 510) @@ -0,0 +1,8 @@ +package fr.inra.masc.services; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class DexiEvalInvokerService extends MascService { + +} Added: masc/masc-api/src/main/java/fr/inra/masc/services/DexiInvokerService.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/services/DexiInvokerService.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/services/DexiInvokerService.java 2011-12-07 11:01:38 UTC (rev 510) @@ -0,0 +1,8 @@ +package fr.inra.masc.services; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class DexiInvokerService extends MascService { +} Added: masc/masc-api/src/main/java/fr/inra/masc/services/ImageGeneratorService.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/services/ImageGeneratorService.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/services/ImageGeneratorService.java 2011-12-07 11:01:38 UTC (rev 510) @@ -0,0 +1,8 @@ +package fr.inra.masc.services; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class ImageGeneratorService extends MascService { +} Deleted: masc/masc-api/src/main/java/fr/inra/masc/services/ImportService.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/services/ImportService.java 2011-12-01 09:04:18 UTC (rev 509) +++ masc/masc-api/src/main/java/fr/inra/masc/services/ImportService.java 2011-12-07 11:01:38 UTC (rev 510) @@ -1,16 +0,0 @@ -package fr.inra.masc.services; - -import fr.inra.masc.model.MascModel; - -import java.io.File; - -/** - * @author sletellier <letellier(a)codelutin.com> - * @since 0.1 - */ -public class ImportService { - - public MascModel importMascFile(File mascFile) { - return null; - } -} Copied: masc/masc-api/src/main/java/fr/inra/masc/services/LoadModelService.java (from rev 509, masc/masc-api/src/main/java/fr/inra/masc/services/ImportService.java) =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/services/LoadModelService.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/services/LoadModelService.java 2011-12-07 11:01:38 UTC (rev 510) @@ -0,0 +1,17 @@ +package fr.inra.masc.services; + +import fr.inra.masc.model.MascModel; + +import java.io.File; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class LoadModelService extends MascService { + + public MascModel loadModel(File mascFile) { + // TODO + return null; + } +} Added: masc/masc-api/src/main/java/fr/inra/masc/services/MascService.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/services/MascService.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/services/MascService.java 2011-12-07 11:01:38 UTC (rev 510) @@ -0,0 +1,24 @@ +package fr.inra.masc.services; + +import fr.inra.masc.MascConfig; + +/** + * Contract to place on each Masc service to push the {@code serviceContext} + * inside the service. + * + * @author sletellier <letellier(a)codelutin.com> + * @see MascServiceContext + * @since 0.1 + */ +public abstract class MascService { + + protected MascServiceContext serviceContext; + + public void setServiceContext(MascServiceContext serviceContext) { + this.serviceContext = serviceContext; + } + + public MascConfig getConfig() { + return serviceContext.getConfig(); + } +} Added: masc/masc-api/src/main/java/fr/inra/masc/services/MascServiceContext.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/services/MascServiceContext.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/services/MascServiceContext.java 2011-12-07 11:01:38 UTC (rev 510) @@ -0,0 +1,36 @@ +package fr.inra.masc.services; + +import fr.inra.masc.MascConfig; + +/** + * This contract represents objects you must provide when asking for a service. + * Objects provided may be injected in services returned by + * {@link MascServiceFactory#newService(Class, MascServiceContext)} + * + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class MascServiceContext { + + protected MascConfig config; + + protected MascServiceFactory serviceFactory; + + public MascServiceContext(MascConfig config, MascServiceFactory serviceFactory) { + this.config = config; + this.serviceFactory = serviceFactory; + } + + public MascConfig getConfig() { + return config; + } + + public MascServiceFactory getServiceFactory() { + return serviceFactory; + } + + public <E extends MascService> E newService(Class<E> clazz) { + return serviceFactory.newService(clazz, this); + } + +} Added: masc/masc-api/src/main/java/fr/inra/masc/services/MascServiceFactory.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/services/MascServiceFactory.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/services/MascServiceFactory.java 2011-12-07 11:01:38 UTC (rev 510) @@ -0,0 +1,34 @@ +package fr.inra.masc.services; + +import fr.inra.masc.MascTechnicalException; + +import java.lang.reflect.InvocationTargetException; + +/** + * Factory of services. + * + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class MascServiceFactory { + + public <E extends MascService> E newService(Class<E> clazz, MascServiceContext serviceContext) { + // instantiate service using empty constructor + E service; + try { + service = clazz.getConstructor().newInstance(); + } catch (InstantiationException e) { + throw new MascTechnicalException(e); + } catch (IllegalAccessException e) { + throw new MascTechnicalException(e); + } catch (InvocationTargetException e) { + throw new MascTechnicalException(e); + } catch (NoSuchMethodException e) { + throw new MascTechnicalException(e); + } + + service.setServiceContext(serviceContext); + + return service; + } +} Added: masc/masc-api/src/main/java/fr/inra/masc/services/OptionCRUDService.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/services/OptionCRUDService.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/services/OptionCRUDService.java 2011-12-07 11:01:38 UTC (rev 510) @@ -0,0 +1,8 @@ +package fr.inra.masc.services; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class OptionCRUDService extends MascService { +} Added: masc/masc-api/src/main/java/fr/inra/masc/services/ReportGeneratorService.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/services/ReportGeneratorService.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/services/ReportGeneratorService.java 2011-12-07 11:01:38 UTC (rev 510) @@ -0,0 +1,8 @@ +package fr.inra.masc.services; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class ReportGeneratorService extends MascService { +} Added: masc/masc-api/src/main/java/fr/inra/masc/services/SaveModelService.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/services/SaveModelService.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/services/SaveModelService.java 2011-12-07 11:01:38 UTC (rev 510) @@ -0,0 +1,17 @@ +package fr.inra.masc.services; + +import fr.inra.masc.model.MascModel; + +import java.io.File; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class SaveModelService extends MascService { + + public File saveModel(MascModel mascModel) { + // TODO + return null; + } +} Modified: masc/pom.xml =================================================================== --- masc/pom.xml 2011-12-01 09:04:18 UTC (rev 509) +++ masc/pom.xml 2011-12-07 11:01:38 UTC (rev 510) @@ -76,7 +76,7 @@  <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <nuitonUtilsVersion>2.1</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4</nuitonUtilsVersion> <eugenePluginVersion>2.4.1</eugenePluginVersion> <jaxxVersion>2.4.2</jaxxVersion> @@ -92,6 +92,7 @@ <dependencyManagement> <dependencies> +  <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> @@ -110,6 +111,12 @@ <version>${nuitonI18nVersion}</version> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>10.0.1</version> + </dependency> + </dependencies> </dependencyManagement>

1 0

r509 - in masc: masc-api masc-api/src/main/java masc-api/src/main/java/fr masc-api/src/main/java/fr/inra masc-api/src/main/java/fr/inra/masc masc-api/src/main/java/fr/inra/masc/model masc-api/src/main/java/fr/inra/masc/services masc-api/src/main/xmi src/site
by sletellier＠users.nuiton.org 01 Dec '11

01 Dec '11

Author: sletellier Date: 2011-12-01 10:04:18 +0100 (Thu, 01 Dec 2011) New Revision: 509 Url: http://nuiton.org/repositories/revision/sandbox/509 Log: - Make some entities visitable Added: masc/masc-api/src/main/java/fr/ masc/masc-api/src/main/java/fr/inra/ masc/masc-api/src/main/java/fr/inra/masc/ masc/masc-api/src/main/java/fr/inra/masc/MascVisitor.java masc/masc-api/src/main/java/fr/inra/masc/model/ masc/masc-api/src/main/java/fr/inra/masc/model/ComputableCriteriaImpl.java masc/masc-api/src/main/java/fr/inra/masc/model/CriteriaImpl.java masc/masc-api/src/main/java/fr/inra/masc/model/EditableCriteriaImpl.java masc/masc-api/src/main/java/fr/inra/masc/model/MascModelImpl.java masc/masc-api/src/main/java/fr/inra/masc/model/OptionImpl.java masc/masc-api/src/main/java/fr/inra/masc/model/OptionValueImpl.java masc/masc-api/src/main/java/fr/inra/masc/model/ScaleValueImpl.java masc/masc-api/src/main/java/fr/inra/masc/model/ThresholdCriteriaImpl.java masc/masc-api/src/main/java/fr/inra/masc/model/ValuedCriteriaImpl.java masc/masc-api/src/main/java/fr/inra/masc/services/ masc/masc-api/src/main/java/fr/inra/masc/services/ImportService.java Modified: masc/masc-api/pom.xml masc/masc-api/src/main/xmi/masc.zargo masc/src/site/site_fr.xml Modified: masc/masc-api/pom.xml =================================================================== --- masc/masc-api/pom.xml 2011-11-30 16:52:36 UTC (rev 508) +++ masc/masc-api/pom.xml 2011-12-01 09:04:18 UTC (rev 509) @@ -49,8 +49,11 @@ <configuration> <inputs>zargo</inputs> <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> - <templates>org.nuiton.eugene.java.JavaBeanTransformer, - org.nuiton.eugene.java.JavaEnumerationTransformer</templates> + <templates> + org.nuiton.eugene.java.JavaInterfaceTransformer, + org.nuiton.eugene.java.JavaBeanTransformer, + org.nuiton.eugene.java.JavaEnumerationTransformer + </templates> </configuration> <goals> <goal>smart-generate</goal> Added: masc/masc-api/src/main/java/fr/inra/masc/MascVisitor.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/MascVisitor.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/MascVisitor.java 2011-12-01 09:04:18 UTC (rev 509) @@ -0,0 +1,8 @@ +package fr.inra.masc; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class MascVisitor { +} Added: masc/masc-api/src/main/java/fr/inra/masc/model/ComputableCriteriaImpl.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/model/ComputableCriteriaImpl.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/model/ComputableCriteriaImpl.java 2011-12-01 09:04:18 UTC (rev 509) @@ -0,0 +1,15 @@ +package fr.inra.masc.model; + +import fr.inra.masc.MascVisitor; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class ComputableCriteriaImpl extends ComputableCriteria { + + @Override + public void accept(MascVisitor visitor) { + // TODO + } +} Added: masc/masc-api/src/main/java/fr/inra/masc/model/CriteriaImpl.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/model/CriteriaImpl.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/model/CriteriaImpl.java 2011-12-01 09:04:18 UTC (rev 509) @@ -0,0 +1,8 @@ +package fr.inra.masc.model; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public abstract class CriteriaImpl extends Criteria { +} Added: masc/masc-api/src/main/java/fr/inra/masc/model/EditableCriteriaImpl.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/model/EditableCriteriaImpl.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/model/EditableCriteriaImpl.java 2011-12-01 09:04:18 UTC (rev 509) @@ -0,0 +1,10 @@ +package fr.inra.masc.model; + +import fr.inra.masc.MascVisitor; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public abstract class EditableCriteriaImpl extends EditableCriteria { +} Added: masc/masc-api/src/main/java/fr/inra/masc/model/MascModelImpl.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/model/MascModelImpl.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/model/MascModelImpl.java 2011-12-01 09:04:18 UTC (rev 509) @@ -0,0 +1,15 @@ +package fr.inra.masc.model; + +import fr.inra.masc.MascVisitor; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class MascModelImpl extends MascModel { + + @Override + public void accept(MascVisitor visitor) { + // TODO + } +} Added: masc/masc-api/src/main/java/fr/inra/masc/model/OptionImpl.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/model/OptionImpl.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/model/OptionImpl.java 2011-12-01 09:04:18 UTC (rev 509) @@ -0,0 +1,15 @@ +package fr.inra.masc.model; + +import fr.inra.masc.MascVisitor; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class OptionImpl extends Option { + + @Override + public void accept(MascVisitor visitor) { + // TODO + } +} Added: masc/masc-api/src/main/java/fr/inra/masc/model/OptionValueImpl.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/model/OptionValueImpl.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/model/OptionValueImpl.java 2011-12-01 09:04:18 UTC (rev 509) @@ -0,0 +1,15 @@ +package fr.inra.masc.model; + +import fr.inra.masc.MascVisitor; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class OptionValueImpl extends OptionValue { + + @Override + public void accept(MascVisitor visitor) { + // TODO + } +} Added: masc/masc-api/src/main/java/fr/inra/masc/model/ScaleValueImpl.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/model/ScaleValueImpl.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/model/ScaleValueImpl.java 2011-12-01 09:04:18 UTC (rev 509) @@ -0,0 +1,15 @@ +package fr.inra.masc.model; + +import fr.inra.masc.MascVisitor; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class ScaleValueImpl extends ScaleValue { + + @Override + public void accept(MascVisitor visitor) { + // TODO + } +} Added: masc/masc-api/src/main/java/fr/inra/masc/model/ThresholdCriteriaImpl.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/model/ThresholdCriteriaImpl.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/model/ThresholdCriteriaImpl.java 2011-12-01 09:04:18 UTC (rev 509) @@ -0,0 +1,15 @@ +package fr.inra.masc.model; + +import fr.inra.masc.MascVisitor; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class ThresholdCriteriaImpl extends ThresholdCriteria { + + @Override + public void accept(MascVisitor visitor) { + // TODO + } +} Added: masc/masc-api/src/main/java/fr/inra/masc/model/ValuedCriteriaImpl.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/model/ValuedCriteriaImpl.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/model/ValuedCriteriaImpl.java 2011-12-01 09:04:18 UTC (rev 509) @@ -0,0 +1,15 @@ +package fr.inra.masc.model; + +import fr.inra.masc.MascVisitor; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class ValuedCriteriaImpl extends ValuedCriteria { + + @Override + public void accept(MascVisitor visitor) { + // TODO + } +} Added: masc/masc-api/src/main/java/fr/inra/masc/services/ImportService.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/services/ImportService.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/services/ImportService.java 2011-12-01 09:04:18 UTC (rev 509) @@ -0,0 +1,16 @@ +package fr.inra.masc.services; + +import fr.inra.masc.model.MascModel; + +import java.io.File; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 0.1 + */ +public class ImportService { + + public MascModel importMascFile(File mascFile) { + return null; + } +} Modified: masc/masc-api/src/main/xmi/masc.zargo =================================================================== (Binary files differ) Modified: masc/src/site/site_fr.xml =================================================================== --- masc/src/site/site_fr.xml 2011-11-30 16:52:36 UTC (rev 508) +++ masc/src/site/site_fr.xml 2011-12-01 09:04:18 UTC (rev 509) @@ -1,27 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - <project name="Masc">

1 0