Author: glandais Date: 2007-12-28 16:00:25 +0000 (Fri, 28 Dec 2007) New Revision: 91 Added: trunk/simexplorer-is-web/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs trunk/simexplorer-is-web/.settings/org.eclipse.ltk.core.refactoring.prefs trunk/simexplorer-is-web/.settings/org.eclipse.wst.validation.prefs trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/beans/MetaData.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/components/ trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/components/Layout.properties trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/components/Layout.tml trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/components/Layout_fr.properties Removed: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Layout.java trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/pages/Layout.properties trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/pages/Layout_fr.properties trunk/simexplorer-is-web/src/webcontent/Layout.tml Modified: trunk/simexplorer-is-web/.classpath trunk/simexplorer-is-web/.project trunk/simexplorer-is-web/.settings/org.eclipse.jst.common.project.facet.core.prefs trunk/simexplorer-is-web/.settings/org.eclipse.wst.common.component trunk/simexplorer-is-web/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ApplicationDataSource.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationDetail.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationExport.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationList.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/StorageServiceFactory.java trunk/simexplorer-is-web/src/webcontent/ApplicationDetail.tml trunk/simexplorer-is-web/src/webcontent/ApplicationList.tml trunk/simexplorer-is-web/src/webcontent/WEB-INF/web.xml Log: Affichage des applications Modified: trunk/simexplorer-is-web/.classpath =================================================================== --- trunk/simexplorer-is-web/.classpath 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/.classpath 2007-12-28 16:00:25 UTC (rev 91) @@ -5,6 +5,10 @@ <classpathentry kind="src" path="src/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/simexplorer-is-storage"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"> + <attributes> + <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/simexplorer-is-web/.project =================================================================== --- trunk/simexplorer-is-web/.project 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/.project 2007-12-28 16:00:25 UTC (rev 91) @@ -3,6 +3,7 @@ <name>simexplorer-is-web</name> <comment>simexploreris web</comment> <projects> + <project>simexplorer-is-storage</project> </projects> <buildSpec> <buildCommand> Modified: trunk/simexplorer-is-web/.settings/org.eclipse.jst.common.project.facet.core.prefs =================================================================== --- trunk/simexplorer-is-web/.settings/org.eclipse.jst.common.project.facet.core.prefs 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/.settings/org.eclipse.jst.common.project.facet.core.prefs 2007-12-28 16:00:25 UTC (rev 91) @@ -1,4 +1,4 @@ #Wed Dec 19 15:57:55 CET 2007 classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:5.0 -classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.generic.runtimeTarget\:\:JBoss\ v4.2/owners=jst.web\:2.5 +classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.generic.runtimeTarget\:\:JBoss\ v4.2/owners=jst.web\:2.4 eclipse.preferences.version=1 Added: trunk/simexplorer-is-web/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs =================================================================== --- trunk/simexplorer-is-web/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs (rev 0) +++ trunk/simexplorer-is-web/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs 2007-12-28 16:00:25 UTC (rev 91) @@ -0,0 +1,6 @@ +#Fri Dec 28 15:20:02 CET 2007 +XDOCLETBUILDERACTIVE=true +XDOCLETHOME= +XDOCLETUSEGLOBAL=true +XDOCLETVERSION=1.2.1 +eclipse.preferences.version=1 Added: trunk/simexplorer-is-web/.settings/org.eclipse.ltk.core.refactoring.prefs =================================================================== --- trunk/simexplorer-is-web/.settings/org.eclipse.ltk.core.refactoring.prefs (rev 0) +++ trunk/simexplorer-is-web/.settings/org.eclipse.ltk.core.refactoring.prefs 2007-12-28 16:00:25 UTC (rev 91) @@ -0,0 +1,3 @@ +#Thu Dec 27 16:56:41 CET 2007 +eclipse.preferences.version=1 +org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false Modified: trunk/simexplorer-is-web/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/simexplorer-is-web/.settings/org.eclipse.wst.common.component 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/.settings/org.eclipse.wst.common.component 2007-12-28 16:00:25 UTC (rev 91) @@ -5,7 +5,10 @@ <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/gen/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/ressources"/> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/simexplorer-is-storage/simexplorer-is-storage"> + <dependency-type>uses</dependency-type> + </dependent-module> + <property name="java-output-path" value="build/classes"/> <property name="context-root" value="simexplorer-is"/> - <property name="java-output-path" value="build/classes"/> </wb-module> </project-modules> Modified: trunk/simexplorer-is-web/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/simexplorer-is-web/.settings/org.eclipse.wst.common.project.facet.core.xml 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/.settings/org.eclipse.wst.common.project.facet.core.xml 2007-12-28 16:00:25 UTC (rev 91) @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <faceted-project> <runtime name="JBoss v4.2"/> + <secondary-runtime name="Apache Tomcat v5.5"/> <fixed facet="jst.java"/> <fixed facet="jst.web"/> <installed facet="jst.java" version="5.0"/> - <installed facet="jst.web" version="2.5"/> + <installed facet="jst.web" version="2.4"/> </faceted-project> Added: trunk/simexplorer-is-web/.settings/org.eclipse.wst.validation.prefs =================================================================== --- trunk/simexplorer-is-web/.settings/org.eclipse.wst.validation.prefs (rev 0) +++ trunk/simexplorer-is-web/.settings/org.eclipse.wst.validation.prefs 2007-12-28 16:00:25 UTC (rev 91) @@ -0,0 +1,6 @@ +#Fri Dec 28 15:20:01 CET 2007 +DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator; +USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.jst.jsf.validation.internal.JSPSemanticsValidator;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator; +USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.jst.jsf.validation.internal.JSPSemanticsValidator;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator; +USER_PREFERENCE=overrideGlobalPreferencesfalse +eclipse.preferences.version=1 Added: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/beans/MetaData.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/beans/MetaData.java (rev 0) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/beans/MetaData.java 2007-12-28 16:00:25 UTC (rev 91) @@ -0,0 +1,53 @@ +package fr.cemagref.simexplorer.is.ui.web.beans; + +import java.util.Date; + +import fr.cemagref.simexplorer.is.storage.entities.metadata.MetaDataEntity; + +public class MetaData { + + private String uuid; + private String name; + private String version; + private Date creationDate; + + public void loadFromMetaDataEntity(MetaDataEntity mde) { + setUuid(mde.getUuid()); + setName(mde.getName()); + setVersion(mde.getVersion().toString()); + setCreationDate(mde.getCreationDate()); + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public Date getCreationDate() { + return creationDate; + } + + public void setCreationDate(Date creationDate) { + this.creationDate = creationDate; + } + +} Copied: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java (from rev 89, trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Layout.java) =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java (rev 0) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java 2007-12-28 16:00:25 UTC (rev 91) @@ -0,0 +1,123 @@ +/* *##% + * Copyright (C) 2006 Code Lutin + * + * 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.components; + +import java.util.Locale; + +import org.apache.tapestry.Asset; +import org.apache.tapestry.annotations.InjectPage; +import org.apache.tapestry.annotations.Parameter; +import org.apache.tapestry.annotations.Path; +import org.apache.tapestry.annotations.Service; +import org.apache.tapestry.ioc.annotations.Inject; +import org.apache.tapestry.services.PersistentLocale; + +import fr.cemagref.simexplorer.is.ui.web.pages.UserList; + +/** + * AbstractPage.java + * + * @author chatellier + * @version $Revision: 1.1 $ + * + * Last update : $Date: 2007/05/14 07:56:43 $ By : $Author: E023931M $ + */ +public class Layout { + + /* linked state "UserList" */ + @InjectPage + private UserList userList; + + /** + * page title + */ + @Parameter("defaulttitle") + private String title; + + @Inject + @Path("context:css/general.css") + private Asset _stylesheetGeneral; + + @Inject + @Path("context:css/layout.css") + private Asset _stylesheetLayout; + + @Inject + @Path("context:css/dftree.css") + private Asset stylesheetTree; + + public Layout() { + super(); + } + + /** + * @return the title + */ + public String getTitle() { + return title; + } + + /** + * Set default title + */ + void getDefaultTitle() { + title = ""; + } + + /** + * @return the _stylesheetGeneral + */ + public Asset getStylesheetGeneral() { + return _stylesheetGeneral; + } + + /** + * @return the _stylesheetLayout + */ + public Asset getStylesheetLayout() { + return _stylesheetLayout; + } + + @Inject + @Service("PersistentLocale") + private PersistentLocale persistentLocale; + + Object onActionFromSwitchLocaleFr() { + persistentLocale.set(new Locale("fr")); + return null; + } + + Object onActionFromSwitchLocaleEn() { + persistentLocale.set(new Locale("en")); + return null; + } + + Object onActionFromAdministration() { + return userList; + } + + public boolean getAdministrator() { + return true; + } + + public Asset getStylesheetTree() { + return stylesheetTree; + } + +} Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ApplicationDataSource.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ApplicationDataSource.java 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ApplicationDataSource.java 2007-12-28 16:00:25 UTC (rev 91) @@ -1,11 +1,15 @@ package fr.cemagref.simexplorer.is.ui.web.grid; +import java.util.List; + import javax.naming.NamingException; +import org.apache.tapestry.beaneditor.BeanModel; import org.apache.tapestry.beaneditor.PropertyModel; import org.apache.tapestry.grid.GridDataSource; import fr.cemagref.simexplorer.is.storage.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.ui.web.beans.MetaData; import fr.cemagref.simexplorer.is.ui.web.services.StorageServiceFactory; public class ApplicationDataSource implements GridDataSource { @@ -45,11 +49,13 @@ } public Class getRowType() { - return MetaDataEntity.class; + return MetaData.class; } public Object getRowValue(int index) { - return entities[index - indexStart]; + MetaData md = new MetaData(); + md.loadFromMetaDataEntity(entities[index - indexStart]); + return md; } public void prepare(int startIndex, int endIndex, PropertyModel sortModel, Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationDetail.java 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationDetail.java 2007-12-28 16:00:25 UTC (rev 91) @@ -1,12 +1,32 @@ package fr.cemagref.simexplorer.is.ui.web.pages; import org.apache.tapestry.annotations.Component; +import org.apache.tapestry.annotations.Persist; +import fr.cemagref.simexplorer.is.storage.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.ui.web.components.Layout; +import fr.cemagref.simexplorer.is.ui.web.services.StorageServiceFactory; + public class ApplicationDetail extends AbstractApplicationDetail { - /** layout */ - @SuppressWarnings("unused") - @Component - private Layout layout; + @Persist + private MetaDataEntity explorationApplication; + public void setup(String uuid, String version) throws Exception { + explorationApplication = StorageServiceFactory.getService() + .getMetadata(uuid, version); + } + + public MetaDataEntity getExplorationApplication() { + return explorationApplication; + } + + public void setExplorationApplication(MetaDataEntity explorationApplication) { + this.explorationApplication = explorationApplication; + } + + public String getMessage() { + return explorationApplication.getDescription(); + } + } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationExport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationExport.java 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationExport.java 2007-12-28 16:00:25 UTC (rev 91) @@ -2,11 +2,8 @@ import org.apache.tapestry.annotations.Component; +import fr.cemagref.simexplorer.is.ui.web.components.Layout; + public class ApplicationExport extends AbstractApplicationExport { - /** layout */ - @SuppressWarnings("unused") - @Component - private Layout layout; - } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.java 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.java 2007-12-28 16:00:25 UTC (rev 91) @@ -6,15 +6,11 @@ import com.healthmarketscience.rmiio.RemoteInputStreamServer; import com.healthmarketscience.rmiio.SimpleRemoteInputStream; +import fr.cemagref.simexplorer.is.ui.web.components.Layout; import fr.cemagref.simexplorer.is.ui.web.services.StorageServiceFactory; public class ApplicationImport extends AbstractApplicationImport { - /** layout */ - @SuppressWarnings("unused") - @Component - private Layout layout; - private UploadedFile fileEA; private UploadedFile fileLib; Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationList.java 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationList.java 2007-12-28 16:00:25 UTC (rev 91) @@ -1,30 +1,69 @@ package fr.cemagref.simexplorer.is.ui.web.pages; -import org.apache.tapestry.annotations.Component; +import java.util.List; +import java.util.StringTokenizer; + +import org.apache.tapestry.ComponentResources; +import org.apache.tapestry.annotations.InjectPage; +import org.apache.tapestry.annotations.Retain; +import org.apache.tapestry.beaneditor.BeanModel; import org.apache.tapestry.ioc.annotations.Inject; +import org.apache.tapestry.services.BeanModelSource; -import fr.cemagref.simexplorer.is.storage.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.ui.web.beans.MetaData; import fr.cemagref.simexplorer.is.ui.web.grid.ApplicationDataSource; public class ApplicationList extends AbstractApplicationList { - /** layout */ - @SuppressWarnings("unused") - @Component - private Layout layout; + @Retain + private BeanModel model; - private MetaDataEntity application; + @Inject + private BeanModelSource beanModelSource; + @Inject + private ComponentResources resources; + + private MetaData application; + + @InjectPage + private ApplicationDetail applicationDetail; + + void pageLoaded() { + model = beanModelSource.create(MetaData.class, true, resources); + List<String> properties = model.getPropertyNames(); + for (String property : properties) { + model.get(property).sortable(false); + } + } + + public BeanModel getModel() { + return model; + } + public ApplicationDataSource getApplications() { return new ApplicationDataSource(); } - public MetaDataEntity getApplication() { + public MetaData getApplication() { return application; } - public void setApplication(MetaDataEntity application) { + public void setApplication(MetaData application) { this.application = application; } + public String getDetailApplicationContext() { + String result = application.getUuid() + "," + application.getVersion(); + return result; + } + + public Object onActionFromDetailApplication(String context) throws Exception { + StringTokenizer st = new StringTokenizer(context, ","); + String uuid = st.nextToken(); + String version = st.nextToken(); + applicationDetail.setup(uuid, version); + return applicationDetail; + } + } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2007-12-28 16:00:25 UTC (rev 91) @@ -3,11 +3,9 @@ import org.apache.tapestry.annotations.Component; import org.apache.tapestry.annotations.Persist; +import fr.cemagref.simexplorer.is.ui.web.components.Layout; + public class GroupEdit extends AbstractGroupEdit { - /** layout */ - @SuppressWarnings("unused") - @Component - private Layout layout; @Persist private int groupId; Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2007-12-28 16:00:25 UTC (rev 91) @@ -2,10 +2,8 @@ import org.apache.tapestry.annotations.Component; +import fr.cemagref.simexplorer.is.ui.web.components.Layout; + public class GroupList extends AbstractGroupList { - /** layout */ - @SuppressWarnings("unused") - @Component - private Layout layout; } Deleted: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Layout.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Layout.java 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Layout.java 2007-12-28 16:00:25 UTC (rev 91) @@ -1,129 +0,0 @@ -/* *##% - * Copyright (C) 2006 Code Lutin - * - * 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.pages; - -import java.util.Locale; - -import org.apache.tapestry.Asset; -import org.apache.tapestry.annotations.InjectPage; -import org.apache.tapestry.annotations.Parameter; -import org.apache.tapestry.annotations.Path; -import org.apache.tapestry.annotations.Service; -import org.apache.tapestry.ioc.annotations.Inject; -import org.apache.tapestry.services.PersistentLocale; - -/** - * AbstractPage.java - * - * @author chatellier - * @version $Revision: 1.1 $ - * - * Last update : $Date: 2007/05/14 07:56:43 $ By : $Author: E023931M $ - */ -public class Layout { - - /* linked state "UserList" */ - @InjectPage - private UserList userList; - - /** - * page title - */ - @Parameter("defaulttitle") - private String title; - - @Inject - @Path("context:css/general.css") - private Asset _stylesheetGeneral; - - @Inject - @Path("context:css/layout.css") - private Asset _stylesheetLayout; - - @Inject - @Path("context:css/dftree.css") - private Asset stylesheetTree; - - @Inject - @Path("context:js/dftree.js") - private Asset javascriptTree; - - /** - * @return the title - */ - public String getTitle() { - return title; - } - - /** - * Set default title - */ - void getDefaultTitle() { - title = ""; - } - - /** - * @return the _stylesheetGeneral - */ - public Asset getStylesheetGeneral() { - return _stylesheetGeneral; - } - - /** - * @return the _stylesheetLayout - */ - public Asset getStylesheetLayout() { - return _stylesheetLayout; - } - - @Inject - @Service("PersistentLocale") - private PersistentLocale persistentLocale; - - Object onActionFromSwitchLocaleFr() { - persistentLocale.set(new Locale("fr")); - return null; - } - - Object onActionFromSwitchLocaleEn() { - persistentLocale.set(new Locale("en")); - return null; - } - - Object onActionFromAdministration() { - return userList; - } - - public boolean getAdministrator() { - return true; - } - - public Asset getStylesheetTree() { - return stylesheetTree; - } - - public Asset getJavascriptTree() { - return javascriptTree; - } - - public String getJavascriptFolder() { - return javascriptTree.toClientURL().replace("dftree.js", ""); - } - -} Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2007-12-28 16:00:25 UTC (rev 91) @@ -3,11 +3,9 @@ import org.apache.tapestry.annotations.Component; import org.apache.tapestry.annotations.Persist; +import fr.cemagref.simexplorer.is.ui.web.components.Layout; + public class UserEdit extends AbstractUserEdit { - /** layout */ - @SuppressWarnings("unused") - @Component - private Layout layout; @Persist private int userId; Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2007-12-28 16:00:25 UTC (rev 91) @@ -2,10 +2,8 @@ import org.apache.tapestry.annotations.Component; +import fr.cemagref.simexplorer.is.ui.web.components.Layout; + public class UserList extends AbstractUserList { - /** layout */ - @SuppressWarnings("unused") - @Component - private Layout layout; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/StorageServiceFactory.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/StorageServiceFactory.java 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/StorageServiceFactory.java 2007-12-28 16:00:25 UTC (rev 91) @@ -1,5 +1,8 @@ package fr.cemagref.simexplorer.is.ui.web.services; +import java.util.Properties; +import java.util.Map.Entry; + import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; @@ -12,7 +15,14 @@ public static StorageService getService() throws NamingException { if (serviceProjets == null) { - Context context = new InitialContext(System.getProperties()); + Properties properties = (Properties) System.getProperties().clone(); + properties.put("java.naming.provider.url", "jnp://localhost:1099"); + properties.put("java.naming.factory.initial", + "org.jnp.interfaces.NamingContextFactory"); + properties + .put("java.naming.factory.url.pkgs", "org.jnp.interfaces"); + + Context context = new InitialContext(properties); serviceProjets = (StorageService) context .lookup("ejb3/StorageService"); } Copied: trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/components/Layout.properties (from rev 89, trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/pages/Layout.properties) =================================================================== --- trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/components/Layout.properties (rev 0) +++ trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/components/Layout.properties 2007-12-28 16:00:25 UTC (rev 91) @@ -0,0 +1,22 @@ +abstractpage-windowtitle=Simexplorer SI +abstractpage-pagetitle=Simexplorer SI + +abstractpage-menutitle=Menu +abstractpage-menusubtitle1=Application Menu +abstractpage-menuitem1-1=List +abstractpage-menuitem1-2=Import + +abstractpage-menusubtitle2=Administration Menu +abstractpage-menuitem2-1=User list +abstractpage-menuitem2-2=Add user +abstractpage-menuitem2-3=Group list +abstractpage-menuitem2-4=Add group + +abstractpage-tip=Change your navigator language to see this website in another language. + +abstractpage-localeen=English +abstractpage-localefr=Français + +abstractpage-administration=Administration + +abstractpage-copyright=Copyright © 2007. Code Lutin - GPL Copied: trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/components/Layout.tml (from rev 89, trunk/simexplorer-is-web/src/webcontent/Layout.tml) =================================================================== --- trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/components/Layout.tml (rev 0) +++ trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/components/Layout.tml 2007-12-28 16:00:25 UTC (rev 91) @@ -0,0 +1,62 @@ +<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"> + <head> + <title>${title}</title> + <link rel="stylesheet" type="text/css" href="${prop:stylesheetGeneral}" /> + <link rel="stylesheet" type="text/css" href="${prop:stylesheetLayout}" /> + <link rel="stylesheet" type="text/css" href="${prop:stylesheetTree}" /> + + </head> + + <body> + + <!-- titre --> + <h1 id="Title">${message:abstractpage-pagetitle}</h1> + + <!-- barre --> + <div id="Header"> + <div class="Left"> + [<a t:type="actionlink" t:id="switchLocaleEn">${message:abstractpage-localeen}</a>] + - + [<a t:type="actionlink" t:id="switchLocaleFr">${message:abstractpage-localefr}</a>] + </div> + <div class="Right"> + <!-- + <t:if test="administrator"> + <a t:type="actionlink" t:id="administration">${message:abstractpage-administration}</a> + </t:if> + --> + </div> + + </div> + + <div id="Menu" class=""> + <!-- menu --> + <h1 class="tab">${message:abstractpage-menutitle}</h1> + <div id="tabMenu"> + + <h2 class="Title">${message:abstractpage-menusubtitle1}</h2> + <menu class="menu"> + <li><t:pagelink page="ApplicationList">${message:abstractpage-menuitem1-1}</t:pagelink></li> + <li><t:pagelink page="ApplicationImport">${message:abstractpage-menuitem1-2}</t:pagelink></li> + </menu> + + <!-- h2 class="Title">${message:abstractpage-menusubtitle2}</h2> + <menu class="menu"> + <li><t:pagelink page="UserList">${message:abstractpage-menuitem2-1}</t:pagelink></li> + <li><t:pagelink page="UserEdit" context="-1">${message:abstractpage-menuitem2-2}</t:pagelink></li> + <li><t:pagelink page="GroupList">${message:abstractpage-menuitem2-3}</t:pagelink></li> + <li><t:pagelink page="GroupEdit" context="-1">${message:abstractpage-menuitem2-4}</t:pagelink></li> + </menu --> + + </div> + </div> + + <div id="Content"> + <!-- main template here --> + <t:body/> + </div> + + <div id="FooterAdd">${message:abstractpage-copyright} + </div> + </body> +</html> \ No newline at end of file Copied: trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/components/Layout_fr.properties (from rev 89, trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/pages/Layout_fr.properties) =================================================================== --- trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/components/Layout_fr.properties (rev 0) +++ trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/components/Layout_fr.properties 2007-12-28 16:00:25 UTC (rev 91) @@ -0,0 +1,22 @@ +abstractpage-windowtitle=Simexplorer SI +abstractpage-pagetitle=Simexplorer SI + +abstractpage-menutitle=Menu +abstractpage-menusubtitle1=Application Menu +abstractpage-menuitem1-1=List +abstractpage-menuitem1-2=Import + +abstractpage-menusubtitle2=Administration Menu +abstractpage-menuitem2-1=User list +abstractpage-menuitem2-2=Add user +abstractpage-menuitem2-3=Group list +abstractpage-menuitem2-4=Add group + +abstractpage-tip=Change your navigator language to see this website in another language. + +abstractpage-localeen=English +abstractpage-localefr=Français + +abstractpage-administration=Administration + +abstractpage-copyright=Copyright © 2007. Code Lutin - GPL Deleted: trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/pages/Layout.properties =================================================================== --- trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/pages/Layout.properties 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/pages/Layout.properties 2007-12-28 16:00:25 UTC (rev 91) @@ -1,22 +0,0 @@ -abstractpage-windowtitle=Simexplorer SI -abstractpage-pagetitle=Simexplorer SI - -abstractpage-menutitle=Menu -abstractpage-menusubtitle1=Application Menu -abstractpage-menuitem1-1=List -abstractpage-menuitem1-2=Import - -abstractpage-menusubtitle2=Administration Menu -abstractpage-menuitem2-1=User list -abstractpage-menuitem2-2=Add user -abstractpage-menuitem2-3=Group list -abstractpage-menuitem2-4=Add group - -abstractpage-tip=Change your navigator language to see this website in another language. - -abstractpage-localeen=English -abstractpage-localefr=Français - -abstractpage-administration=Administration - -abstractpage-copyright=Copyright © 2007. Code Lutin - GPL Deleted: trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/pages/Layout_fr.properties =================================================================== --- trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/pages/Layout_fr.properties 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/src/ressources/fr/cemagref/simexplorer/is/ui/web/pages/Layout_fr.properties 2007-12-28 16:00:25 UTC (rev 91) @@ -1,22 +0,0 @@ -abstractpage-windowtitle=Simexplorer SI -abstractpage-pagetitle=Simexplorer SI - -abstractpage-menutitle=Menu -abstractpage-menusubtitle1=Application Menu -abstractpage-menuitem1-1=List -abstractpage-menuitem1-2=Import - -abstractpage-menusubtitle2=Administration Menu -abstractpage-menuitem2-1=User list -abstractpage-menuitem2-2=Add user -abstractpage-menuitem2-3=Group list -abstractpage-menuitem2-4=Add group - -abstractpage-tip=Change your navigator language to see this website in another language. - -abstractpage-localeen=English -abstractpage-localefr=Français - -abstractpage-administration=Administration - -abstractpage-copyright=Copyright © 2007. Code Lutin - GPL Modified: trunk/simexplorer-is-web/src/webcontent/ApplicationDetail.tml =================================================================== --- trunk/simexplorer-is-web/src/webcontent/ApplicationDetail.tml 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/src/webcontent/ApplicationDetail.tml 2007-12-28 16:00:25 UTC (rev 91) @@ -1,4 +1,6 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" title="message:windowtitle"> - + + <strong>${message}</strong> + </t:layout> Modified: trunk/simexplorer-is-web/src/webcontent/ApplicationList.tml =================================================================== --- trunk/simexplorer-is-web/src/webcontent/ApplicationList.tml 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/src/webcontent/ApplicationList.tml 2007-12-28 16:00:25 UTC (rev 91) @@ -1,14 +1,10 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" title="message:windowtitle"> - <table t:type="Grid" source="applications" row="application"> - <t:parameter name="uuidCell"> - ${application.uuid} - </t:parameter> + <table t:type="Grid" source="applications" row="application" model="model"> + <t:parameter name="uuidCell"> + <t:actionlink t:id="detailApplication" context="${detailApplicationContext}">Details</t:actionlink> + </t:parameter> </table> - <a t:type="ActionLink" t:id="edit">Details</a> - <a t:type="ActionLink" t:id="create">Create</a> - <a t:type="ActionLink" t:id="delete">Delete</a> - </t:layout> Deleted: trunk/simexplorer-is-web/src/webcontent/Layout.tml =================================================================== --- trunk/simexplorer-is-web/src/webcontent/Layout.tml 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/src/webcontent/Layout.tml 2007-12-28 16:00:25 UTC (rev 91) @@ -1,66 +0,0 @@ -<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"> - <head> - <title>${title}</title> - <link rel="stylesheet" type="text/css" href="${prop:stylesheetGeneral}" /> - <link rel="stylesheet" type="text/css" href="${prop:stylesheetLayout}" /> - <link rel="stylesheet" type="text/css" href="${prop:stylesheetTree}" /> - <script type="text/javascript" src="${prop:javascriptTree}"></script> - <script type="text/javascript" src="${prop:javascriptFolder}treeLoader.js"></script> - <script type="text/javascript" src="${prop:javascriptFolder}dwr/engine.js"></script> - <script type="text/javascript" src="${prop:javascriptFolder}dwr/interface/TreeData.js"></script> - - </head> - - <body> - - <!-- titre --> - <h1 id="Title">${message:abstractpage-pagetitle}</h1> - - <!-- barre --> - <div id="Header"> - <div class="Left"> - [<a t:type="actionlink" t:id="switchLocaleEn">${message:abstractpage-localeen}</a>] - - - [<a t:type="actionlink" t:id="switchLocaleFr">${message:abstractpage-localefr}</a>] - </div> - <div class="Right"> - <!-- - <t:if test="administrator"> - <a t:type="actionlink" t:id="administration">${message:abstractpage-administration}</a> - </t:if> - --> - </div> - - </div> - - <div id="Menu" class=""> - <!-- menu --> - <h1 class="tab">${message:abstractpage-menutitle}</h1> - <div id="tabMenu"> - - <h2 class="Title">${message:abstractpage-menusubtitle1}</h2> - <menu class="menu"> - <li><t:pagelink page="ApplicationList">${message:abstractpage-menuitem1-1}</t:pagelink></li> - <li><t:pagelink page="ApplicationImport">${message:abstractpage-menuitem1-2}</t:pagelink></li> - </menu> - - <h2 class="Title">${message:abstractpage-menusubtitle2}</h2> - <menu class="menu"> - <li><t:pagelink page="UserList">${message:abstractpage-menuitem2-1}</t:pagelink></li> - <li><t:pagelink page="UserEdit" context="-1">${message:abstractpage-menuitem2-2}</t:pagelink></li> - <li><t:pagelink page="GroupList">${message:abstractpage-menuitem2-3}</t:pagelink></li> - <li><t:pagelink page="GroupEdit" context="-1">${message:abstractpage-menuitem2-4}</t:pagelink></li> - </menu> - - </div> - </div> - - <div id="Content"> - <!-- main template here --> - <t:body/> - </div> - - <div id="FooterAdd">${message:abstractpage-copyright} - </div> - </body> -</html> \ No newline at end of file Modified: trunk/simexplorer-is-web/src/webcontent/WEB-INF/web.xml =================================================================== --- trunk/simexplorer-is-web/src/webcontent/WEB-INF/web.xml 2007-12-28 15:57:46 UTC (rev 90) +++ trunk/simexplorer-is-web/src/webcontent/WEB-INF/web.xml 2007-12-28 16:00:25 UTC (rev 91) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - id="WebApp_ID" version="2.5"> + xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_4.xsd" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_4.xsd" + id="WebApp_ID" version="2.4"> <display-name>simexplorer-is-web</display-name>