Changeset 118
- Timestamp:
- 06/17/11 20:21:09 (13 years ago)
- Location:
- project_source/trunk
- Files:
-
- 2 added
- 9 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
project_source/trunk/Project_source.ipr
r95 r118 2231 2231 <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK"> 2232 2232 <output url="file://$PROJECT_DIR$/out" /> 2233 </component> 2234 <component name="ProjectRunConfigurationManager"> 2235 <configuration default="false" name="Tomcat 6" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 6"> 2236 <option name="OPEN_IN_BROWSER" value="false" /> 2237 <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/" /> 2238 <option name="SHOW_DIALOG_ON_UPDATE" value="false" /> 2239 <option name="UPDATING_POLICY" value="restart-server" /> 2240 <deployment> 2241 <artifact name="Project_source_artifact"> 2242 <settings> 2243 <option name="CONTEXT_PATH" value="/" /> 2244 </settings> 2245 </artifact> 2246 </deployment> 2247 <server-settings> 2248 <option name="DEPLOY_TOMCAT_APPS" value="false" /> 2249 <option name="BASE_DIRECTORY_NAME" value="Tomcat_6_Project_source" /> 2250 </server-settings> 2251 <predefined_log_file id="TOMCAT_LOCALHOST_LOG_ID" enabled="true" /> 2252 <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> 2253 <RunnerSettings RunnerId="Debug"> 2254 <option name="DEBUG_PORT" value="36875" /> 2255 <option name="TRANSPORT" value="0" /> 2256 <option name="LOCAL" value="true" /> 2257 </RunnerSettings> 2258 <RunnerSettings RunnerId="Run" /> 2259 <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug"> 2260 <option name="USE_ENV_VARIABLES" value="true" /> 2261 <STARTUP> 2262 <option name="USE_DEFAULT" value="true" /> 2263 <option name="SCRIPT" value="%IDEA_RUN:TOMCAT_HOME%/bin/catalina.sh" /> 2264 <option name="VM_PARAMETERS" value="" /> 2265 <option name="PROGRAM_PARAMETERS" value=" run" /> 2266 </STARTUP> 2267 <SHUTDOWN> 2268 <option name="USE_DEFAULT" value="true" /> 2269 <option name="SCRIPT" value="%IDEA_RUN:TOMCAT_HOME%/bin/catalina.sh" /> 2270 <option name="VM_PARAMETERS" value="" /> 2271 <option name="PROGRAM_PARAMETERS" value=" stop" /> 2272 </SHUTDOWN> 2273 <EnvironmentVariables> 2274 <option name="NAME" value="CATALINA_BASE" /> 2275 <option name="VALUE" value="/usr/local/apache-tomcat-6.0.18" /> 2276 <option name="IS_PREDEFINED" value="false" /> 2277 </EnvironmentVariables> 2278 </ConfigurationWrapper> 2279 <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run"> 2280 <option name="USE_ENV_VARIABLES" value="true" /> 2281 <STARTUP> 2282 <option name="USE_DEFAULT" value="true" /> 2283 <option name="SCRIPT" value="%IDEA_RUN:TOMCAT_HOME%/bin/catalina.sh" /> 2284 <option name="VM_PARAMETERS" value="" /> 2285 <option name="PROGRAM_PARAMETERS" value=" run" /> 2286 </STARTUP> 2287 <SHUTDOWN> 2288 <option name="USE_DEFAULT" value="true" /> 2289 <option name="SCRIPT" value="%IDEA_RUN:TOMCAT_HOME%/bin/catalina.sh" /> 2290 <option name="VM_PARAMETERS" value="" /> 2291 <option name="PROGRAM_PARAMETERS" value=" stop" /> 2292 </SHUTDOWN> 2293 <EnvironmentVariables> 2294 <option name="NAME" value="CATALINA_BASE" /> 2295 <option name="VALUE" value="/usr/local/apache-tomcat-6.0.18" /> 2296 <option name="IS_PREDEFINED" value="false" /> 2297 </EnvironmentVariables> 2298 </ConfigurationWrapper> 2299 <method> 2300 <option name="BuildArtifacts" enabled="true"> 2301 <artifact name="Project_source_artifact" /> 2302 </option> 2303 </method> 2304 </configuration> 2233 2305 </component> 2234 2306 <component name="SvnBranchConfigurationManager"> … … 2377 2449 </CLASSES> 2378 2450 <JAVADOC /> 2379 <SOURCES /> 2451 <SOURCES> 2452 <root url="jar://$PROJECT_DIR$/sources/org.springframework.core-sources-3.0.1.RELEASE-A.jar!/" /> 2453 <root url="jar://$PROJECT_DIR$/sources/spring-2.0.8-sources.jar!/" /> 2454 </SOURCES> 2380 2455 </library> 2381 2456 </component> -
project_source/trunk/Project_source.iws
r95 r118 15 15 </component> 16 16 <component name="ChangeListManager"> 17 <list default="true" id="19090696-352b-4acf-ae79-b4145552009b" name="Default" comment=""> 17 <list default="true" readonly="true" id="19090696-352b-4acf-ae79-b4145552009b" name="Default" comment="Ajout de la vue "Changes""> 18 <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/sources/spring-2.0.8-sources.jar" /> 19 <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/web/init.jsp" /> 20 <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/web/src/messages_en.properties" /> 18 21 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Project_source.ipr" afterPath="$PROJECT_DIR$/Project_source.ipr" /> 19 22 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Project_source.iws" afterPath="$PROJECT_DIR$/Project_source.iws" /> 23 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/web/WEB-INF/servlet-context.xml" afterPath="$PROJECT_DIR$/web/WEB-INF/servlet-context.xml" /> 24 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/web/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/web/WEB-INF/web.xml" /> 25 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/web/index.jsp" afterPath="$PROJECT_DIR$/web/index.jsp" /> 26 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/web/src/com/ether/Controller.java" afterPath="$PROJECT_DIR$/web/src/com/ether/Controller.java" /> 27 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/web/src/messages_fr.properties" afterPath="$PROJECT_DIR$/web/src/messages_fr.properties" /> 28 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/web/visualization/visu.jsp" afterPath="$PROJECT_DIR$/web/visualization/visu.jsp" /> 29 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/web/visualization/visu_plateform.jsp" afterPath="$PROJECT_DIR$/web/visualization/visu_plateform.jsp" /> 20 30 </list> 31 <list id="e7c09dc9-40b6-46cf-b964-8f5f3ec37c23" name="Not To Commit" comment="" /> 21 32 <ignored path="Project_source.iws" /> 22 33 <ignored path=".idea/workspace.xml" /> … … 77 88 <component name="FileEditorManager"> 78 89 <leaf> 79 <file leaf-file-name=" PlateformDAO.java" pinned="false" current="false" current-in-tab="false">80 <entry file="file://$PROJECT_DIR$/ persistence/interface/com/ether/dao/PlateformDAO.java">90 <file leaf-file-name="index.jsp" pinned="false" current="false" current-in-tab="false"> 91 <entry file="file://$PROJECT_DIR$/web/index.jsp"> 81 92 <provider selected="true" editor-type-id="text-editor"> 82 <state line="18" column="19" selection-start="379" selection-end="379" vertical-scroll-proportion="0.0"> 83 <folding /> 84 </state> 85 </provider> 86 </entry> 87 </file> 88 <file leaf-file-name="PlateformDAOImpl.java" pinned="false" current="false" current-in-tab="false"> 89 <entry file="file://$PROJECT_DIR$/persistence/implementation/com/ether/dao/PlateformDAOImpl.java"> 90 <provider selected="true" editor-type-id="text-editor"> 91 <state line="34" column="53" selection-start="940" selection-end="940" vertical-scroll-proportion="0.0"> 92 <folding /> 93 </state> 94 </provider> 95 </entry> 96 </file> 97 <file leaf-file-name="Plateform.java" pinned="false" current="false" current-in-tab="false"> 98 <entry file="file://$PROJECT_DIR$/domain/interface/com/ether/Plateform.java"> 99 <provider selected="true" editor-type-id="text-editor"> 100 <state line="26" column="56" selection-start="413" selection-end="413" vertical-scroll-proportion="0.0"> 93 <state line="1" column="46" selection-start="120" selection-end="120" vertical-scroll-proportion="-0.625"> 101 94 <folding /> 102 95 </state> … … 107 100 <entry file="file://$PROJECT_DIR$/web/src/com/ether/Controller.java"> 108 101 <provider selected="true" editor-type-id="text-editor"> 109 <state line="47" column="85" selection-start="1484" selection-end="1484" vertical-scroll-proportion="0.0"> 110 <folding /> 111 </state> 112 </provider> 113 </entry> 114 </file> 115 <file leaf-file-name="Project_source.ipr" pinned="false" current="true" current-in-tab="true"> 116 <entry file="file://$PROJECT_DIR$/Project_source.ipr"> 117 <provider selected="true" editor-type-id="text-editor"> 118 <state line="21" column="87" selection-start="1077" selection-end="1077" vertical-scroll-proportion="-0.88582677"> 102 <state line="41" column="129" selection-start="1262" selection-end="1262" vertical-scroll-proportion="0.0"> 119 103 <folding /> 120 104 </state> … … 125 109 <entry file="file://$PROJECT_DIR$/web/src/com/ether/ControllerEther.java"> 126 110 <provider selected="true" editor-type-id="text-editor"> 127 <state line=" 104" column="38" selection-start="3549" selection-end="3549" vertical-scroll-proportion="0.0">111 <state line="79" column="0" selection-start="2749" selection-end="2749" vertical-scroll-proportion="0.0"> 128 112 <folding /> 129 113 </state> … … 131 115 </entry> 132 116 </file> 133 <file leaf-file-name=" Plateform.hbm.xml" pinned="false" current="false" current-in-tab="false">134 <entry file="file://$PROJECT_DIR$/ persistence/implementation/com/ether/dao/Plateform.hbm.xml">117 <file leaf-file-name="visu.jsp" pinned="false" current="false" current-in-tab="false"> 118 <entry file="file://$PROJECT_DIR$/web/visualization/visu.jsp"> 135 119 <provider selected="true" editor-type-id="text-editor"> 136 <state line=" 9" column="72" selection-start="385" selection-end="385" vertical-scroll-proportion="0.0">120 <state line="31" column="0" selection-start="638" selection-end="887" vertical-scroll-proportion="0.0"> 137 121 <folding /> 138 122 </state> … … 140 124 </entry> 141 125 </file> 142 <file leaf-file-name="Parameter.hbm.xml" pinned="false" current="false" current-in-tab="false"> 143 <entry file="file://$PROJECT_DIR$/persistence/implementation/com/ether/dao/Parameter.hbm.xml"> 126 <file leaf-file-name="servlet-context.xml" pinned="false" current="true" current-in-tab="true"> 127 <entry file="file://$PROJECT_DIR$/web/WEB-INF/servlet-context.xml"> 128 <provider editor-type-id="com.intellij.spring.perspectives.SpringBeansStructureEditorProvider"> 129 <state /> 130 </provider> 144 131 <provider selected="true" editor-type-id="text-editor"> 145 <state line=" 15" column="39" selection-start="734" selection-end="734" vertical-scroll-proportion="0.0">132 <state line="35" column="53" selection-start="1779" selection-end="1779" vertical-scroll-proportion="0.43650794"> 146 133 <folding /> 147 134 </state> … … 149 136 </entry> 150 137 </file> 151 <file leaf-file-name=" Parameter.java" pinned="false" current="false" current-in-tab="false">152 <entry file="file://$PROJECT_DIR$/ domain/interface/com/ether/Parameter.java">138 <file leaf-file-name="init.jsp" pinned="false" current="false" current-in-tab="false"> 139 <entry file="file://$PROJECT_DIR$/web/init.jsp"> 153 140 <provider selected="true" editor-type-id="text-editor"> 154 <state line="1 6" column="4" selection-start="258" selection-end="258" vertical-scroll-proportion="0.0">141 <state line="15" column="35" selection-start="455" selection-end="455" vertical-scroll-proportion="-9.375"> 155 142 <folding /> 156 143 </state> … … 158 145 </entry> 159 146 </file> 160 <file leaf-file-name=" ParameterDAOImpl.java" pinned="false" current="false" current-in-tab="false">161 <entry file="file://$PROJECT_DIR$/ persistence/implementation/com/ether/dao/ParameterDAOImpl.java">147 <file leaf-file-name="visu_plateform.jsp" pinned="false" current="false" current-in-tab="false"> 148 <entry file="file://$PROJECT_DIR$/web/visualization/visu_plateform.jsp"> 162 149 <provider selected="true" editor-type-id="text-editor"> 163 <state line=" 19" column="25" selection-start="512" selection-end="512" vertical-scroll-proportion="0.0">150 <state line="48" column="0" selection-start="1240" selection-end="1470" vertical-scroll-proportion="-13.125"> 164 151 <folding /> 165 152 </state> 153 </provider> 154 </entry> 155 </file> 156 <file leaf-file-name="messages_en.properties" pinned="false" current="false" current-in-tab="false"> 157 <entry file="file://$PROJECT_DIR$/web/src/messages_en.properties"> 158 <provider selected="true" editor-type-id="text-editor"> 159 <state line="4" column="16" selection-start="110" selection-end="110" vertical-scroll-proportion="-2.2380953"> 160 <folding /> 161 </state> 162 </provider> 163 <provider editor-type-id="ResourceBundle"> 164 <state /> 165 </provider> 166 </entry> 167 </file> 168 <file leaf-file-name="messages_fr.properties" pinned="false" current="false" current-in-tab="false"> 169 <entry file="file://$PROJECT_DIR$/web/src/messages_fr.properties"> 170 <provider selected="true" editor-type-id="text-editor"> 171 <state line="4" column="16" selection-start="126" selection-end="126" vertical-scroll-proportion="-2.857143"> 172 <folding /> 173 </state> 174 </provider> 175 <provider editor-type-id="ResourceBundle"> 176 <state /> 166 177 </provider> 167 178 </entry> … … 181 192 <option name="changedFiles"> 182 193 <list> 183 <option value="$PROJECT_DIR$/persistence/implementation/hibernate-domain.cfg.xml" />184 <option value="$PROJECT_DIR$/web/src/messages_fr.properties" />185 <option value="$PROJECT_DIR$/web/index.jsp" />186 <option value="$PROJECT_DIR$/service/interface/com/ether/EtherService.java" />187 <option value="$PROJECT_DIR$/service/interface/com/ether/ServiceException.java" />188 <option value="$PROJECT_DIR$/persistence/implementation/dao-context.xml" />189 <option value="$PROJECT_DIR$/service/implementation/service-context.xml" />190 <option value="$PROJECT_DIR$/service/implementation/com/ether/EtherServiceImpl.java" />191 194 <option value="$PROJECT_DIR$/persistence/implementation/com/ether/dao/Parameter.hbm.xml" /> 192 195 <option value="$PROJECT_DIR$/persistence/implementation/com/ether/dao/ParameterDAOImpl.java" /> … … 196 199 <option value="$PROJECT_DIR$/domain/interface/com/ether/Plateform.java" /> 197 200 <option value="$PROJECT_DIR$/domain/interface/com/ether/Parameter.java" /> 201 <option value="$PROJECT_DIR$/web/WEB-INF/web.xml" /> 202 <option value="$PROJECT_DIR$/web/visualization/visu_plateform.jsp" /> 198 203 <option value="$PROJECT_DIR$/web/src/com/ether/Controller.java" /> 204 <option value="$PROJECT_DIR$/web/src/messages_en.properties" /> 205 <option value="$PROJECT_DIR$/web/src/messages_fr.properties" /> 206 <option value="$PROJECT_DIR$/web/WEB-INF/servlet-context.xml" /> 207 <option value="$PROJECT_DIR$/web/visualization/visu.jsp" /> 208 <option value="$PROJECT_DIR$/web/init.jsp" /> 209 <option value="$PROJECT_DIR$/web/index.jsp" /> 199 210 </list> 200 211 </option> … … 238 249 <abbreviatePackageNames /> 239 250 <autoscrollToSource /> 240 <autoscrollFromSource ProjectPane=" true" />251 <autoscrollFromSource ProjectPane="false" /> 241 252 <sortByType /> 242 253 </navigator> 243 254 <panes> 255 <pane id="PackagesPane" /> 244 256 <pane id="ProjectPane"> 245 257 <subPane> … … 291 303 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 292 304 </PATH_ELEMENT> 305 <PATH_ELEMENT> 306 <option name="myItemId" value="Resource Bundle 'messages'" /> 307 <option name="myItemType" value="com.intellij.lang.properties.projectView.ResourceBundleNode" /> 308 </PATH_ELEMENT> 293 309 </PATH> 294 310 <PATH> … … 307 323 <PATH_ELEMENT> 308 324 <option name="myItemId" value="src" /> 325 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 326 </PATH_ELEMENT> 327 </PATH> 328 <PATH> 329 <PATH_ELEMENT> 330 <option name="myItemId" value="Project_source" /> 331 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> 332 </PATH_ELEMENT> 333 <PATH_ELEMENT> 334 <option name="myItemId" value="trunk" /> 335 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 336 </PATH_ELEMENT> 337 <PATH_ELEMENT> 338 <option name="myItemId" value="web" /> 339 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 340 </PATH_ELEMENT> 341 <PATH_ELEMENT> 342 <option name="myItemId" value="resources" /> 343 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 344 </PATH_ELEMENT> 345 </PATH> 346 <PATH> 347 <PATH_ELEMENT> 348 <option name="myItemId" value="Project_source" /> 349 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> 350 </PATH_ELEMENT> 351 <PATH_ELEMENT> 352 <option name="myItemId" value="trunk" /> 353 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 354 </PATH_ELEMENT> 355 <PATH_ELEMENT> 356 <option name="myItemId" value="common" /> 357 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 358 </PATH_ELEMENT> 359 </PATH> 360 <PATH> 361 <PATH_ELEMENT> 362 <option name="myItemId" value="Project_source" /> 363 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> 364 </PATH_ELEMENT> 365 <PATH_ELEMENT> 366 <option name="myItemId" value="trunk" /> 367 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 368 </PATH_ELEMENT> 369 <PATH_ELEMENT> 370 <option name="myItemId" value="common" /> 371 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 372 </PATH_ELEMENT> 373 <PATH_ELEMENT> 374 <option name="myItemId" value="interface" /> 309 375 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 310 376 </PATH_ELEMENT> … … 316 382 </subPane> 317 383 </pane> 384 <pane id="Favorites" /> 318 385 <pane id="Scope" /> 319 <pane id="Favorites" />320 <pane id="PackagesPane" />321 386 </panes> 322 387 </component> … … 337 402 <property name="MemberChooser.showClasses" value="true" /> 338 403 <property name="GoToClass.includeLibraries" value="false" /> 404 <property name="dynamic.classpath" value="false" /> 405 <property name="options.searchVisible" value="true" /> 339 406 <property name="options.splitter.details.proportions" value="0.2" /> 340 <property name="options.searchVisible" value="true" />341 <property name="dynamic.classpath" value="false" />342 407 </component> 343 408 <component name="RecentsManager"> … … 347 412 </key> 348 413 <key name="CopyFile.RECENT_KEYS"> 414 <recent name="$PROJECT_DIR$/web" /> 415 <recent name="$PROJECT_DIR$/web/resources/messages" /> 349 416 <recent name="$PROJECT_DIR$/persistence/implementation/com/ether/dao" /> 350 417 <recent name="$PROJECT_DIR$/web/src" /> 351 418 <recent name="$PROJECT_DIR$/web/resources/css" /> 352 <recent name="$PROJECT_DIR$/web/resources/js" />353 <recent name="$PROJECT_DIR$/web/WEB-INF/tlds" />354 419 </key> 355 420 </component> … … 488 553 </method> 489 554 </configuration> 490 <configuration default="false" name="Tomcat 6" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 6">491 <option name="OPEN_IN_BROWSER" value="false" />492 <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/" />493 <option name="SHOW_DIALOG_ON_UPDATE" value="false" />494 <option name="UPDATING_POLICY" value="restart-server" />495 <deployment>496 <artifact name="Project_source_artifact">497 <settings>498 <option name="CONTEXT_PATH" value="/" />499 </settings>500 </artifact>501 </deployment>502 <server-settings>503 <option name="DEPLOY_TOMCAT_APPS" value="false" />504 <option name="BASE_DIRECTORY_NAME" value="Tomcat_6_Project_source" />505 </server-settings>506 <predefined_log_file id="TOMCAT_LOCALHOST_LOG_ID" enabled="true" />507 <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />508 <RunnerSettings RunnerId="Debug">509 <option name="DEBUG_PORT" value="36875" />510 <option name="TRANSPORT" value="0" />511 <option name="LOCAL" value="true" />512 </RunnerSettings>513 <RunnerSettings RunnerId="Run" />514 <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">515 <option name="USE_ENV_VARIABLES" value="true" />516 <STARTUP>517 <option name="USE_DEFAULT" value="true" />518 <option name="SCRIPT" value="%IDEA_RUN:TOMCAT_HOME%/bin/catalina.sh" />519 <option name="VM_PARAMETERS" value="" />520 <option name="PROGRAM_PARAMETERS" value=" run" />521 </STARTUP>522 <SHUTDOWN>523 <option name="USE_DEFAULT" value="true" />524 <option name="SCRIPT" value="%IDEA_RUN:TOMCAT_HOME%/bin/catalina.sh" />525 <option name="VM_PARAMETERS" value="" />526 <option name="PROGRAM_PARAMETERS" value=" stop" />527 </SHUTDOWN>528 <EnvironmentVariables>529 <option name="NAME" value="CATALINA_BASE" />530 <option name="VALUE" value="/usr/local/apache-tomcat-6.0.18" />531 <option name="IS_PREDEFINED" value="false" />532 </EnvironmentVariables>533 </ConfigurationWrapper>534 <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">535 <option name="USE_ENV_VARIABLES" value="true" />536 <STARTUP>537 <option name="USE_DEFAULT" value="true" />538 <option name="SCRIPT" value="%IDEA_RUN:TOMCAT_HOME%/bin/catalina.sh" />539 <option name="VM_PARAMETERS" value="" />540 <option name="PROGRAM_PARAMETERS" value=" run" />541 </STARTUP>542 <SHUTDOWN>543 <option name="USE_DEFAULT" value="true" />544 <option name="SCRIPT" value="%IDEA_RUN:TOMCAT_HOME%/bin/catalina.sh" />545 <option name="VM_PARAMETERS" value="" />546 <option name="PROGRAM_PARAMETERS" value=" stop" />547 </SHUTDOWN>548 <EnvironmentVariables>549 <option name="NAME" value="CATALINA_BASE" />550 <option name="VALUE" value="/usr/local/apache-tomcat-6.0.18" />551 <option name="IS_PREDEFINED" value="false" />552 </EnvironmentVariables>553 </ConfigurationWrapper>554 <method>555 <option name="BuildArtifacts" enabled="true">556 <artifact name="Project_source_artifact" />557 </option>558 </method>559 </configuration>560 555 <list size="2"> 561 556 <item index="0" class="java.lang.String" itemvalue="JUnit.OtherTest.testDatesMoisPlusUn" /> … … 583 578 <configuration useDefault="true">$USER_HOME$/.subversion_IDEA</configuration> 584 579 <myIsUseDefaultProxy>false</myIsUseDefaultProxy> 580 <supportedVersion>125</supportedVersion> 585 581 </component> 586 582 <component name="SvnFileUrlMappingImpl"> … … 604 600 <component name="TaskManager"> 605 601 <task active="true" id="Default" summary="Default task"> 602 <option name="associatedChangelistId" value="4662fb79-a017-4123-9cbd-77a192d0a8b0" /> 606 603 <changelist id="19090696-352b-4acf-ae79-b4145552009b" name="Default" comment="" /> 607 604 <created>1307631711342</created> 608 <updated>130 7631711342</updated>605 <updated>1308334548592</updated> 609 606 </task> 610 607 <servers /> … … 634 631 <editor active="false" /> 635 632 <layout> 636 <window_info id="Changes" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0. 3293979" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />633 <window_info id="Changes" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.49586776" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 637 634 <window_info id="Persistence" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> 638 635 <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 636 <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293979" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 639 637 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 640 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3 872491" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />638 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.37308148" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 641 639 <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 642 640 <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 643 641 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 644 642 <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293979" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 643 <window_info id="SVN Repositories" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5218418" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> 645 644 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293979" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> 646 645 <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> 647 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0. 25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />646 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17894737" sideWeight="0.24557261" order="1" side_tool="true" content_ui="tabs" /> 648 647 <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 649 648 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 650 649 <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 651 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.17894737" sideWeight="0. 67060214" order="0" side_tool="false" content_ui="tabs" />650 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.17894737" sideWeight="0.5041322" order="0" side_tool="false" content_ui="tabs" /> 652 651 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293979" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 653 652 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> 654 653 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 655 <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293979" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />656 654 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> 657 655 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> … … 673 671 <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" /> 674 672 <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> 675 <option name="LAST_COMMIT_MESSAGE" />673 <option name="LAST_COMMIT_MESSAGE" value="Cleanup Project_source " /> 676 674 <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" /> 677 675 <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> … … 686 684 <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> 687 685 <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> 686 <MESSAGE value="Ajout de la vue "Changes"" /> 687 <MESSAGE value="Cleanup " /> 688 <MESSAGE value="Cleanup Project_source " /> 688 689 </component> 689 690 <component name="VssConfiguration"> … … 729 730 </component> 730 731 <component name="editorHistoryManager"> 731 <entry file="file://$PROJECT_DIR$/persistence/implementation/com/ether/dao/Parameter_old.hbm.xml"> 732 <provider selected="true" editor-type-id="text-editor"> 733 <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" /> 734 </provider> 735 </entry> 736 <entry file="file://$PROJECT_DIR$/service/interface/com/ether/EtherService.java"> 737 <provider selected="true" editor-type-id="text-editor"> 738 <state line="20" column="35" selection-start="457" selection-end="457" vertical-scroll-proportion="0.0" /> 739 </provider> 740 </entry> 741 <entry file="file://$PROJECT_DIR$/service/implementation/com/ether/EtherServiceImpl.java"> 742 <provider selected="true" editor-type-id="text-editor"> 743 <state line="59" column="47" selection-start="1652" selection-end="1652" vertical-scroll-proportion="0.0" /> 744 </provider> 745 </entry> 746 <entry file="jar://$PROJECT_DIR$/web/WEB-INF/lib/hibernate-3.3.2.GA.jar!/org/hibernate/property/BasicPropertyAccessor.class"> 747 <provider selected="true" editor-type-id="text-editor"> 748 <state line="65" column="0" selection-start="3767" selection-end="3767" vertical-scroll-proportion="0.8502304" /> 749 </provider> 750 </entry> 751 <entry file="file://$PROJECT_DIR$/web/WEB-INF/classes/com/ether/Plateform.class"> 752 <provider selected="true" editor-type-id="text-editor"> 753 <state line="13" column="0" selection-start="367" selection-end="405" vertical-scroll-proportion="0.4131356" /> 754 </provider> 755 </entry> 756 <entry file="file://$PROJECT_DIR$/persistence/interface/com/ether/dao/ParameterDAO.java"> 757 <provider selected="true" editor-type-id="text-editor"> 758 <state line="5" column="71" selection-start="175" selection-end="175" vertical-scroll-proportion="0.0" /> 759 </provider> 760 </entry> 761 <entry file="file://$PROJECT_DIR$/persistence/interface/com/ether/dao/PlateformDAO.java"> 762 <provider selected="true" editor-type-id="text-editor"> 763 <state line="18" column="19" selection-start="379" selection-end="379" vertical-scroll-proportion="0.0" /> 764 </provider> 765 </entry> 766 <entry file="file://$PROJECT_DIR$/persistence/implementation/com/ether/dao/PlateformDAOImpl.java"> 767 <provider selected="true" editor-type-id="text-editor"> 768 <state line="34" column="53" selection-start="940" selection-end="940" vertical-scroll-proportion="0.0" /> 769 </provider> 770 </entry> 771 <entry file="file://$PROJECT_DIR$/domain/interface/com/ether/Plateform.java"> 772 <provider selected="true" editor-type-id="text-editor"> 773 <state line="26" column="56" selection-start="413" selection-end="413" vertical-scroll-proportion="0.0" /> 732 <entry file="jar://$PROJECT_DIR$/sources/spring-2.0.8-sources.jar!/org/springframework/web/servlet/support/RequestContext.java"> 733 <provider selected="true" editor-type-id="text-editor"> 734 <state line="228" column="0" selection-start="9835" selection-end="9835" vertical-scroll-proportion="0.0"> 735 <folding /> 736 </state> 737 </provider> 738 </entry> 739 <entry file="jar://$PROJECT_DIR$/sources/spring-2.0.8-sources.jar!/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java"> 740 <provider selected="true" editor-type-id="text-editor"> 741 <state line="70" column="0" selection-start="2438" selection-end="2438" vertical-scroll-proportion="0.0"> 742 <folding /> 743 </state> 744 </provider> 745 </entry> 746 <entry file="file://$PROJECT_DIR$/web/WEB-INF/web.xml"> 747 <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorReferencesProvider"> 748 <state /> 749 </provider> 750 <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleGeneralEditorProvider"> 751 <state /> 752 </provider> 753 <provider selected="true" editor-type-id="text-editor"> 754 <state line="12" column="50" selection-start="584" selection-end="584" vertical-scroll-proportion="0.36511156"> 755 <folding /> 756 </state> 757 </provider> 758 <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorProvider"> 759 <state /> 760 </provider> 761 </entry> 762 <entry file="jar://$PROJECT_DIR$/sources/spring-2.0.8-sources.jar!/org/springframework/web/servlet/mvc/AbstractController.java"> 763 <provider selected="true" editor-type-id="text-editor"> 764 <state line="152" column="0" selection-start="6531" selection-end="6531" vertical-scroll-proportion="0.0"> 765 <folding /> 766 </state> 767 </provider> 768 </entry> 769 <entry file="jar://$PROJECT_DIR$/sources/spring-2.0.8-sources.jar!/org/springframework/web/servlet/mvc/SimpleControllerHandlerAdapter.java"> 770 <provider selected="true" editor-type-id="text-editor"> 771 <state line="47" column="0" selection-start="1638" selection-end="1638" vertical-scroll-proportion="0.0"> 772 <folding /> 773 </state> 774 </provider> 775 </entry> 776 <entry file="jar://$PROJECT_DIR$/sources/spring-2.0.8-sources.jar!/org/springframework/web/servlet/DispatcherServlet.java"> 777 <provider selected="true" editor-type-id="text-editor"> 778 <state line="877" column="0" selection-start="36412" selection-end="36412" vertical-scroll-proportion="0.0"> 779 <folding /> 780 </state> 781 </provider> 782 </entry> 783 <entry file="jar://$PROJECT_DIR$/sources/spring-2.0.8-sources.jar!/org/springframework/web/servlet/i18n/CookieLocaleResolver.java"> 784 <provider selected="true" editor-type-id="text-editor"> 785 <state line="115" column="0" selection-start="3912" selection-end="3912" vertical-scroll-proportion="0.32007954"> 786 <folding /> 787 </state> 788 </provider> 789 </entry> 790 <entry file="file://$PROJECT_DIR$/web/visualization/visu_plateform.jsp"> 791 <provider selected="true" editor-type-id="text-editor"> 792 <state line="48" column="0" selection-start="1240" selection-end="1470" vertical-scroll-proportion="-13.125"> 793 <folding /> 794 </state> 795 </provider> 796 </entry> 797 <entry file="file://$PROJECT_DIR$/web/src/messages_en.properties"> 798 <provider selected="true" editor-type-id="text-editor"> 799 <state line="4" column="16" selection-start="110" selection-end="110" vertical-scroll-proportion="-2.2380953"> 800 <folding /> 801 </state> 802 </provider> 803 <provider editor-type-id="ResourceBundle"> 804 <state /> 805 </provider> 806 </entry> 807 <entry file="file://$PROJECT_DIR$/web/src/messages_fr.properties"> 808 <provider selected="true" editor-type-id="text-editor"> 809 <state line="4" column="16" selection-start="126" selection-end="126" vertical-scroll-proportion="-2.857143"> 810 <folding /> 811 </state> 812 </provider> 813 <provider editor-type-id="ResourceBundle"> 814 <state /> 774 815 </provider> 775 816 </entry> 776 817 <entry file="file://$PROJECT_DIR$/web/src/com/ether/ControllerEther.java"> 777 818 <provider selected="true" editor-type-id="text-editor"> 778 <state line="104" column="38" selection-start="3549" selection-end="3549" vertical-scroll-proportion="0.0" /> 779 </provider> 780 </entry> 781 <entry file="file://$PROJECT_DIR$/persistence/implementation/com/ether/dao/Plateform.hbm.xml"> 782 <provider selected="true" editor-type-id="text-editor"> 783 <state line="9" column="72" selection-start="385" selection-end="385" vertical-scroll-proportion="0.0" /> 784 </provider> 785 </entry> 786 <entry file="file://$PROJECT_DIR$/persistence/implementation/com/ether/dao/Parameter.hbm.xml"> 787 <provider selected="true" editor-type-id="text-editor"> 788 <state line="15" column="39" selection-start="734" selection-end="734" vertical-scroll-proportion="0.0" /> 789 </provider> 790 </entry> 791 <entry file="file://$PROJECT_DIR$/domain/interface/com/ether/Parameter.java"> 792 <provider selected="true" editor-type-id="text-editor"> 793 <state line="16" column="4" selection-start="258" selection-end="258" vertical-scroll-proportion="0.0" /> 794 </provider> 795 </entry> 796 <entry file="file://$PROJECT_DIR$/persistence/implementation/com/ether/dao/ParameterDAOImpl.java"> 797 <provider selected="true" editor-type-id="text-editor"> 798 <state line="19" column="25" selection-start="512" selection-end="512" vertical-scroll-proportion="0.0" /> 819 <state line="79" column="0" selection-start="2749" selection-end="2749" vertical-scroll-proportion="0.0"> 820 <folding /> 821 </state> 822 </provider> 823 </entry> 824 <entry file="file://$PROJECT_DIR$/web/visualization/visu.jsp"> 825 <provider selected="true" editor-type-id="text-editor"> 826 <state line="31" column="0" selection-start="638" selection-end="887" vertical-scroll-proportion="0.0"> 827 <folding /> 828 </state> 829 </provider> 830 </entry> 831 <entry file="file://$PROJECT_DIR$/web/init.jsp"> 832 <provider selected="true" editor-type-id="text-editor"> 833 <state line="15" column="35" selection-start="455" selection-end="455" vertical-scroll-proportion="-9.375"> 834 <folding /> 835 </state> 799 836 </provider> 800 837 </entry> 801 838 <entry file="file://$PROJECT_DIR$/web/src/com/ether/Controller.java"> 802 839 <provider selected="true" editor-type-id="text-editor"> 803 <state line="47" column="85" selection-start="1484" selection-end="1484" vertical-scroll-proportion="0.0"> 804 <folding /> 805 </state> 806 </provider> 807 </entry> 808 <entry file="file://$PROJECT_DIR$/Project_source.ipr"> 809 <provider selected="true" editor-type-id="text-editor"> 810 <state line="21" column="87" selection-start="1077" selection-end="1077" vertical-scroll-proportion="-0.88582677"> 840 <state line="41" column="129" selection-start="1262" selection-end="1262" vertical-scroll-proportion="0.0"> 841 <folding /> 842 </state> 843 </provider> 844 </entry> 845 <entry file="file://$PROJECT_DIR$/web/index.jsp"> 846 <provider selected="true" editor-type-id="text-editor"> 847 <state line="1" column="46" selection-start="120" selection-end="120" vertical-scroll-proportion="-0.625"> 848 <folding /> 849 </state> 850 </provider> 851 </entry> 852 <entry file="file://$PROJECT_DIR$/web/WEB-INF/servlet-context.xml"> 853 <provider editor-type-id="com.intellij.spring.perspectives.SpringBeansStructureEditorProvider"> 854 <state /> 855 </provider> 856 <provider selected="true" editor-type-id="text-editor"> 857 <state line="35" column="53" selection-start="1779" selection-end="1779" vertical-scroll-proportion="0.43650794"> 811 858 <folding /> 812 859 </state> -
project_source/trunk/web/WEB-INF/servlet-context.xml
r94 r118 1 1 <?com.medias.xml version="1.0" encoding="UTF-8"?> 2 2 <beans xmlns="http://www.springframework.org/schema/beans" 3 4 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop" 4 xsi:schemaLocation=" 5 5 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd 6 6 http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> 7 7 8 <bean id="loginInterceptor" class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor"> 8 <!-- i18n --> 9 <!--<bean id="localeResolver" class="org.springframework.web.servlet.i18n.SessionLocaleResolver"/>--> 10 <bean id="localeResolver" class="org.springframework.web.servlet.i18n.CookieLocaleResolver"> 11 <property name="defaultLocale" value="en"/> 12 </bean> 13 14 <bean id="localeChangeInterceptor" class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor"> 9 15 <property name="paramName" value="language"/> 10 16 </bean> 11 17 12 <bean id="openSessionInViewInterceptor" class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">13 <property name="sessionFactory">14 <ref bean="sessionFactory" />15 </property>16 <property name="singleSession" value="true"/>17 <property name="flushModeName">18 <value>FLUSH_AUTO</value>19 </property>20 </bean>21 22 18 <!-- Message source for this context, loaded from localized "messages_xx" files --> 23 19 <bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource"> 24 < property name="useCodeAsDefaultMessage" value="true"/>25 < property name="fallbackToSystemLocale" value="false"/>20 <!--<property name="useCodeAsDefaultMessage" value="true"/>--> 21 <!--<property name="fallbackToSystemLocale" value="false"/>--> 26 22 <property name="defaultEncoding" value="UTF-8"/> 27 <property name="cacheSeconds" value="-1"/>28 23 <property name="basenames"> 29 24 <list> … … 33 28 </bean> 34 29 35 <!-- Mappings --> 36 <bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping"> 37 <property name="interceptors"> 38 <list> 39 <ref bean="loginInterceptor"/> 40 <ref bean="openSessionInViewInterceptor"/> 41 </list> 42 </property> 30 <!-- Mappings --> 31 <bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping"> 32 <property name="interceptors"> 33 <list> 34 <ref bean="localeChangeInterceptor"/> 35 </list> 36 </property> 43 37 44 45 46 47 48 49 38 <property name="mappings"> 39 <props> 40 <prop key="/visualization">controller</prop> 41 </props> 42 </property> 43 </bean> 50 44 51 52 <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>53 <property name="prefix" value="/"/>54 <property name="suffix" value=".jsp"/>55 45 <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver"> 46 <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/> 47 <property name="prefix" value="/"/> 48 <property name="suffix" value=".jsp"/> 49 </bean> 56 50 57 58 59 60 51 <bean id="myMethodNameResolver" class="org.springframework.web.servlet.mvc.multiaction.ParameterMethodNameResolver"> 52 <property name="defaultMethodName" value="home"/> 53 <property name="paramName" value="methodName"/> 54 </bean> 61 55 62 56 <bean id="controllerEther" class="com.ether.ControllerEther"> … … 65 59 </bean> 66 60 67 68 <property name="etherService" ref="etherService"/>69 61 <bean id="controller" class="com.ether.Controller" parent="controllerEther"> 62 <property name="etherService" ref="etherService"/> 63 </bean> 70 64 71 65 </beans> -
project_source/trunk/web/WEB-INF/web.xml
r94 r118 1 1 <?com.medias.xml version="1.0" encoding="UTF-8"?> 2 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> 2 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" 3 "http://java.sun.com/dtd/web-app_2_3.dtd"> 3 4 <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" 4 5 5 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 6 xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> 6 7 7 8 <display-name>Project_source</display-name> 8 9 9 <context-param> 10 <param-name>contextConfigLocation</param-name> 11 <param-value> 10 <welcome-file-list>Â Â 11 Â Â Â Â Â Â Â Â <welcome-file>index.jsp</welcome-file>Â Â 12 </welcome-file-list> 13 Â Â 14 15 <context-param> 16 <param-name>contextConfigLocation</param-name> 17 <param-value> 12 18 classpath:dao-context.xml, 13 19 classpath:service-context.xml, … … 16 22 classpath:json/json-context.xml 17 23 </param-value> 18 24 </context-param> 19 25 20 21 22 26 <listener> 27 <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> 28 </listener> 23 29 24 25 26 27 28 30 <!-- TAGLIBS --> 31 <!--<taglib>--> 32 <!--<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>--> 33 <!--<taglib-location>/WEB-INF/tags/htmlJsp.tag</taglib-location>--> 34 <!--</taglib>--> 29 35 30 31 32 33 36 <!--<taglib>--> 37 <!--<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>--> 38 <!--<taglib-location>/WEB-INF/tags/htmlResourceJsp.tag</taglib-location>--> 39 <!--</taglib>--> 34 40 35 36 37 38 41 <!--<taglib>--> 42 <!--<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>--> 43 <!--<taglib-location>/WEB-INF/tags/htmlCss.tag</taglib-location>--> 44 <!--</taglib>--> 39 45 40 41 42 43 46 <!--<taglib>--> 47 <!--<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>--> 48 <!--<taglib-location>/WEB-INF/tags/htmlJs.tag</taglib-location>--> 49 <!--</taglib>--> 44 50 45 46 47 48 49 50 51 52 51 <!--SERVLETS --> 52 <servlet> 53 <servlet-name>visualization</servlet-name> 54 <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> 55 <init-param> 56 <param-name>contextConfigLocation</param-name> 57 <param-value> 58 /WEB-INF/servlet-context.xml 53 59 </param-value> 54 55 60 </init-param> 61 </servlet> 56 62 57 58 59 60 63 <servlet-mapping> 64 <servlet-name>visualization</servlet-name> 65 <url-pattern>/visualization</url-pattern> 66 </servlet-mapping> 61 67 62 <session-config> 63 <session-timeout>60</session-timeout> <!-- minute --> 64 </session-config> 68 <session-config> 69 <session-timeout>60</session-timeout> 70 <!-- minute --> 71 </session-config> 65 72 66 73 </web-app> -
project_source/trunk/web/index.jsp
r94 r118 1 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> 2 <%@ taglib prefix="ether" tagdir="/WEB-INF/tags" %> 3 4 <%@ page contentType="text/html;charset=UTF-8" language="java" %> 5 6 <html> 7 <head> 8 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"> 9 <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE"> 10 11 <title>Project source</title> 12 13 <ether:htmlCss cssFile="ether"/> 14 <ether:htmlCss cssFile="button"/> 15 <ether:htmlCss cssFile="blueprint-css/blueprint/src/grid"/> 16 17 <ether:htmlJs jsFile="maj"/> 18 19 </head> 20 21 <body> 22 23 --> Appel de la méthode "view" du controller qui renvoit vers la page visu.jsp 24 <br/> 25 <a href="visualization?methodName=view"> 26 view 27 </a> 28 29 <br/><br/><br/> 30 31 --> Appel de la méthode viewAllPlateforms du controller qui renvoit vers la page visu_plateform.jsp 32 <br/> 33 <a href="visualization?methodName=viewAllPlateforms"> 34 view plateforms 35 </a> 36 37 </body> 38 </html> 1 <%--This redirect is used to allow messages sources in the index page--%> 2 <jsp:forward page="visualization?methodName=home"/> -
project_source/trunk/web/init.jsp
r94 r118 1 1 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> 2 <%@ taglib prefix="ether" tagdir="/WEB-INF/tags" %>3 4 2 <%@ page contentType="text/html;charset=UTF-8" language="java" %> 5 3 … … 10 8 11 9 <title>Project source</title> 12 13 <ether:htmlCss cssFile="ether"/>14 <ether:htmlCss cssFile="button"/>15 <ether:htmlCss cssFile="blueprint-css/blueprint/src/grid"/>16 17 <ether:htmlJs jsFile="maj"/>18 19 10 </head> 20 11 21 12 <body> 22 13 23 --> Appel de la méthode "view" du controller qui renvoit vers la page visu.jsp 24 <br/> 25 <a href="visualization?methodName=view"> 26 view 27 </a> 14 <spring:message code="label.language" htmlEscape="true"/> : <spring:message code="language" htmlEscape="true"/> 28 15 29 <br/><br/><br/>16 <br/><br/> 30 17 31 --> Appel de la méthode viewAllPlateforms du controller qui renvoit vers la page visu_plateform.jsp 32 <br/> 33 <a href="visualization?methodName=viewAllPlateforms"> 34 view plateforms 35 </a> 18 <spring:message code="text.change.language" htmlEscape="true"/> 19 <br/> 20 <spring:message code="label.language" htmlEscape="true"/> : <a href="visualization?methodName=home&language=en"><spring:message code="label.language.en" htmlEscape="true"/></a> 21 | <a href="visualization?methodName=home&language=fr"><spring:message code="label.language.fr" htmlEscape="true"/></a> 22 23 <hr> 24 <h3><spring:message code="titre.init" htmlEscape="true"/></h3> 25 <hr> 26 27 <table width="100%"> 28 <tr> 29 <td> 30 <a href="visualization?methodName=view"><spring:message code="text.visu.href" htmlEscape="true"/></a> 31 </td> 32 <td><spring:message code="text.visu" htmlEscape="true"/></td> 33 </tr> 34 35 <tr> 36 <td> 37 <a href="visualization?methodName=viewAllPlateforms"><spring:message code="text.visu.pf.href" htmlEscape="true"/></a> 38 </td> 39 <td><spring:message code="text.visu.pf" htmlEscape="true"/></td> 40 </tr> 41 42 </table> 36 43 37 44 </body> -
project_source/trunk/web/src/com/ether/Controller.java
r94 r118 29 29 * ********************************************************** * 30 30 */ 31 // Default view if methodName is unknown 32 public ModelAndView home( final HttpServletRequest request, final HttpServletResponse response ) 31 // Default view if url's methodName is unknown 32 @ControllerMethod(view = "init") 33 public Map<String, Object> home() 33 34 throws WebException 34 35 { 35 return new ModelAndView( "index");36 return new HashMap<String, Object>(); 36 37 } 37 38 -
project_source/trunk/web/src/messages_fr.properties
r94 r118 1 1 inWork=Page en cours de construction.. 2 language=FRANCAIS 3 label.language.fr=Français 4 label.language.en=Anglais 5 label.language=Langue 6 label.index=Retour à l'index 7 8 titre.visu=Page de visualisation simple 9 titre.visu.pf=Page de visualisation de toutes les plateformes/paramÚtres 10 titre.init=Init 11 12 text.visu.pf=Appel de la méthode viewAllPlateforms du controller qui renvoit vers la page visu_plateform.jsp 13 text.visu.pf.href=vue plateforms 14 15 text.visu=Appel de la méthode "view" du controller qui renvoit vers la page visu.jsp 16 text.visu.href=vue simple 17 18 text.results=Résultats retournés par le controller : 19 text.change.language=Changement de langue (utilisation des labels de messages_en.properties) 20 2 21 3 22 data.visualization=Visualisation des données -
project_source/trunk/web/visualization/visu.jsp
r94 r118 1 Page de visu 1 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> 2 3 <%@ page contentType="text/html;charset=UTF-8" language="java" %> 4 5 <html> 6 <head> 7 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"> 8 <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE"> 9 10 <title>Project source</title> 11 </head> 12 13 <body> 14 15 <spring:message code="label.language" htmlEscape="true"/> : <spring:message code="language" htmlEscape="true"/> 16 17 <br/><br/> 18 19 <a href="visualization?"><spring:message code="label.index" htmlEscape="true"/></a> 20 21 <hr> 22 <h3><spring:message code="titre.visu" htmlEscape="true"/></h3> 23 <hr> 24 25 <table width="100%"> 26 <tr> 27 <td> 28 <a href="visualization?methodName=viewAllPlateforms"><spring:message code="text.visu.pf.href" htmlEscape="true"/></a> 29 </td> 30 <td><spring:message code="text.visu.pf" htmlEscape="true"/></td> 31 </tr> 32 33 </table> 34 35 </body> 36 </html> -
project_source/trunk/web/visualization/visu_plateform.jsp
r94 r118 29 29 <body> 30 30 31 Résultats retournés par le controller : <br/> 31 32 <spring:message code="label.language" htmlEscape="true"/> : <spring:message code="language" htmlEscape="true"/> 33 34 <br/><br/> 35 36 <a href="visualization?"><spring:message code="label.index" htmlEscape="true"/></a> 37 38 <hr> 39 <h3><spring:message code="titre.visu.pf" htmlEscape="true"/></h3> 40 <hr> 41 42 <table width="100%"> 43 <tr> 44 <td> 45 <a href="visualization?methodName=view"><spring:message code="text.visu.href" htmlEscape="true"/></a> 46 </td> 47 <td><spring:message code="text.visu" htmlEscape="true"/></td> 48 </tr> 49 50 </table> 51 52 <hr> 53 <spring:message code="text.results" htmlEscape="true"/><br/> 32 54 ${plateforms} 33 <br/><br/><br/> 55 <br/><br/> 56 <hr> 57 58 34 59 <div class="span-24" id="pageContent"> 35 60 <div id="generalContainerPlateforms" class="span-7 colborder">
Note: See TracChangeset
for help on using the changeset viewer.