Changeset 784 for tapas/web

Timestamp:

05/07/14 15:28:22 (10 years ago)

Author:

cbipsl

Message:

tapas.properties
Correction fichiers .js

Location:

tapas/web

Files:

• project/formTapas.jsp (modified) (1 diff)
• project/formTapas_script.jsp (modified) (1 diff)
• resources/tapas.properties (added)
• resources/templates/templateEther.jsp (modified) (1 diff)
• src/com/ether/Controller.java (modified) (3 diffs)
• src/com/ether/WebHelper.java (modified) (2 diffs)

tapas/web/project/formTapas.jsp

@@ -21 +21 @@
     <tiles:put name="insertJsOrJsp" type="string">
         <ether:htmlJs jsFile="library/jquery.json-2.3"/>
-        <ether:htmlJs jsFile="library/js/jquery-ui-1.8.16.custom.min.js"/>
+        <ether:htmlJs jsFile="library/jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min"/>
         <!--<script src="js/library/jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min.js"></script>-->
         <ether:htmlJs jsFile="classesForJQuery/Select"/>

tapas/web/project/formTapas_script.jsp

@@ -1 @@
-<script src="js/library/jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min.js"></script>
+<%--<script src="js/library/jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min.js"></script>--%>
 <script type="text/javascript">
 

tapas/web/resources/templates/templateEther.jsp

@@ -34 +34 @@
     <ether:htmlJs jsFile="TwitterLogin/javascripts/jquery.tipsy"/>
     <ether:htmlJs jsFile="library/jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min"/>
-    <ether:htmlJs jsFile="apycom.com-8-orange-rued/menu"/>
+    <ether:htmlJs jsFile="apycom.com-8-orange-red/menu"/>
     <jsp:include page="templateEther_script.jsp"/>
 

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

@@ -13 +13 @@
 import org.jetbrains.annotations.NotNull;
 
+import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -75 +78 @@
     //@ControllerMethod(jsonResult = true, userMandatory = false, defaultView = VIEW_INDEX)
     public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas, @NotNull final User user )
-    //public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas )
             throws WebException
     {
-
-        /***********/
-        /*    final User user = new User();
-      user.setId( 12 );
-      user.setLastName( "tamere" );
-      user.setEmail( "rbopipsl@ipsl.jussieu.fr" );
-      user.setCreationDate( new Date() );
-      user.setPassword( "pif" );*/
-        /******/
 
         if( null == javaTapas )
@@ -92 +85 @@
 
         final Properties prop = new Properties();
-        try
-        {
-            prop.load( new FileInputStream( "tapas.properties" ) );
+        final File propertiesFile = new File(WebHelper.PROPERTIES_FILE_PATH + WebHelper.PROPERTIES_FILE);
+        try
+        {
+            final InputStream is = new FileInputStream(propertiesFile);
+            prop.load( is );
+        }
+        catch( FileNotFoundException e )
+        {
+            throw new WebException( ServiceException.ServiceCode.PROPERTIES_FILE_NOT_FOUND, e );
         }
         catch( IOException e )

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

@@ -110 +110 @@
         try
         {
-            final String webInfPath = request.getSession().getServletContext().getRealPath( "WEB-INF" );
-            return getProperty( webInfPath + "/classes/", PROPERTIES_FILE, property );
+//            final String webInfPath = request.getSession().getServletContext().getRealPath( "WEB-INF" );
+//            return getProperty( webInfPath + "/classes/", PROPERTIES_FILE, property );
+            return getProperty( PROPERTIES_FILE_PATH, PROPERTIES_FILE, property );
         }
         catch( IOException e )
@@ -177 +178 @@
     public static final int STATUS_CODE_SERVICE_EXCEPTION = 500;
     public static final String PROPERTIES_FILE = "tapas.properties";
+    public static final String PROPERTIES_FILE_PATH = "/usr/local/apache-tomcat-6.0.18/conf/";
 
     private static final Log LOGGER = LogFactory.getLog( WebHelper.class );