Changeset 423

Timestamp:

03/19/12 19:03:09 (12 years ago)

Author:

vmipsl

Message:

properties webmaster
dataProtocol

Location:

tapas

Files:

• common/implementation/com/ether/EtherHelper.java (modified) (1 diff)
• web/resources/jsp/dataProtocol_en.jsp (modified) (1 diff)
• web/resources/jsp/dataProtocol_fr.jsp (modified) (1 diff)
• web/resources/templates/templateBackoffice_script.jsp (modified) (1 diff)
• web/resources/templates/templateEther_script.jsp (modified) (1 diff)
• web/src/com/ether/ControllerEponge.java (modified) (2 diffs)
• web/src/com/ether/ControllerEther.java (modified) (4 diffs)
• web/src/com/ether/WebHelper.java (modified) (3 diffs)
• web/src/tapas.properties (modified) (1 diff)

tapas/common/implementation/com/ether/EtherHelper.java

@@ -82 +82 @@
     }
 
-    // TODO : supprimer cette méthode et utiliser JSON pour récupérer pIdPIdList
-    @Nullable
-    public static <T1 extends Object, T2 extends Object> List<Pair<T1, T2>> extractpfIdPIdListFromString( @NotNull final String pfIdPIdArrayString, @NotNull final Class<T1> T1Class, @NotNull final Class<T2> T2Class )
-    {
-        if( pfIdPIdArrayString.isEmpty() )
-            return null;
-
-        final String[] pfIDPIdArray = pfIdPIdArrayString.split( "," );
-        final List<Pair<T1, T2>> pfIdPIdList = new ArrayList<Pair<T1, T2>>( pfIDPIdArray.length );
-        for( final String pfIdPId : pfIDPIdArray )
-        {
-            final String[] pfIdPIdSplit = pfIdPId.split( "-" );
-            final Pair<T1, T2> pfIdPIdPair = new Pair<T1, T2>();
-            if( T1Class.equals( String.class ) )
-                pfIdPIdPair.setFirstValue( (T1) pfIdPIdSplit[0] );
-            else
-                pfIdPIdPair.setFirstValue( (T1) Integer.valueOf( pfIdPIdSplit[0] ) );
-
-            if( T2Class.equals( String.class ) )
-                pfIdPIdPair.setSecondValue( (T2) pfIdPIdSplit[1] );
-            else
-                pfIdPIdPair.setSecondValue( (T2) Integer.valueOf( pfIdPIdSplit[1] ) );
-            pfIdPIdList.add( pfIdPIdPair );
-        }
-        return pfIdPIdList;
-    }
-
     /**
      * This method writes the text into the file filePath

tapas/web/resources/jsp/dataProtocol_en.jsp

@@ -3 +3 @@
 qsdkmqldksfsdjfkl
 <BR/>
-<a href="project?methodName=downloadFileDataProtocol">
+<a href="project?methodName=downloadFileDataProtocolEn">
     <button class="dataProtocolDownloadButton">Download</button>
 </a>

tapas/web/resources/jsp/dataProtocol_fr.jsp

@@ -3 +3 @@
 qsdkmqldksfsdjfkl
 <BR/>
-<a href="project?methodName=downloadFileDataProtocol">
+<a href="project?methodName=downloadFileDataProtocolFr">
     <button class="dataProtocolDownloadButton">Télécharger</button>
 </a>

tapas/web/resources/templates/templateBackoffice_script.jsp

@@ -13 +13 @@
 
             /** *********** VARIABLES *********** **/
-            this.webmaster = "rboipsl@ipsl.jussieu.fr";
+            this.webmaster = <%=WebHelper.getProperty(request, "mail.webmaster")%>;
             this.jSONUser = <%=WebHelper.getJSONUser( request )%> ? <%=WebHelper.getJSONUser( request )%> : false;
 

tapas/web/resources/templates/templateEther_script.jsp

@@ -13 +13 @@
 
             /** *********** VARIABLES *********** **/
-            // TODO : vérifier cette adresse de webmaster !!!!
             this.language = '<spring:message code="language"/>';
-            this.webmaster = "rboipsl@ipsl.jussieu.fr";
+            this.webmaster = <%=WebHelper.getProperty(request, "mail.webmaster")%>;
             this.jSONUser = <%=WebHelper.getJSONUser( request )%> ? <%=WebHelper.getJSONUser( request )%> : false;
 

tapas/web/src/com/ether/ControllerEponge.java

@@ -199 +199 @@
 
     @ControllerMethod(downloadFile = DOWNLOAD_DATA_PROTOCOL_EN)
-    public void downloadFileDataProtocol()
+    public void downloadFileDataProtocolEn()
+    {
+    }
+
+    @ControllerMethod(downloadFile = DOWNLOAD_DATA_PROTOCOL_FR)
+    public void downloadFileDataProtocolFr()
     {
     }
@@ -207 +212 @@
     private static final String VIEW_INIT = "init";
     private static final String VIEW_DATA_PROTOCOL_EN = "project/home_dataProtocol_en";
+    // TODO : mettre les bons fichiers de Dataprotocol
     private static final String DOWNLOAD_DATA_PROTOCOL_EN = "bib.txt";
+    private static final String DOWNLOAD_DATA_PROTOCOL_FR = "bib.txt";
 }

tapas/web/src/com/ether/ControllerEther.java

@@ -39 +39 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 public class ControllerEther
@@ -56 +55 @@
 
     /**
+     * This method returns a property writed in the properties file
+     *
      * @return
      * @throws WebException
@@ -65 +66 @@
         {
             final String webInfPath = getServletContext().getRealPath( "WEB-INF" );
-            final Properties prop = new Properties();
-            prop.load( new FileInputStream( webInfPath + "/classes/tapas.properties" ) );
-            return prop.getProperty( property );
+            return WebHelper.getProperty( webInfPath, property );
         }
         catch( IOException e )
@@ -172 +171 @@
                 return null;
             }
-            // TODO : mettre le downloadPath en properties
             else if( null != methodDescription.getDownloadFile() && !"".equals( methodDescription.getDownloadFile() ) )
             {
                 final String fileName = methodDescription.getDownloadFile();
-                final String downloadPath = "/home_local/";
+                final String downloadPath = getProperty( "downloadPath" );
 
                 response.setContentType( "multipart/zip" );

tapas/web/src/com/ether/WebHelper.java

@@ -12 +12 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.security.InvalidParameterException;
+import java.util.Properties;
 
 public final class WebHelper
@@ -90 +92 @@
     }
 
+    /**
+     * Returns the property writed in the properties file
+     *
+     * @param request
+     * @param property
+     * @return
+     * @throws WebException
+     */
+    public static String getProperty( @NotNull final HttpServletRequest request, @NotNull final String property )
+            throws WebException
+    {
+        try
+        {
+            final String webInfPath = request.getSession().getServletContext().getRealPath( "WEB-INF" );
+            return getProperty( webInfPath, property );
+        }
+        catch( IOException e )
+        {
+            throw new WebException( WebException.WebCode.ERROR_TO_READ_FILE_PROPERTIES, e );
+        }
+    }
+
+    /**
+     * Returns the property writed in the properties file
+     *
+     * @param webInfPath
+     * @param property
+     * @return
+     * @throws IOException
+     */
+    public static String getProperty( @NotNull final String webInfPath, @NotNull final String property )
+            throws IOException
+    {
+        final Properties prop = new Properties();
+        prop.load( new FileInputStream( webInfPath + "/classes/" + PROPERTIES_FILE ) );
+        return prop.getProperty( property );
+    }
 
     private static final Log LOGGER = LogFactory.getLog( WebHelper.class );
@@ -95 +134 @@
     public static final int STATUS_CODE_SERVICE_EXCEPTION = 500;
     private static final String CONTENT_TYPE_TEXT_JSON = "text/javascript;charset=" + UTF8Charset.getEncoding();
+    private static final String PROPERTIES_FILE = "tapas.properties";
 }

tapas/web/src/tapas.properties

@@ -1 +1 @@
 mail.host=mailhost.ipsl.jussieu.fr
 mail.webmaster=rboipsl@ipsl.jussieu.fr
+downloadPath=/home_local/