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

r1295 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by glandais＠users.labs.libre-entreprise.org March 6, 2008

March 6, 2008

Author: glandais Date: 2008-03-06 13:25:33 +0000 (Thu, 06 Mar 2008) New Revision: 1295 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java Log: Useless reserialization Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java 2008-03-06 12:41:40 UTC (rev 1294) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java 2008-03-06 13:25:33 UTC (rev 1295) @@ -49,7 +49,13 @@ // Store element in remote service MetaData toElement; try { - toElement = toService.saveElement(token, new SerializableInputStream(fromElement)); + if (fromElement instanceof SerializableInputStream) { + toElement = toService.saveElement(token, + (SerializableInputStream) fromElement); + } else { + toElement = toService.saveElement(token, + new SerializableInputStream(fromElement)); + } } catch (IOException e) { throw new SimExplorerTechnicalException(e); }

1 0

r1294 - trunk/simexplorer-is/src/site/fr/rst
by glandais＠users.labs.libre-entreprise.org March 6, 2008

March 6, 2008

Author: glandais Date: 2008-03-06 12:41:40 +0000 (Thu, 06 Mar 2008) New Revision: 1294 Modified: trunk/simexplorer-is/src/site/fr/rst/install.rst Log: Doc install update Modified: trunk/simexplorer-is/src/site/fr/rst/install.rst =================================================================== --- trunk/simexplorer-is/src/site/fr/rst/install.rst 2008-03-06 12:20:04 UTC (rev 1293) +++ trunk/simexplorer-is/src/site/fr/rst/install.rst 2008-03-06 12:41:40 UTC (rev 1294) @@ -52,10 +52,8 @@ :: - bin/run.sh -b ADRESSE_SERVEUR -c simexplorer - -ADRESSE_SERVEUR doit contenir soit l'IP du serveur, soit son adresse pouvant être retrouvée par le DNS. - + bin/run.sh -b 0.0.0.0 -c simexplorer + Première connexion ================== @@ -99,5 +97,5 @@ sudo chown USER simexplorer cd cd jboss-4.2.2.GA/bin - ./run.sh -b ADRESSE_SERVEUR -c simexplorer + ./run.sh -b 0.0.0.0 -c simexplorer \ No newline at end of file

1 0

r1293 - trunk/simexplorer-is/src/site/fr/rst
by glandais＠users.labs.libre-entreprise.org March 6, 2008

March 6, 2008

Author: glandais Date: 2008-03-06 12:20:04 +0000 (Thu, 06 Mar 2008) New Revision: 1293 Modified: trunk/simexplorer-is/src/site/fr/rst/install.rst Log: Doc install update Modified: trunk/simexplorer-is/src/site/fr/rst/install.rst =================================================================== --- trunk/simexplorer-is/src/site/fr/rst/install.rst 2008-03-05 18:01:02 UTC (rev 1292) +++ trunk/simexplorer-is/src/site/fr/rst/install.rst 2008-03-06 12:20:04 UTC (rev 1293) @@ -39,6 +39,12 @@ Copier l'applicatif (simexplorer-is-ear-VERSION.ear) dans le dossier server/simexplorer/deploy de JBoss. +Configuration +------------- + +L'application utilise le pool de mail intégré à JBoss. Ainsi, il est nécessaire de modifier les propriétés +mail.smtp.host et mail.from dans le fichier /opt/java/jboss-4.2.2.GA/server/simexplorer/deploy/mail-service.xml + Exécution ========= @@ -46,7 +52,9 @@ :: - bin/run.sh -b 0.0.0.0 -c simexplorer + bin/run.sh -b ADRESSE_SERVEUR -c simexplorer + +ADRESSE_SERVEUR doit contenir soit l'IP du serveur, soit son adresse pouvant être retrouvée par le DNS. Première connexion ================== @@ -89,9 +97,7 @@ cd /var/local/ sudo mkdir simexplorer sudo chown USER simexplorer - cd simexplorer/ - mkdir h2 cd cd jboss-4.2.2.GA/bin - ./run.sh -b 0.0.0.0 -c simexplorer + ./run.sh -b ADRESSE_SERVEUR -c simexplorer \ No newline at end of file

1 0

r1292 - trunk/simexplorer-is
by glandais＠users.labs.libre-entreprise.org March 5, 2008

March 5, 2008

Author: glandais Date: 2008-03-05 18:01:02 +0000 (Wed, 05 Mar 2008) New Revision: 1292 Modified: trunk/simexplorer-is/.classpath Log: Config plugin Eclipse Modified: trunk/simexplorer-is/.classpath =================================================================== --- trunk/simexplorer-is/.classpath 2008-03-05 18:00:37 UTC (rev 1291) +++ trunk/simexplorer-is/.classpath 2008-03-05 18:01:02 UTC (rev 1292) @@ -21,6 +21,6 @@ <classpathentry kind="src" path="simexplorer-is-storage/src/test"/> <classpathentry kind="src" path="simexplorer-is-storage/src/resources"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules/noworkspace"/> <classpathentry kind="output" path="bin"/> </classpath>

1 0

r1291 - in trunk/simexplorer-is: simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-swing-jaxx/src/resources/i18n simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools simexplorer-is-web/src/main/webapp/WEB-INF
by glandais＠users.labs.libre-entreprise.org March 5, 2008

March 5, 2008

Author: glandais Date: 2008-03-05 18:00:37 +0000 (Wed, 05 Mar 2008) New Revision: 1291 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/metadata/MetaData.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-en_GB.properties trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-fr_FR.properties trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties Log: i18n 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-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2008-03-05 18:00:37 UTC (rev 1291) @@ -1,7 +1,7 @@ package fr.cemagref.simexplorer.is.entities; +import static org.codelutin.i18n.I18n.n_; import static org.codelutin.i18n.I18n._; -import static org.codelutin.i18n.I18n.n_; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.Code; import fr.cemagref.simexplorer.is.entities.data.Component; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-03-05 18:00:37 UTC (rev 1291) @@ -298,4 +298,8 @@ return EntityTypeEnum.getEntityType(getElementClass()); } + public String getEntityTypeLibelle() { + return getEntityType().getLibelle(); + } + } Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-03-05 18:00:37 UTC (rev 1291) @@ -552,7 +552,6 @@ */ public String loginUser(String login, String password) throws SimExplorerException { if (!superAdminCheck) { - I18n.initISO88591("fr", "FR"); checkSuperAdmin(); superAdminCheck = true; } @@ -806,4 +805,8 @@ return credentialManager.getPermissionsOwnedByCount(user); } + + { + I18n.initISO88591("fr", "FR"); + } } Modified: trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-en_GB.properties 2008-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-en_GB.properties 2008-03-05 18:00:37 UTC (rev 1291) @@ -21,6 +21,6 @@ simexplorer.help.menu=Help simexplorer.login.title=Authentication to remote server simexplorer.main.menu=Main -simexplorer.main.ui.title=SimExplorer SI v 0.0.1 +simexplorer.main.ui.title=SimExplorer SI v 0.1 simexplorer.node.navigation.local=Local element simexplorer.node.navigation.remote=Remote element Modified: trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-fr_FR.properties 2008-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-fr_FR.properties 2008-03-05 18:00:37 UTC (rev 1291) @@ -21,6 +21,6 @@ simexplorer.help.menu=Aide simexplorer.login.title=Connexion au serveur central simexplorer.main.menu=Menu principal -simexplorer.main.ui.title=SimExplorer SI v 0.0.1 +simexplorer.main.ui.title=SimExplorer SI v 0.1 simexplorer.node.navigation.local=\u00E9l\u00E9ment local simexplorer.node.navigation.remote=\u00E9l\u00E9ment distant Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java 2008-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java 2008-03-05 18:00:37 UTC (rev 1291) @@ -1,26 +1,32 @@ /* -* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais -* -* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ + * ##% Copyright (C) 2008 Code Lutin, Gabriel Landais + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * ##% */ package fr.cemagref.simexplorer.is.ui.web.services; import java.io.IOException; +import org.apache.tapestry.ValueEncoder; +import org.apache.tapestry.internal.services.EnumValueEncoderFactory; +import org.apache.tapestry.internal.services.GenericValueEncoderFactory; +import org.apache.tapestry.internal.services.StringValueEncoder; +import org.apache.tapestry.internal.services.TypeCoercedValueEncoderFactory; import org.apache.tapestry.ioc.Configuration; import org.apache.tapestry.ioc.MappedConfiguration; +import org.apache.tapestry.ioc.ObjectLocator; import org.apache.tapestry.ioc.OrderedConfiguration; import org.apache.tapestry.ioc.ServiceBinder; import org.apache.tapestry.ioc.annotations.InjectService; @@ -30,6 +36,7 @@ import org.apache.tapestry.services.RequestFilter; import org.apache.tapestry.services.RequestHandler; import org.apache.tapestry.services.Response; +import org.apache.tapestry.services.ValueEncoderFactory; import org.slf4j.Logger; import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; @@ -43,13 +50,14 @@ /** * Bind. * - * @param binder the binder + * @param binder + * the binder */ public static void bind(ServiceBinder binder) { /* - binder.bind(RemoteStorageService.class, RemoteStorageServiceImpl.class); - binder.bind(RemoteSecurityService.class, RemoteSecurityServiceImpl.class); - */ + * binder.bind(RemoteStorageService.class, RemoteStorageServiceImpl.class); + * binder.bind(RemoteSecurityService.class, RemoteSecurityServiceImpl.class); + */ // Make bind() calls on the binder object to define most IoC services. // Use service builder methods (example below) when the implementation @@ -60,7 +68,8 @@ /** * Contribute application defaults. * - * @param configuration the configuration + * @param configuration + * the configuration */ public static void contributeApplicationDefaults(MappedConfiguration<String, String> configuration) { configuration.add("tapestry.supported-locales", "en,fr"); @@ -70,43 +79,14 @@ /** * Contribute default data type analyzer. * - * @param configuration the configuration + * @param configuration + * the configuration */ public static void contributeDefaultDataTypeAnalyzer(MappedConfiguration<Class<?>, String> configuration) { configuration.add(Version.class, "text"); - configuration.add(EntityTypeEnum.class, "text"); } /** - * Contribute type coercer. - * - * @param configuration the configuration - */ - public static void contributeTypeCoercer(Configuration<CoercionTuple> configuration) { - Coercion<Version, String> coercionVersionString = new Coercion<Version, String>() { - public String coerce(Version input) { - return input.toString(); - } - }; - Coercion<String, Version> coercionStringVersion = new Coercion<String, Version>() { - public Version coerce(String input) { - return Version.valueOf(input); - } - }; - Coercion<EntityTypeEnum, String> coercionEntityTypeEnumString = new Coercion<EntityTypeEnum, String>() { - public String coerce(EntityTypeEnum input) { - if (input == null) { - return ""; - } - return input.getLibelle(); - } - }; - configuration.add(new CoercionTuple<Version, String>(Version.class, String.class, coercionVersionString)); - configuration.add(new CoercionTuple<String, Version>(String.class, Version.class, coercionStringVersion)); - configuration.add(new CoercionTuple<EntityTypeEnum, String>(EntityTypeEnum.class, String.class, coercionEntityTypeEnumString)); - } - - /** * This is a service definition, the service will be named "TimingFilter". The interface, RequestFilter, is used * within the RequestHandler service pipeline, which is built from the RequestHandler service configuration. * Tapestry IoC is responsible for passing in an appropriate Log instance. Requests for static resources are handled @@ -121,7 +101,8 @@ * "RequestFilter". Since Tapestry already defines a service named "RequestFilter" we use an explicit service id * that we can reference inside the contribution method. * - * @param log the log + * @param log + * the log * * @return the request filter */ @@ -151,8 +132,10 @@ * This is a contribution to the RequestHandler service configuration. This is how we extend Tapestry using the * timing filter. A common use for this kind of filter is transaction management or security. * - * @param configuration the configuration - * @param filter the filter + * @param configuration + * the configuration + * @param filter + * the filter */ public void contributeRequestHandler(OrderedConfiguration<RequestFilter> configuration, @InjectService("TimingFilter") Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java 2008-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java 2008-03-05 18:00:37 UTC (rev 1291) @@ -17,11 +17,14 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.tools; +import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.List; import org.apache.tapestry.ComponentResources; +import org.apache.tapestry.PropertyConduit; import org.apache.tapestry.beaneditor.BeanModel; +import org.apache.tapestry.beaneditor.PropertyModel; import org.apache.tapestry.services.BeanModelSource; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; @@ -56,12 +59,13 @@ wantedProperties.add("uuid"); wantedProperties.add("version"); wantedProperties.add("name"); - wantedProperties.add("entityType"); + wantedProperties.add("entityTypeLibelle"); if (!securityList) { wantedProperties.add("description"); wantedProperties.add("creationDate"); } + List<String> properties = model.getPropertyNames(); for (String property : properties) { if (!sortable) { @@ -69,7 +73,7 @@ } if (!wantedProperties.contains(property)) { model = model.remove(property); - } + } } if (securityList) { model.add("owner", null); Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-03-05 18:00:37 UTC (rev 1291) @@ -147,3 +147,28 @@ simexplorer.ui.web.error.security=Not enough rights to perform that action. simexplorer.ui.web.generatedata=Generate data + +uuid-label=Details +version-label=Version +name-label=Name +entityTypeLibelle-label=Type +description-label=Description +creationDate-label=Creation date +owner-label=Owner +read-label=Reader +write-label=Writer +admin-label=Admin +rights-label=Rights +edit-label=Edit +delete-label=Delete +login-label=Login +superAdmin-label=Super admin + +AllFields=All fields +Name=Name +Description=Description +Descriptors=Descriptors +AttachmentsName=Attachment names +AttachmentsContent=Attachment content + +searchField-label=Searched content Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-03-05 18:00:37 UTC (rev 1291) @@ -113,7 +113,7 @@ simexplorer.ui.web.import.explorationapplication=Application d'exploration simexplorer.ui.web.import.library=Librairie -simexplorer.ui.web.elementlist.details=Details +simexplorer.ui.web.elementlist.details=Détails simexplorer.ui.web.elementmanage.filterowner=Seulement les éléments dont le propriétaire est simexplorer.ui.web.elementmanage.ok=Ok @@ -147,3 +147,28 @@ simexplorer.ui.web.error.security=Pas assez de droits pour réaliser cette action. simexplorer.ui.web.generatedata=Generate data + +uuid-label=Détails +version-label=Version +name-label=Nom +entityTypeLibelle-label=Type +description-label=Description +creationDate-label=Date création +owner-label=Propriétaire +read-label=Lecture +write-label=Ecriture +admin-label=Admin +rights-label=Droits +edit-label=Edition +delete-label=Suppression +login-label=Login +superAdmin-label=Super admin + +AllFields=Tous les champs +Name=Nom +Description=Description +Descriptors=Mots-clés +AttachmentsName=Noms fichiers +AttachmentsContent=Contenu fichiers + +searchField-label=Texte recherché

1 0

r1290 - trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by glandais＠users.labs.libre-entreprise.org March 5, 2008

March 5, 2008

Author: glandais Date: 2008-03-05 17:59:23 +0000 (Wed, 05 Mar 2008) New Revision: 1290 Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementManage.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java Log: Maven version update Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java 2008-03-05 17:58:27 UTC (rev 1289) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java 2008-03-05 17:59:23 UTC (rev 1290) @@ -22,10 +22,10 @@ import org.apache.tapestry.annotations.Persist; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; -import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; +import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java 2008-03-05 17:58:27 UTC (rev 1289) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java 2008-03-05 17:59:23 UTC (rev 1290) @@ -18,11 +18,11 @@ package fr.cemagref.simexplorer.is.ui.web.pages; import org.apache.tapestry.annotations.InjectPage; -import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.upload.services.UploadedFile; import com.healthmarketscience.rmiio.SerializableInputStream; +import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerTechnicalException; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-03-05 17:58:27 UTC (rev 1289) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-03-05 17:59:23 UTC (rev 1290) @@ -25,10 +25,10 @@ import org.apache.tapestry.annotations.Persist; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; -import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; +import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementManage.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementManage.java 2008-03-05 17:58:27 UTC (rev 1289) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementManage.java 2008-03-05 17:59:23 UTC (rev 1290) @@ -28,10 +28,10 @@ import org.apache.tapestry.annotations.Persist; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; -import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; +import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.security.entities.Actor; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java 2008-03-05 17:58:27 UTC (rev 1289) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java 2008-03-05 17:59:23 UTC (rev 1290) @@ -20,10 +20,10 @@ import org.apache.tapestry.ComponentResources; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; -import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; +import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java 2008-03-05 17:58:27 UTC (rev 1289) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java 2008-03-05 17:59:23 UTC (rev 1290) @@ -22,8 +22,8 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; +import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService; import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; -import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService; /** * The Class ElementPage. Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-03-05 17:58:27 UTC (rev 1289) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-03-05 17:59:23 UTC (rev 1290) @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.StringTokenizer; import org.apache.tapestry.ComponentResources; @@ -29,7 +28,6 @@ import org.apache.tapestry.ioc.annotations.Inject; import org.codelutin.tapestry.beans.TreeNode; -import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.Descriptor; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java 2008-03-05 17:58:27 UTC (rev 1289) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java 2008-03-05 17:59:23 UTC (rev 1290) @@ -31,8 +31,8 @@ import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.security.entities.Permission; import fr.cemagref.simexplorer.is.security.entities.User; +import fr.cemagref.simexplorer.is.service.remote.RemoteSecurityService; import fr.cemagref.simexplorer.is.ui.web.services.GroupValueEncoder; -import fr.cemagref.simexplorer.is.service.remote.RemoteSecurityService; import fr.cemagref.simexplorer.is.ui.web.services.UserValueEncoder; /** Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-03-05 17:58:27 UTC (rev 1289) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-03-05 17:59:23 UTC (rev 1290) @@ -19,7 +19,6 @@ import java.util.List; -import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.ioc.Messages; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.ioc.services.ExceptionAnalysis; @@ -27,6 +26,7 @@ import org.apache.tapestry.ioc.services.ExceptionInfo; import org.apache.tapestry.services.ExceptionReporter; +import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.exceptions.SimExplorerBusinessException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-03-05 17:58:27 UTC (rev 1289) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-03-05 17:59:23 UTC (rev 1290) @@ -28,9 +28,9 @@ import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.security.entities.User; +import fr.cemagref.simexplorer.is.service.remote.RemoteSecurityService; import fr.cemagref.simexplorer.is.ui.web.pages.security.AdminPage; import fr.cemagref.simexplorer.is.ui.web.services.GroupValueEncoder; -import fr.cemagref.simexplorer.is.service.remote.RemoteSecurityService; import fr.cemagref.simexplorer.is.ui.web.services.UserValueEncoder; /** Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-03-05 17:58:27 UTC (rev 1289) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-03-05 17:59:23 UTC (rev 1290) @@ -21,10 +21,10 @@ import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; -import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; +import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.service.remote.RemoteSecurityService; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-03-05 17:58:27 UTC (rev 1289) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-03-05 17:59:23 UTC (rev 1290) @@ -28,10 +28,10 @@ import org.apache.tapestry.annotations.Persist; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; -import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; +import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.security.entities.Group; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-03-05 17:58:27 UTC (rev 1289) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-03-05 17:59:23 UTC (rev 1290) @@ -21,10 +21,10 @@ import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; -import org.apache.tapestry.commons.annotations.SetterGetter; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; +import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.security.entities.User; import fr.cemagref.simexplorer.is.service.remote.RemoteSecurityService;

1 0

r1289 - in trunk/simexplorer-is: . simexplorer-is-ear simexplorer-is-entities simexplorer-is-security simexplorer-is-service simexplorer-is-storage simexplorer-is-swing simexplorer-is-swing-jaxx simexplorer-is-web
by glandais＠users.labs.libre-entreprise.org March 5, 2008

March 5, 2008

Author: glandais Date: 2008-03-05 17:58:27 +0000 (Wed, 05 Mar 2008) New Revision: 1289 Modified: trunk/simexplorer-is/pom.xml trunk/simexplorer-is/simexplorer-is-ear/pom.xml trunk/simexplorer-is/simexplorer-is-entities/pom.xml trunk/simexplorer-is/simexplorer-is-security/pom.xml trunk/simexplorer-is/simexplorer-is-service/pom.xml trunk/simexplorer-is/simexplorer-is-storage/pom.xml trunk/simexplorer-is/simexplorer-is-swing-jaxx/pom.xml trunk/simexplorer-is/simexplorer-is-swing/go.bat trunk/simexplorer-is/simexplorer-is-swing/go.sh trunk/simexplorer-is/simexplorer-is-swing/pom.xml trunk/simexplorer-is/simexplorer-is-web/pom.xml Log: Maven version update Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-03-05 09:58:02 UTC (rev 1288) +++ trunk/simexplorer-is/pom.xml 2008-03-05 17:58:27 UTC (rev 1289) @@ -22,7 +22,7 @@ <packaging>pom</packaging>  - <version>0.0.1-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version>  <description>simexplorer is</description> @@ -95,6 +95,14 @@ http://lutinbuilder.labs.libre-entreprise.org/maven2 </url> </pluginRepository> + <pluginRepository> + <id>evolvis-release-repository</id> + <name>evolvis.org release repository</name> + <url>http://maven-repo.evolvis.org/releases</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> </pluginRepositories>  Modified: trunk/simexplorer-is/simexplorer-is-ear/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-ear/pom.xml 2008-03-05 09:58:02 UTC (rev 1288) +++ trunk/simexplorer-is/simexplorer-is-ear/pom.xml 2008-03-05 17:58:27 UTC (rev 1289) @@ -9,13 +9,13 @@ <name>EAR service</name> <packaging>ear</packaging> - <version>0.0.1-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> <description>simexplore-is ear module</description> <parent> <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> </parent> <build> @@ -60,27 +60,27 @@ <version>${tapestry.version}</version> </dependency> <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>t5c-commons</artifactId> - <version>0.5.10</version> + <groupId>de.hsofttec.t5components</groupId> + <artifactId>t5components</artifactId> + <version>0.5.6</version> </dependency> <dependency> <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is-service</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> <type>ejb</type> </dependency> <dependency> <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is-security</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> <type>ejb</type> </dependency> <dependency> <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is-web</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: trunk/simexplorer-is/simexplorer-is-entities/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/pom.xml 2008-03-05 09:58:02 UTC (rev 1288) +++ trunk/simexplorer-is/simexplorer-is-entities/pom.xml 2008-03-05 17:58:27 UTC (rev 1289) @@ -8,14 +8,14 @@ <artifactId>simexplorer-is-entities</artifactId> <name>Entities</name> - <version>0.0.1-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> <description>simexplorer-is entities module</description> <packaging>jar</packaging> <parent> <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> </parent> <profiles> Modified: trunk/simexplorer-is/simexplorer-is-security/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/pom.xml 2008-03-05 09:58:02 UTC (rev 1288) +++ trunk/simexplorer-is/simexplorer-is-security/pom.xml 2008-03-05 17:58:27 UTC (rev 1289) @@ -9,14 +9,14 @@ <artifactId>simexplorer-is-security</artifactId> <name>Security</name> - <version>0.0.1-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> <description>SimExplorer SI security module</description> <packaging>ejb</packaging> <parent> <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> </parent>  <dependency> Modified: trunk/simexplorer-is/simexplorer-is-swing-jaxx/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-jaxx/pom.xml 2008-03-05 09:58:02 UTC (rev 1288) +++ trunk/simexplorer-is/simexplorer-is-swing-jaxx/pom.xml 2008-03-05 17:58:27 UTC (rev 1289) @@ -8,14 +8,14 @@ <artifactId>simexplorer-is-swing-jaxx</artifactId> <name>Swing-jaxx</name> - <version>0.0.1-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> <description>Java Swing - jaxx UI for SimExplorer-is</description> <packaging>jar</packaging> <parent> <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> </parent> <profiles> Modified: trunk/simexplorer-is/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/pom.xml 2008-03-05 09:58:02 UTC (rev 1288) +++ trunk/simexplorer-is/simexplorer-is-web/pom.xml 2008-03-05 17:58:27 UTC (rev 1289) @@ -9,13 +9,13 @@ <name>Web</name> <packaging>war</packaging> - <version>0.0.1-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> <description>simexplorer-is web module</description> <parent> <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> </parent> <build> <plugins> @@ -91,7 +91,7 @@ <dependency> <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is-service</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>tapestry5-treegrid</groupId> @@ -114,9 +114,9 @@ <version>${tapestry.version}</version> </dependency> <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>t5c-commons</artifactId> - <version>0.5.10</version> + <groupId>de.hsofttec.t5components</groupId> + <artifactId>t5components</artifactId> + <version>0.5.6</version> </dependency> <dependency> <groupId>jboss</groupId>

1 0

r1288 - trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene
by glandais＠users.labs.libre-entreprise.org March 5, 2008

March 5, 2008

Author: glandais Date: 2008-03-05 09:58:02 +0000 (Wed, 05 Mar 2008) New Revision: 1288 Removed: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/BitSetFilter.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/BitSetHitCollector.java Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java Log: Security filtering with Lucene objects Deleted: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/BitSetFilter.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/BitSetFilter.java 2008-03-04 20:05:33 UTC (rev 1287) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/BitSetFilter.java 2008-03-05 09:58:02 UTC (rev 1288) @@ -1,52 +0,0 @@ -/* -* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais -* -* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package fr.cemagref.simexplorer.is.storage.database.lucene; - -import java.io.IOException; -import java.util.BitSet; - -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.search.Filter; - -/** - * The Class BitSetFilter. - */ -public class BitSetFilter extends Filter { - - /** The bit set. */ - private BitSet bitSet; - - /* (non-Javadoc) - * @see org.apache.lucene.search.Filter#bits(org.apache.lucene.index.IndexReader) - */ - @Override - public BitSet bits(IndexReader reader) throws IOException { - return bitSet; - } - - /** - * Instantiates a new bit set filter. - * - * @param bitSet the bit set - */ - public BitSetFilter(BitSet bitSet) { - super(); - this.bitSet = bitSet; - } - -} Deleted: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/BitSetHitCollector.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/BitSetHitCollector.java 2008-03-04 20:05:33 UTC (rev 1287) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/BitSetHitCollector.java 2008-03-05 09:58:02 UTC (rev 1288) @@ -1,49 +0,0 @@ -/* -* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais -* -* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package fr.cemagref.simexplorer.is.storage.database.lucene; - -import java.util.BitSet; - -import org.apache.lucene.search.HitCollector; - -/** - * The Class BitSetHitCollector. - */ -public class BitSetHitCollector extends HitCollector { - - /** The bits. */ - private BitSet bits = new BitSet(); - - /* (non-Javadoc) - * @see org.apache.lucene.search.HitCollector#collect(int, float) - */ - @Override - public void collect(int doc, float score) { - bits.set(doc); - } - - /** - * Gets the bits. - * - * @return the bits - */ - public BitSet getBits() { - return bits; - } - -} Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-03-04 20:05:33 UTC (rev 1287) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-03-05 09:58:02 UTC (rev 1288) @@ -22,7 +22,6 @@ import java.io.Reader; import java.io.StringReader; import java.util.ArrayList; -import java.util.BitSet; import java.util.Collection; import java.util.Date; import java.util.HashMap; @@ -37,7 +36,6 @@ import org.apache.lucene.analysis.KeywordAnalyzer; import org.apache.lucene.analysis.PerFieldAnalyzerWrapper; import org.apache.lucene.analysis.SimpleAnalyzer; -import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; @@ -47,10 +45,12 @@ import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; +import org.apache.lucene.search.CachingWrapperFilter; import org.apache.lucene.search.Filter; import org.apache.lucene.search.Hits; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; +import org.apache.lucene.search.QueryWrapperFilter; import org.apache.lucene.search.Searcher; import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; @@ -255,37 +255,36 @@ } /** - * Creates the bit set. + * Creates the query. * * @param visibleItems the visible items * - * @return the bit set - * - * @throws SimExplorerTechnicalException the sim explorer technical exception + * @return the query */ - private BitSet createBitSet(Collection<String> visibleItems) throws SimExplorerTechnicalException { + private Query createQuery(Collection<String> visibleItems) { + int maxTerms = BooleanQuery.getMaxClauseCount() - 1; + int i = 0; + boolean subQueryIsQuery = true; + BooleanQuery query = new BooleanQuery(); + + BooleanQuery subQuery = new BooleanQuery(); for (String string : visibleItems) { - query.add(new TermQuery(new Term(KEY_UUID, string)), BooleanClause.Occur.SHOULD); - } - - BitSetHitCollector bitSetHitCollector = new BitSetHitCollector(); - try { - // Get current searcher instance - Searcher searcher = getSearcher(); - try { - searcher.search(query, bitSetHitCollector); - } finally { - // Release searcher instance - releaseSearcher(searcher); + subQuery.add(new TermQuery(new Term(KEY_UUID, string)), BooleanClause.Occur.SHOULD); + if (i % maxTerms == 0) { + subQueryIsQuery = false; + query.add(new BooleanClause(subQuery, BooleanClause.Occur.SHOULD)); + subQuery = new BooleanQuery(); } - } catch (Exception e) { - throw new SimExplorerTechnicalException(e); + i++; } - - return bitSetHitCollector.getBits(); + + if (subQueryIsQuery) { + return subQuery; + } + return query; } - + /** * Creates the filter. * @@ -296,34 +295,10 @@ * @throws SimExplorerTechnicalException the sim explorer technical exception */ private Filter createFilter(Collection<String> visibleItems) throws SimExplorerTechnicalException { - List<BitSet> bitSets = new ArrayList<BitSet>(); - - int maxTerms = BooleanQuery.getMaxClauseCount(); - int i = 0; - - Collection<String> currentList = new ArrayList<String>(); - for (String uuid : visibleItems) { - currentList.add(uuid); - if (i == maxTerms) { - bitSets.add(createBitSet(currentList)); - currentList.clear(); - i = 0; - } else { - i++; - } - } - if (visibleItems.size() > 0 && i != 0) { - bitSets.add(createBitSet(currentList)); - } - - BitSet finalBitSet = new BitSet(); - for (BitSet bitSet : bitSets) { - finalBitSet.or(bitSet); - } - Filter result = new BitSetFilter(finalBitSet); - return result; + Filter filter = new CachingWrapperFilter(new QueryWrapperFilter(createQuery(visibleItems))); + return filter; } - + /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.storage.database.Database#open(boolean) */

1 0

r1287 - trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao
by glandais＠users.labs.libre-entreprise.org March 4, 2008

March 4, 2008

Author: glandais Date: 2008-03-04 20:05:33 +0000 (Tue, 04 Mar 2008) New Revision: 1287 Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java Log: Delete Actor Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2008-03-04 20:04:04 UTC (rev 1286) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2008-03-04 20:05:33 UTC (rev 1287) @@ -190,7 +190,7 @@ */ public User loginUser(String login, String passwordHash) { User user = (User) getSingleResult(em.createQuery( - "select u from User u where u.login=:login and u.passwordHash=:passwordHash").setParameter("login", + "select u from User u where u.login=:login and u.passwordHash=:passwordHash and u.visible = true").setParameter("login", login).setParameter("passwordHash", passwordHash)); return user; }

1 0

r1286 - in trunk/simexplorer-is: simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service src/site/fr/rst
by glandais＠users.labs.libre-entreprise.org March 4, 2008

March 4, 2008

Author: glandais Date: 2008-03-04 20:04:04 +0000 (Tue, 04 Mar 2008) New Revision: 1286 Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActor.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java trunk/simexplorer-is/src/site/fr/rst/todo.rst Log: Delete Actor Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActor.java 2008-03-04 18:25:34 UTC (rev 1285) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActor.java 2008-03-04 20:04:04 UTC (rev 1286) @@ -186,22 +186,6 @@ */ public List<User> getUsersOfGroup(Group group); - /** - * Gets the groups of user. - * - * @param user the user - * - * @return the groups of user - */ - public List<Group> getGroupsOfUser(User user); + public List<Group> getGroupsOfActor(Actor actor); - /** - * Gets the groups of group. - * - * @param group the group - * - * @return the groups of group - */ - public List<Group> getGroupsOfGroup(Group group); - } Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2008-03-04 18:25:34 UTC (rev 1285) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2008-03-04 20:04:04 UTC (rev 1286) @@ -25,14 +25,14 @@ import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import javax.persistence.Query; -import javax.persistence.TemporalType; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.codelutin.util.CollectionUtil; import fr.cemagref.simexplorer.is.security.entities.Actor; import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.security.entities.LoginAction; -import fr.cemagref.simexplorer.is.security.entities.Permission; import fr.cemagref.simexplorer.is.security.entities.User; /** @@ -41,6 +41,9 @@ @Stateless(name = "DaoActor") public class DaoActorImpl implements DaoActor { + /** The Constant log. */ + private static final Log log = LogFactory.getLog(DaoActorImpl.class); + /** The em. */ @PersistenceContext(unitName = "simexploreris-security") private EntityManager em; @@ -131,10 +134,15 @@ return a; } + private void setActorVisible(Actor actor) { + actor.setVisible(true); + } + /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#saveGroup(fr.cemagref.simexplorer.is.security.entities.Group) */ public void saveGroup(Group group) { + setActorVisible(group); em.persist(group); } @@ -142,6 +150,7 @@ * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#saveUser(fr.cemagref.simexplorer.is.security.entities.User) */ public void saveUser(User user) { + setActorVisible(user); em.persist(user); } @@ -149,6 +158,7 @@ * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#updateGroup(fr.cemagref.simexplorer.is.security.entities.Group) */ public Group updateGroup(Group group) { + setActorVisible(group); return em.merge(group); } @@ -156,6 +166,7 @@ * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#updateUser(fr.cemagref.simexplorer.is.security.entities.User) */ public User updateUser(User user) { + setActorVisible(user); return em.merge(user); } @@ -214,7 +225,7 @@ * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#getGroups() */ public List<Group> getGroups() { - List<Group> groups = CollectionUtil.toGenericList(em.createQuery("select g from Group g").getResultList(), + List<Group> groups = CollectionUtil.toGenericList(em.createQuery("select g from Group g where g.visible = true").getResultList(), Group.class); return groups; } @@ -223,7 +234,7 @@ * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#getGroupsOwnedBy(fr.cemagref.simexplorer.is.security.entities.User) */ public List<Group> getGroupsOwnedBy(User user) { - List<Group> groups = CollectionUtil.toGenericList(em.createQuery("select g from Group g where g.owner=:owner") + List<Group> groups = CollectionUtil.toGenericList(em.createQuery("select g from Group g where g.owner=:owner and g.visible = true") .setParameter("owner", user).getResultList(), Group.class); return groups; } @@ -232,7 +243,7 @@ * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#getUsers() */ public List<User> getUsers() { - List<User> users = CollectionUtil.toGenericList(em.createQuery("select u from User u").getResultList(), + List<User> users = CollectionUtil.toGenericList(em.createQuery("select u from User u where u.visible = true").getResultList(), User.class); return users; } @@ -242,29 +253,18 @@ */ public List<User> getUsersOfGroup(Group group) { List<User> users = CollectionUtil.toGenericList(em.createQuery( - "select distinct u from User u where :group member of u.groups").setParameter("group", group) + "select distinct u from User u where :group member of u.groups and u.visible = true").setParameter("group", group) .getResultList(), User.class); return users; } - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#getGroupsOfUser(fr.cemagref.simexplorer.is.security.entities.User) - */ - public List<Group> getGroupsOfUser(User user) { + public List<Group> getGroupsOfActor(Actor actor) { List<Group> groups = CollectionUtil.toGenericList(em.createQuery( - "select distinct u.groups from User u where u = :user").setParameter("user", user).getResultList(), - Group.class); - return groups; + "select distinct group from Actor actor join actor.groups as group where actor = :actor and group.visible = true") + .setParameter("actor", actor).getResultList(), + Group.class); + + return groups; } - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#getGroupsOfGroup(fr.cemagref.simexplorer.is.security.entities.Group) - */ - public List<Group> getGroupsOfGroup(Group group) { - List<Group> groups = CollectionUtil.toGenericList(em.createQuery( - "select distinct g.groups from Group g where g = :group").setParameter("group", group).getResultList(), - Group.class); - return groups; - } - } Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-03-04 18:25:34 UTC (rev 1285) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-03-04 20:04:04 UTC (rev 1286) @@ -720,7 +720,7 @@ */ public Group[] getGroupsOfUser(String token, User user) throws SimExplorerException { if (canViewElements(token)) { - List<Group> list = daoActor.getGroupsOfUser(user); + List<Group> list = daoActor.getGroupsOfActor(user); return list.toArray(new Group[list.size()]); } throw new SimExplorerSecurityException(); @@ -731,7 +731,7 @@ */ public Group[] getGroupsOfGroup(String token, Group group) throws SimExplorerException { if (canViewElements(token)) { - List<Group> groupsOfGroup = daoActor.getGroupsOfGroup(group); + List<Group> groupsOfGroup = daoActor.getGroupsOfActor(group); return groupsOfGroup.toArray(new Group[groupsOfGroup.size()]); } throw new SimExplorerSecurityException(); Modified: trunk/simexplorer-is/src/site/fr/rst/todo.rst =================================================================== --- trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-03-04 18:25:34 UTC (rev 1285) +++ trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-03-04 20:04:04 UTC (rev 1286) @@ -5,8 +5,7 @@ Serveur central =============== - - Règles de gestion pour la suppression d'un groupe/utilisateur (affichage selon flag) - - dump H2, backup, restore + - retour synchronisation récursif Client léger ============ @@ -23,6 +22,7 @@ - Synchronisation d'un élément avec le serveur (tests) - export, import (tests) - configuration + - API Fonctionnalités seconde réunion =============================== @@ -31,7 +31,6 @@ ------- - (NOK) Mettre à jour les entêtes de fichier avec la bonne licence GPL - - ( OK) Decouper les métadonnées en deux parties : celles propres à SimExplorer et celles propres au SI. - (NOK) Refondre les entités afin de les générer depuis un modèle et gérer la sérialisation par outils comme JAXB/XStream, ceci dans un module propre (et non inclu avec les autres classes storage) @@ -57,9 +56,10 @@ - Documentation utilisateur - Enoncer les règles métiers qui ont été développées dans un document - indépendant du code (pas du Javadoc) + indépendant du code - Documentation développeur - - Documentation intégration (backup, dumps, configuration) + - Documentation intégration (backup, dumps, configuration) + - Configuration log4j (hibernate, etc) Reste à faire (Autre) ===================== @@ -67,7 +67,6 @@ - Gestion des attachments transparente pour SimExplorer - Document format du fichier zip - Types de fichiers joints (uniquement texte pour le moment), visualisation? - - Changer les logs de jboss : hibernate est en debug par exemple... Règles modifiées ================

1 0