- Simexplorer-si-commits - mailman.cloud.codelutin.com

r1535 - in trunk/simexplorer-is: simexplorer-is-entities simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random simexplorer-is-swing-generated
by dumoulin＠users.labs.libre-entreprise.org 19 Nov '08

19 Nov '08

Author: dumoulin Date: 2008-11-19 14:26:11 +0000 (Wed, 19 Nov 2008) New Revision: 1535 Added: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/RuntimeType.java Removed: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ComponentType.java Modified: trunk/simexplorer-is/simexplorer-is-entities/ trunk/simexplorer-is/simexplorer-is-entities/pom.xml trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Structure.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java trunk/simexplorer-is/simexplorer-is-swing-generated/ Log: * ComponentType rename to RuntimeType * Component know own subcomponents * Structure entity implementation Property changes on: trunk/simexplorer-is/simexplorer-is-entities ___________________________________________________________________ Name: svn:ignore - target + target .project .classpath .settings Modified: trunk/simexplorer-is/simexplorer-is-entities/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/pom.xml 2008-11-17 11:23:06 UTC (rev 1534) +++ trunk/simexplorer-is/simexplorer-is-entities/pom.xml 2008-11-19 14:26:11 UTC (rev 1535) @@ -1,58 +1,58 @@ -<?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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - -  - <artifactId>simexplorer-is-entities</artifactId> - <name>Entities</name> - - <version>${current.version}</version> - <description>simexplorer-is entities module</description> - <packaging>jar</packaging> - - <parent> - <groupId>simexplorer-is</groupId> - <artifactId>simexplorer-is</artifactId> - <version>${current.version}</version> - </parent> - - <profiles> - <profile> - <id>project</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> -  - <maven.test.skip>false</maven.test.skip> - </properties> - </profile> - </profiles> - - <build> - <plugins> - <plugin> - <groupId>lutinplugin</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <phase>process-classes</phase> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - </dependencies> -</project> +<?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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + +  + <artifactId>simexplorer-is-entities</artifactId> + <name>Entities</name> + + <version>${current.version}</version> + <description>simexplorer-is entities module</description> + <packaging>jar</packaging> + + <parent> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is</artifactId> + <version>${current.version}</version> + </parent> + + <profiles> + <profile> + <id>project</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> +  + <maven.test.skip>false</maven.test.skip> + </properties> + </profile> + </profiles> + + <build> + <plugins> + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <phase>process-classes</phase> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + </dependencies> +</project> Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2008-11-17 11:23:06 UTC (rev 1534) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2008-11-19 14:26:11 UTC (rev 1535) @@ -22,7 +22,7 @@ import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.Code; import fr.cemagref.simexplorer.is.entities.data.Component; -import fr.cemagref.simexplorer.is.entities.data.ComponentType; +import fr.cemagref.simexplorer.is.entities.data.RuntimeType; import fr.cemagref.simexplorer.is.entities.data.Constant; import fr.cemagref.simexplorer.is.entities.data.ConstantValue; import fr.cemagref.simexplorer.is.entities.data.Descriptor; @@ -52,7 +52,7 @@ /** The Component. */ Component(true, n_("simexplorer.common.component"), n_("simexplorer.common.components"), Component.class), - ComponentType(false, n_("simexplorer.common.componenttype"), null, ComponentType.class), + ComponentType(false, n_("simexplorer.common.componenttype"), null, RuntimeType.class), /** The Constant. */ Constant(false, n_("simexplorer.common.constant"), n_("simexplorer.common.constants"), Constant.class), Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java 2008-11-17 11:23:06 UTC (rev 1534) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java 2008-11-19 14:26:11 UTC (rev 1535) @@ -21,6 +21,7 @@ import fr.cemagref.simexplorer.is.entities.Entity; import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.composite.Codes; +import fr.cemagref.simexplorer.is.entities.composite.Components; import fr.cemagref.simexplorer.is.entities.composite.Constants; import fr.cemagref.simexplorer.is.entities.composite.Libraries; import fr.cemagref.simexplorer.is.entities.composite.Structures; @@ -35,7 +36,9 @@ /** The Constant serialVersionUID. */ private static final long serialVersionUID = 1; /** The component type */ - ComponentType type; + RuntimeType type; + /** The sub-components */ + Components subComponents; /** The constants. */ Constants constants; /** The structures. */ @@ -46,15 +49,43 @@ Libraries libraries; private static final String[] excludeFields = {"excludeFields", "metadataIS"}; - public ComponentType getType() { + /** + * Gets the type + * + * @return the type + */ + public RuntimeType getType() { return type; } - public void setType(ComponentType type) { + /** + * Sets the type + * + * @param type the new type + */ + public void setType(RuntimeType type) { this.type = type; } /** + * Gets the sub-components + * + * @return the sub-components + */ + public Components getSubComponents() { + return subComponents; + } + + /** + * Sets the sub-components + * + * @param subComponents the mew sub-components + */ + public void setSubComponents(Components subComponents) { + this.subComponents = subComponents; + } + + /** * Gets the constants. * * @return the constants @@ -136,6 +167,7 @@ directChildren.add(structures); directChildren.add(codes); directChildren.add(libraries); + directChildren.add(subComponents); return directChildren; } Deleted: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ComponentType.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ComponentType.java 2008-11-17 11:23:06 UTC (rev 1534) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ComponentType.java 2008-11-19 14:26:11 UTC (rev 1535) @@ -1,77 +0,0 @@ -/* - * Copyright © 2008, Cemagref - * - * 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 3 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 St, Fifth Floor, Boston, - * MA 02110-1301 USA - */ -package fr.cemagref.simexplorer.is.entities.data; - -import fr.cemagref.simexplorer.is.entities.Leaf; -import java.util.ArrayList; -import java.util.List; - -/** - * Used to represent the class of the component at the exploration runtime - * - * @author dumoulin - */ -public class ComponentType extends Leaf { - - /** The Constant serialVersionUID. */ - private static final long serialVersionUID = 1; - private static final String[] excludeFields = {"excludeFields"}; - private String type; - - public ComponentType(String type) { - this.type = type; - } - - public ComponentType(Class type) { - setType(type); - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public void setType(Class<?> type) { - this.type = type.getCanonicalName(); - } - - @Override - public String toString() { - assert type != null; - return type; - } - - @Override - public List<String> getRow() { - List<String> row = new ArrayList<String>(); - row.add(toString()); - return row; - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.entities.Entity#getExcludeFields() - */ - @Override - protected String[] getExcludeFields() { - return excludeFields; - } -} Copied: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/RuntimeType.java (from rev 1531, trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ComponentType.java) =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/RuntimeType.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/RuntimeType.java 2008-11-19 14:26:11 UTC (rev 1535) @@ -0,0 +1,77 @@ +/* + * Copyright © 2008, Cemagref + * + * 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 3 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 St, Fifth Floor, Boston, + * MA 02110-1301 USA + */ +package fr.cemagref.simexplorer.is.entities.data; + +import fr.cemagref.simexplorer.is.entities.Leaf; +import java.util.ArrayList; +import java.util.List; + +/** + * Used to represent the class of an entity at the exploration runtime + * + * @author dumoulin + */ +public class RuntimeType extends Leaf { + + /** The Constant serialVersionUID. */ + private static final long serialVersionUID = 1; + private static final String[] excludeFields = {"excludeFields"}; + private String type; + + public RuntimeType(String type) { + this.type = type; + } + + public RuntimeType(Class type) { + setType(type); + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public void setType(Class<?> type) { + this.type = type.getCanonicalName(); + } + + @Override + public String toString() { + assert type != null; + return type; + } + + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(toString()); + return row; + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.Entity#getExcludeFields() + */ + @Override + protected String[] getExcludeFields() { + return excludeFields; + } +} Property changes on: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/RuntimeType.java ___________________________________________________________________ Name: svn:mergeinfo + Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Structure.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Structure.java 2008-11-17 11:23:06 UTC (rev 1534) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Structure.java 2008-11-19 14:26:11 UTC (rev 1535) @@ -1,39 +1,89 @@ /* -* ##% Copyright (C) 2008 Cemagref -* -* 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 3 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, see <http://www.gnu.org/licenses/>. -* ##% */ + * ##% Copyright (C) 2008 Cemagref + * + * 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 3 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, see <http://www.gnu.org/licenses/>. + * ##% */ package fr.cemagref.simexplorer.is.entities.data; +import fr.cemagref.simexplorer.is.entities.Leaf; +import fr.cemagref.simexplorer.is.entities.composite.Descriptors; +import fr.cemagref.simexplorer.is.entities.composite.Structures; import java.util.ArrayList; import java.util.List; -import fr.cemagref.simexplorer.is.entities.Leaf; /** * The Class Structure. * * @author Code Lutin, Landais Gabriel, Chemit Tony */ -public abstract class Structure extends Leaf { +public class Structure extends Leaf { /** The Constant serialVersionUID. */ private static final long serialVersionUID = 1; + private String name; + private RuntimeType runtimeType; + /** The sub-structures, if any*/ + private Structures subStructures; + /** The descriptors. */ + private Descriptors descriptors; - private static final String[] excludeFields = { "excludeFields" }; + private static final String[] excludeFields = {"excludeFields"}; + public Structure() { + this.subStructures = new Structures(); + this.descriptors = new Descriptors(); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public RuntimeType getRuntimeType() { + return runtimeType; + } + + public void setRuntimeType(RuntimeType runtimeType) { + this.runtimeType = runtimeType; + } + + public Structures getSubStructures() { + return subStructures; + } + + public void setSubStructures(Structures subStructures) { + this.subStructures = subStructures; + } + + public Descriptors getDescriptors() { + return descriptors; + } + + public void setDescriptors(Descriptors descriptors) { + this.descriptors = descriptors; + } + @Override + public String toString() { + return getName(); + } + + @Override public List<String> getRow() { List<String> row = new ArrayList<String>(); row.add(toString()); Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java 2008-11-17 11:23:06 UTC (rev 1534) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java 2008-11-19 14:26:11 UTC (rev 1535) @@ -38,7 +38,7 @@ import fr.cemagref.simexplorer.is.entities.composite.Structures; import fr.cemagref.simexplorer.is.entities.data.Code; import fr.cemagref.simexplorer.is.entities.data.Component; -import fr.cemagref.simexplorer.is.entities.data.ComponentType; +import fr.cemagref.simexplorer.is.entities.data.RuntimeType; import fr.cemagref.simexplorer.is.entities.data.Constant; import fr.cemagref.simexplorer.is.entities.data.ConstantValue; import fr.cemagref.simexplorer.is.entities.data.Descriptor; @@ -264,7 +264,7 @@ * @throws Exception the exception */ private void processComponent(Component component) throws Exception { - component.setType(new ComponentType(Object.class)); + component.setType(new RuntimeType(Object.class)); Constants constants = generateComposite(Constants.class); for (Constant constant : constants) { processConstant(constant); Property changes on: trunk/simexplorer-is/simexplorer-is-swing-generated ___________________________________________________________________ Name: svn:ignore - target target/* .project .classpath *.iml *.ipr *.iws + target target/* .project .classpath *.iml *.ipr *.iws .settings

1 0

r1534 - in trunk/simexplorer-is: . simexplorer-is-web
by thimel＠users.labs.libre-entreprise.org 17 Nov '08

17 Nov '08

Author: thimel Date: 2008-11-17 11:23:06 +0000 (Mon, 17 Nov 2008) New Revision: 1534 Modified: trunk/simexplorer-is/pom.xml trunk/simexplorer-is/simexplorer-is-web/pom.xml Log: Moved maven-war-plugin dependency to simexplorer-is-web only Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-11-17 10:55:46 UTC (rev 1533) +++ trunk/simexplorer-is/pom.xml 2008-11-17 11:23:06 UTC (rev 1534) @@ -585,16 +585,6 @@ <version>${jaxx.version}</version> </dependency> - <dependency> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.0.2</version> -  -  -  - </dependency> - - </dependencies> </dependencyManagement> Modified: trunk/simexplorer-is/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/pom.xml 2008-11-17 10:55:46 UTC (rev 1533) +++ trunk/simexplorer-is/simexplorer-is-web/pom.xml 2008-11-17 11:23:06 UTC (rev 1534) @@ -23,7 +23,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> -  + <version>2.0.2</version> <configuration> <warSourceDirectory> ${basedir}/src/main/webapp

1 0

r1533 - trunk/simexplorer-is
by thimel＠users.labs.libre-entreprise.org 17 Nov '08

17 Nov '08

Author: thimel Date: 2008-11-17 10:55:46 +0000 (Mon, 17 Nov 2008) New Revision: 1533 Modified: trunk/simexplorer-is/pom.xml Log: Changed version of jrst (0.8.4-SNAPSHOT and new groupId) Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-11-17 10:22:36 UTC (rev 1532) +++ trunk/simexplorer-is/pom.xml 2008-11-17 10:55:46 UTC (rev 1533) @@ -124,9 +124,9 @@ <build> <plugins> <plugin> - <groupId>lutinplugin</groupId> + <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.1-SNAPSHOT</version> + <version>0.8.4-SNAPSHOT</version> <executions> <execution>

1 0

r1532 - trunk/simexplorer-is/simexplorer-is-swing
by thimel＠users.labs.libre-entreprise.org 17 Nov '08

17 Nov '08

Author: thimel Date: 2008-11-17 10:22:36 +0000 (Mon, 17 Nov 2008) New Revision: 1532 Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml Log: Specify version of maven-jaxx-plugin in simexplorer-is-swing's pom.xml Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-11-13 13:19:14 UTC (rev 1531) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-11-17 10:22:36 UTC (rev 1532) @@ -108,6 +108,7 @@ <plugin> <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> <configuration> <copyToCP>true</copyToCP> <actionsFile>/jaxx/simexplorer-actions.properties</actionsFile>

1 0

r1531 - trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data
by dumoulin＠users.labs.libre-entreprise.org 13 Nov '08

13 Nov '08

Author: dumoulin Date: 2008-11-13 13:19:14 +0000 (Thu, 13 Nov 2008) New Revision: 1531 Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ComponentType.java Log: BUGFIX: type is now stored as a string, because the Class could be unknown by the IS runtime classloader. Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ComponentType.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ComponentType.java 2008-10-23 08:34:23 UTC (rev 1530) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ComponentType.java 2008-11-13 13:19:14 UTC (rev 1531) @@ -32,24 +32,32 @@ /** The Constant serialVersionUID. */ private static final long serialVersionUID = 1; private static final String[] excludeFields = {"excludeFields"}; - Class<?> type; + private String type; - public ComponentType(Class type) { + public ComponentType(String type) { this.type = type; } - public Class<?> getType() { + public ComponentType(Class type) { + setType(type); + } + + public String getType() { return type; } - public void setType(Class<?> type) { + public void setType(String type) { this.type = type; } + public void setType(Class<?> type) { + this.type = type.getCanonicalName(); + } + @Override public String toString() { assert type != null; - return type.getCanonicalName().toString(); + return type; } @Override

1 0

r1530 - tags
by tchemit＠users.labs.libre-entreprise.org 23 Oct '08

23 Oct '08

Author: tchemit Date: 2008-10-23 08:34:23 +0000 (Thu, 23 Oct 2008) New Revision: 1530 Added: tags/tchemit_20081023_beforeUTF8/ Log: taggage avant passage en utf8 Copied: tags/tchemit_20081023_beforeUTF8 (from rev 1529, trunk)

1 0

r1529 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by dumoulin＠users.labs.libre-entreprise.org 10 Sep '08

10 Sep '08

Author: dumoulin Date: 2008-09-10 13:45:23 +0000 (Wed, 10 Sep 2008) New Revision: 1529 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java Log: documentation Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-08-28 14:56:13 UTC (rev 1528) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-09-10 13:45:23 UTC (rev 1529) @@ -97,6 +97,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#getMetadata(java.lang.String, java.lang.String) */ + @Override public MetaData getMetadata(String token, String uuid) throws SimExplorerException { if (log.isDebugEnabled()) { log.debug("getMetadata"); @@ -107,6 +108,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#getMetadata(java.lang.String, java.lang.String, java.lang.String) */ + @Override public MetaData getMetadata(String token, String uuid, String version) throws SimExplorerException { if (log.isDebugEnabled()) { log.debug("getMetadata"); @@ -209,6 +211,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#findFullText(java.lang.String, java.lang.String, boolean, int, int, int) */ + @Override public MetaData[] findFullText(String token, String query, String queryColumn, boolean onlyLatest, int indexStart, int count, String column, boolean ascending) throws SimExplorerException { if (log.isDebugEnabled()) { @@ -221,6 +224,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#findFullTextCount(java.lang.String, java.lang.String, boolean) */ + @Override public int findFullTextCount(String token, String query, String queryColumn, boolean onlyLatest) throws SimExplorerException { if (log.isDebugEnabled()) { @@ -232,6 +236,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#findApplicationsCount(java.lang.String, boolean) */ + @Override public int findElementsCount(String token, String type, boolean onlyLatest) throws SimExplorerException { if (log.isDebugEnabled()) { log.debug("findElementsCount"); @@ -242,6 +247,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#findApplications(java.lang.String, boolean, int, int, int) */ + @Override public MetaData[] findElements(String token, String type, boolean onlyLatest, int start, int count, String column, boolean ascending) throws SimExplorerException { if (log.isDebugEnabled()) { @@ -254,6 +260,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#getLoggableElement(java.lang.String, java.lang.String, java.lang.String) */ + @Override public LoggableElement getLoggableElement(String token, String uuid, String version) throws SimExplorerException { if (log.isDebugEnabled()) { log.debug("getLoggableElement"); @@ -277,6 +284,7 @@ * * @throws SimExplorerException the sim explorer service exception */ + @Override public LoggableElement saveElement(String token, SerializableInputStream zipStream) throws SimExplorerException { if (log.isDebugEnabled()) { log.debug("saveElement"); @@ -344,6 +352,7 @@ * * @throws SimExplorerException the exception */ + @Override public LoggableElement saveElement(String token, SerializableInputStream xmlFile, Map<Attachment, SerializableInputStream> attachments) throws SimExplorerException { if (log.isDebugEnabled()) { @@ -382,6 +391,7 @@ * * @throws SimExplorerException the sim explorer service exception */ + @Override public InputStream retrieveElementData(String token, String uuid, String version, Attachment attachment) throws SimExplorerException { if (log.isDebugEnabled()) { @@ -410,6 +420,7 @@ * * @throws SimExplorerException the sim explorer service exception */ + @Override public InputStream retrieveElementFull(String token, String uuid, String version) throws SimExplorerException { if (log.isDebugEnabled()) { log.debug("retrieveElementFull"); @@ -450,6 +461,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#getVersions(java.lang.String, java.lang.String) */ + @Override public Version[] getVersions(String token, String uuid) throws SimExplorerException { if (log.isDebugEnabled()) { log.debug("getVersions"); @@ -582,6 +594,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#deleteElement(java.lang.String, java.lang.String, java.lang.String) */ + @Override public void deleteElement(String token, String uuid, String version) throws SimExplorerException { if (log.isDebugEnabled()) { log.debug("deleteElement"); @@ -606,9 +619,16 @@ getStorageEngine().commit(); } - /* (non-Javadoc) + /** + * Delete all the versions of an element + * + * @param token + * @param uuid + * + * @throws SimExplorerException * @see fr.cemagref.simexplorer.is.service.StorageService#deleteElement(java.lang.String, java.lang.String) */ + @Override public void deleteElement(String token, String uuid) throws SimExplorerException { if (log.isDebugEnabled()) { log.debug("deleteElement");

1 0

r1528 - in trunk/simexplorer-is: simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data simexplorer-is-entities/src/resources/i18n simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by dumoulin＠users.labs.libre-entreprise.org 28 Aug '08

28 Aug '08

Author: dumoulin Date: 2008-08-28 14:56:13 +0000 (Thu, 28 Aug 2008) New Revision: 1528 Added: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ComponentType.java Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java Log: entity ComponentType added to represent the class of a component at exploration runtime Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2008-08-28 14:19:42 UTC (rev 1527) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2008-08-28 14:56:13 UTC (rev 1528) @@ -22,6 +22,7 @@ import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.Code; import fr.cemagref.simexplorer.is.entities.data.Component; +import fr.cemagref.simexplorer.is.entities.data.ComponentType; import fr.cemagref.simexplorer.is.entities.data.Constant; import fr.cemagref.simexplorer.is.entities.data.ConstantValue; import fr.cemagref.simexplorer.is.entities.data.Descriptor; @@ -51,6 +52,8 @@ /** The Component. */ Component(true, n_("simexplorer.common.component"), n_("simexplorer.common.components"), Component.class), + ComponentType(false, n_("simexplorer.common.componenttype"), null, ComponentType.class), + /** The Constant. */ Constant(false, n_("simexplorer.common.constant"), n_("simexplorer.common.constants"), Constant.class), @@ -108,7 +111,7 @@ return value; } } - log.info("Entity not fund for class " + klass); + log.info("Entity not found for class " + klass); return null; } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java 2008-08-28 14:19:42 UTC (rev 1527) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java 2008-08-28 14:56:13 UTC (rev 1528) @@ -1,28 +1,30 @@ /* -* ##% Copyright (C) 2008 Cemagref -* -* 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 3 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, see <http://www.gnu.org/licenses/>. -* ##% */ + * ##% Copyright (C) 2008 Cemagref + * + * 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 3 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, see <http://www.gnu.org/licenses/>. + * ##% */ package fr.cemagref.simexplorer.is.entities.data; import java.util.List; import fr.cemagref.simexplorer.is.entities.Entity; +import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.composite.Codes; import fr.cemagref.simexplorer.is.entities.composite.Constants; import fr.cemagref.simexplorer.is.entities.composite.Libraries; import fr.cemagref.simexplorer.is.entities.composite.Structures; +import java.util.ArrayList; /** * The Class Component. @@ -32,21 +34,26 @@ /** The Constant serialVersionUID. */ private static final long serialVersionUID = 1; - + /** The component type */ + ComponentType type; /** The constants. */ Constants constants; - /** The structures. */ Structures structures; - /** The codes. */ Codes codes; - /** The libraries. */ Libraries libraries; + private static final String[] excludeFields = {"excludeFields", "metadataIS"}; - private static final String[] excludeFields = { "excludeFields", "metadataIS" }; + public ComponentType getType() { + return type; + } + public void setType(ComponentType type) { + this.type = type; + } + /** * Gets the constants. * @@ -132,6 +139,13 @@ return directChildren; } + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(EntityTypeEnum.getLibelle(this.getClass())+" ("+type+")"); + return row; + } + /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.entities.Entity#getExcludeFields() */ @@ -139,5 +153,4 @@ protected String[] getExcludeFields() { return excludeFields; } - } Added: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ComponentType.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ComponentType.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ComponentType.java 2008-08-28 14:56:13 UTC (rev 1528) @@ -0,0 +1,69 @@ +/* + * Copyright © 2008, Cemagref + * + * 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 3 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 St, Fifth Floor, Boston, + * MA 02110-1301 USA + */ +package fr.cemagref.simexplorer.is.entities.data; + +import fr.cemagref.simexplorer.is.entities.Leaf; +import java.util.ArrayList; +import java.util.List; + +/** + * Used to represent the class of the component at the exploration runtime + * + * @author dumoulin + */ +public class ComponentType extends Leaf { + + /** The Constant serialVersionUID. */ + private static final long serialVersionUID = 1; + private static final String[] excludeFields = {"excludeFields"}; + Class<?> type; + + public ComponentType(Class type) { + this.type = type; + } + + public Class<?> getType() { + return type; + } + + public void setType(Class<?> type) { + this.type = type; + } + + @Override + public String toString() { + assert type != null; + return type.getCanonicalName().toString(); + } + + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(toString()); + return row; + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.Entity#getExcludeFields() + */ + @Override + protected String[] getExcludeFields() { + return excludeFields; + } +} Modified: trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties 2008-08-28 14:19:42 UTC (rev 1527) +++ trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties 2008-08-28 14:56:13 UTC (rev 1528) @@ -8,6 +8,7 @@ simexplorer.common.codes=Codes simexplorer.common.component=Component simexplorer.common.components=Components +simexplorer.common.componenttype=Type of the component simexplorer.common.constant=Constant simexplorer.common.constant.name=Name simexplorer.common.constant.type=Type Modified: trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties 2008-08-28 14:19:42 UTC (rev 1527) +++ trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties 2008-08-28 14:56:13 UTC (rev 1528) @@ -8,6 +8,7 @@ simexplorer.common.codes=Codes simexplorer.common.component=Composant simexplorer.common.components=Composants +simexplorer.common.componenttype=Type du composant simexplorer.common.constant=Constante simexplorer.common.constant.name=Nom simexplorer.common.constant.type=Type Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java 2008-08-28 14:19:42 UTC (rev 1527) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java 2008-08-28 14:56:13 UTC (rev 1528) @@ -38,6 +38,7 @@ import fr.cemagref.simexplorer.is.entities.composite.Structures; import fr.cemagref.simexplorer.is.entities.data.Code; import fr.cemagref.simexplorer.is.entities.data.Component; +import fr.cemagref.simexplorer.is.entities.data.ComponentType; import fr.cemagref.simexplorer.is.entities.data.Constant; import fr.cemagref.simexplorer.is.entities.data.ConstantValue; import fr.cemagref.simexplorer.is.entities.data.Descriptor; @@ -263,6 +264,7 @@ * @throws Exception the exception */ private void processComponent(Component component) throws Exception { + component.setType(new ComponentType(Object.class)); Constants constants = generateComposite(Constants.class); for (Constant constant : constants) { processConstant(constant); Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-08-28 14:19:42 UTC (rev 1527) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-08-28 14:56:13 UTC (rev 1528) @@ -51,7 +51,7 @@ public Object onActionFromGenerateData() throws Exception { StorageServiceGenerator storageServiceGenerator = new StorageServiceGenerator(); storageServiceGenerator.generateLotsExplorationApplication(RemoteStorageService.getStorageService(), - getToken(), 10); + getToken(), 1); return elementList; }

1 0

r1527 - trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n
by dumoulin＠users.labs.libre-entreprise.org 28 Aug '08

28 Aug '08

Author: dumoulin Date: 2008-08-28 14:19:42 +0000 (Thu, 28 Aug 2008) New Revision: 1527 Modified: trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties Log: mistype Modified: trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties 2008-07-29 09:36:49 UTC (rev 1526) +++ trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties 2008-08-28 14:19:42 UTC (rev 1527) @@ -6,7 +6,7 @@ simexplorer.common.code.code=Code simexplorer.common.code.language=Langage simexplorer.common.codes=Codes -simexplorer.common.component=Componsant +simexplorer.common.component=Composant simexplorer.common.components=Composants simexplorer.common.constant=Constante simexplorer.common.constant.name=Nom

1 0

r1526 - trunk/simexplorer-is
by tchemit＠users.labs.libre-entreprise.org 29 Jul '08

29 Jul '08

Author: tchemit Date: 2008-07-29 09:36:49 +0000 (Tue, 29 Jul 2008) New Revision: 1526 Modified: trunk/simexplorer-is/pom.xml Log: try another maven-war-plugin to fix hudson bug on war assembly... Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-07-29 09:20:56 UTC (rev 1525) +++ trunk/simexplorer-is/pom.xml 2008-07-29 09:36:49 UTC (rev 1526) @@ -588,7 +588,8 @@ <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.1-alpha-1</version> + <version>2.0.2</version> +    </dependency>

1 0