Changeset 784
- Timestamp:
- 05/07/14 15:28:22 (10 years ago)
- Location:
- tapas/web
- Files:
-
- 1 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
tapas/web/project/formTapas.jsp
r779 r784 21 21 <tiles:put name="insertJsOrJsp" type="string"> 22 22 <ether:htmlJs jsFile="library/jquery.json-2.3"/> 23 <ether:htmlJs jsFile="library/j s/jquery-ui-1.8.16.custom.min.js"/>23 <ether:htmlJs jsFile="library/jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min"/> 24 24 <!--<script src="js/library/jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min.js"></script>--> 25 25 <ether:htmlJs jsFile="classesForJQuery/Select"/> -
tapas/web/project/formTapas_script.jsp
r783 r784 1 < script src="js/library/jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min.js"></script>1 <%--<script src="js/library/jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min.js"></script>--%> 2 2 <script type="text/javascript"> 3 3 -
tapas/web/resources/templates/templateEther.jsp
r783 r784 34 34 <ether:htmlJs jsFile="TwitterLogin/javascripts/jquery.tipsy"/> 35 35 <ether:htmlJs jsFile="library/jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min"/> 36 <ether:htmlJs jsFile="apycom.com-8-orange-r ued/menu"/>36 <ether:htmlJs jsFile="apycom.com-8-orange-red/menu"/> 37 37 <jsp:include page="templateEther_script.jsp"/> 38 38 -
tapas/web/src/com/ether/Controller.java
r779 r784 13 13 import org.jetbrains.annotations.NotNull; 14 14 15 import java.io.File; 15 16 import java.io.FileInputStream; 17 import java.io.FileNotFoundException; 16 18 import java.io.IOException; 19 import java.io.InputStream; 17 20 import java.util.ArrayList; 18 21 import java.util.List; … … 75 78 //@ControllerMethod(jsonResult = true, userMandatory = false, defaultView = VIEW_INDEX) 76 79 public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas, @NotNull final User user ) 77 //public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas )78 80 throws WebException 79 81 { 80 81 /***********/82 /* final User user = new User();83 user.setId( 12 );84 user.setLastName( "tamere" );85 user.setEmail( "rbopipsl@ipsl.jussieu.fr" );86 user.setCreationDate( new Date() );87 user.setPassword( "pif" );*/88 /******/89 82 90 83 if( null == javaTapas ) … … 92 85 93 86 final Properties prop = new Properties(); 94 try 95 { 96 prop.load( new FileInputStream( "tapas.properties" ) ); 87 final File propertiesFile = new File(WebHelper.PROPERTIES_FILE_PATH + WebHelper.PROPERTIES_FILE); 88 try 89 { 90 final InputStream is = new FileInputStream(propertiesFile); 91 prop.load( is ); 92 } 93 catch( FileNotFoundException e ) 94 { 95 throw new WebException( ServiceException.ServiceCode.PROPERTIES_FILE_NOT_FOUND, e ); 97 96 } 98 97 catch( IOException e ) -
tapas/web/src/com/ether/WebHelper.java
r767 r784 110 110 try 111 111 { 112 final String webInfPath = request.getSession().getServletContext().getRealPath( "WEB-INF" ); 113 return getProperty( webInfPath + "/classes/", PROPERTIES_FILE, property ); 112 // final String webInfPath = request.getSession().getServletContext().getRealPath( "WEB-INF" ); 113 // return getProperty( webInfPath + "/classes/", PROPERTIES_FILE, property ); 114 return getProperty( PROPERTIES_FILE_PATH, PROPERTIES_FILE, property ); 114 115 } 115 116 catch( IOException e ) … … 177 178 public static final int STATUS_CODE_SERVICE_EXCEPTION = 500; 178 179 public static final String PROPERTIES_FILE = "tapas.properties"; 180 public static final String PROPERTIES_FILE_PATH = "/usr/local/apache-tomcat-6.0.18/conf/"; 179 181 180 182 private static final Log LOGGER = LogFactory.getLog( WebHelper.class );
Note: See TracChangeset
for help on using the changeset viewer.