kelude / canrd-patent · Commits

Commit 9342063b29e98b4b2a541eaa0548d34a19a53106

Authored by maoyangou
1 parent 1814efdf
build: skipped

update pom

Inline Side-by-side
Showing 1 changed file with 94 additions and 40 deletions
.idea/workspace.xml
  View file @9342063
... ... @@ -2,9 +2,6 @@
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4 4 <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="">
5   - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/customer_contact.jsp" />
6   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/css/pay.css" afterPath="$PROJECT_DIR$/src/main/webapp/css/pay.css" />
7   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/pay.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
8 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
9 6 </list>
10 7 <ignored path="patent.iws" />
... ... @@ -38,16 +35,6 @@
38 35 </provider>
39 36 </entry>
40 37 </file>
41   - <file leaf-file-name="footer.jsp" pinned="false" current-in-tab="false">
42   - <entry file="file://$PROJECT_DIR$/src/main/webapp/include/footer.jsp">
43   - <provider selected="true" editor-type-id="text-editor">
44   - <state vertical-scroll-proportion="-5.0">
45   - <caret line="8" column="48" selection-start-line="8" selection-start-column="48" selection-end-line="8" selection-end-column="48" />
46   - <folding />
47   - </state>
48   - </provider>
49   - </entry>
50   - </file>
51 38 <file leaf-file-name="logo.png" pinned="false" current-in-tab="false">
52 39 <entry file="file://$PROJECT_DIR$/src/main/webapp/img/logo.png">
53 40 <provider selected="true" editor-type-id="images">
... ... @@ -55,11 +42,21 @@
55 42 </provider>
56 43 </entry>
57 44 </file>
58   - <file leaf-file-name="generatorConfig.xml" pinned="false" current-in-tab="false">
  45 + <file leaf-file-name="generatorConfig.xml" pinned="false" current-in-tab="true">
59 46 <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
60 47 <provider selected="true" editor-type-id="text-editor">
  48 + <state vertical-scroll-proportion="0.24150269">
  49 + <caret line="9" column="58" selection-start-line="9" selection-start-column="58" selection-end-line="9" selection-end-column="58" />
  50 + <folding />
  51 + </state>
  52 + </provider>
  53 + </entry>
  54 + </file>
  55 + <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
  56 + <entry file="file://$PROJECT_DIR$/pom.xml">
  57 + <provider selected="true" editor-type-id="text-editor">
61 58 <state vertical-scroll-proportion="0.0">
62   - <caret line="52" column="3" selection-start-line="52" selection-start-column="3" selection-end-line="52" selection-end-column="3" />
  59 + <caret line="112" column="36" selection-start-line="112" selection-start-column="36" selection-end-line="112" selection-end-column="36" />
63 60 <folding />
64 61 </state>
65 62 </provider>
... ... @@ -75,10 +72,10 @@
75 72 </provider>
76 73 </entry>
77 74 </file>
78   - <file leaf-file-name="pay.jsp" pinned="false" current-in-tab="true">
  75 + <file leaf-file-name="pay.jsp" pinned="false" current-in-tab="false">
79 76 <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
80 77 <provider selected="true" editor-type-id="text-editor">
81   - <state vertical-scroll-proportion="1.9126016">
  78 + <state vertical-scroll-proportion="-61.083332">
82 79 <caret line="191" column="20" selection-start-line="191" selection-start-column="20" selection-end-line="191" selection-end-column="20" />
83 80 <folding />
84 81 </state>
... ... @@ -341,6 +338,14 @@
341 338 <option name="myItemId" value="src" />
342 339 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
343 340 </PATH_ELEMENT>
  341 + <PATH_ELEMENT>
  342 + <option name="myItemId" value="test" />
  343 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  344 + </PATH_ELEMENT>
  345 + <PATH_ELEMENT>
  346 + <option name="myItemId" value="resources" />
  347 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  348 + </PATH_ELEMENT>
344 349 </PATH>
345 350 <PATH>
346 351 <PATH_ELEMENT>
... ... @@ -356,7 +361,55 @@
356 361 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
357 362 </PATH_ELEMENT>
358 363 <PATH_ELEMENT>
359   - <option name="myItemId" value="main" />
  364 + <option name="myItemId" value="test" />
  365 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  366 + </PATH_ELEMENT>
  367 + <PATH_ELEMENT>
  368 + <option name="myItemId" value="resources" />
  369 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  370 + </PATH_ELEMENT>
  371 + <PATH_ELEMENT>
  372 + <option name="myItemId" value="mbg" />
  373 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  374 + </PATH_ELEMENT>
  375 + </PATH>
  376 + <PATH>
  377 + <PATH_ELEMENT>
  378 + <option name="myItemId" value="patent" />
  379 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  380 + </PATH_ELEMENT>
  381 + <PATH_ELEMENT>
  382 + <option name="myItemId" value="canrd-patent" />
  383 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  384 + </PATH_ELEMENT>
  385 + <PATH_ELEMENT>
  386 + <option name="myItemId" value="src" />
  387 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  388 + </PATH_ELEMENT>
  389 + <PATH_ELEMENT>
  390 + <option name="myItemId" value="test" />
  391 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  392 + </PATH_ELEMENT>
  393 + <PATH_ELEMENT>
  394 + <option name="myItemId" value="java" />
  395 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  396 + </PATH_ELEMENT>
  397 + <PATH_ELEMENT>
  398 + <option name="myItemId" value="patent" />
  399 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  400 + </PATH_ELEMENT>
  401 + </PATH>
  402 + <PATH>
  403 + <PATH_ELEMENT>
  404 + <option name="myItemId" value="patent" />
  405 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  406 + </PATH_ELEMENT>
  407 + <PATH_ELEMENT>
  408 + <option name="myItemId" value="canrd-patent" />
  409 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  410 + </PATH_ELEMENT>
  411 + <PATH_ELEMENT>
  412 + <option name="myItemId" value="src" />
360 413 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
361 414 </PATH_ELEMENT>
362 415 </PATH>
... ... @@ -857,21 +910,21 @@
857 910 <workItem from="1469889447244" duration="6443000" />
858 911 <workItem from="1470021636578" duration="1324000" />
859 912 <workItem from="1470843908935" duration="3000" />
860   - <workItem from="1471188294361" duration="6145000" />
  913 + <workItem from="1471188294361" duration="10035000" />
861 914 </task>
862 915 <servers />
863 916 </component>
864 917 <component name="TimeTrackingManager">
865   - <option name="totallyTimeSpent" value="109643000" />
  918 + <option name="totallyTimeSpent" value="113533000" />
866 919 </component>
867 920 <component name="ToolWindowManager">
868 921 <frame x="1280" y="23" width="1920" height="1057" extended-state="6" />
869   - <editor active="false" />
  922 + <editor active="true" />
870 923 <layout>
871 924 <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
872 925 <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
873 926 <window_info id="Designer" 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" />
874   - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.43626943" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  927 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39170983" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
875 928 <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" />
876 929 <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" />
877 930 <window_info id="Database" 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" />
... ... @@ -881,12 +934,12 @@
881 934 <window_info id="Favorites" 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" />
882 935 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
883 936 <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4496124" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
884   - <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15867944" sideWeight="0.21691176" order="2" side_tool="true" content_ui="tabs" />
  937 + <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.15867944" sideWeight="0.18567252" order="2" side_tool="true" content_ui="tabs" />
885 938 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
886 939 <window_info id="Structure" active="false" anchor="left" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
887 940 <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.1914378" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
888 941 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53812635" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
889   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15867944" sideWeight="0.7830882" order="0" side_tool="false" content_ui="combo" />
  942 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15867944" sideWeight="0.8143275" order="0" side_tool="false" content_ui="combo" />
890 943 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36165804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
891 944 <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" />
892 945 <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" />
... ... @@ -946,13 +999,6 @@
946 999 <option name="FILTER_TARGETS" value="false" />
947 1000 </component>
948 1001 <component name="editorHistoryManager">
949   - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE-sources.jar!/org/springframework/util/Assert.java">
950   - <provider selected="true" editor-type-id="text-editor">
951   - <state vertical-scroll-proportion="0.0">
952   - <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
953   - </state>
954   - </provider>
955   - </entry>
956 1002 <entry file="file://$PROJECT_DIR$/src/main/webapp/error.jsp">
957 1003 <provider selected="true" editor-type-id="text-editor">
958 1004 <state vertical-scroll-proportion="0.0">
... ... @@ -1238,14 +1284,6 @@
1238 1284 <state />
1239 1285 </provider>
1240 1286 </entry>
1241   - <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
1242   - <provider selected="true" editor-type-id="text-editor">
1243   - <state vertical-scroll-proportion="0.0">
1244   - <caret line="52" column="3" selection-start-line="52" selection-start-column="3" selection-end-line="52" selection-end-column="3" />
1245   - <folding />
1246   - </state>
1247   - </provider>
1248   - </entry>
1249 1287 <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
1250 1288 <provider selected="true" editor-type-id="text-editor">
1251 1289 <state vertical-scroll-proportion="-3.75">
... ... @@ -1296,11 +1334,27 @@
1296 1334 </entry>
1297 1335 <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
1298 1336 <provider selected="true" editor-type-id="text-editor">
1299   - <state vertical-scroll-proportion="1.9126016">
  1337 + <state vertical-scroll-proportion="-61.083332">
1300 1338 <caret line="191" column="20" selection-start-line="191" selection-start-column="20" selection-end-line="191" selection-end-column="20" />
1301 1339 <folding />
1302 1340 </state>
1303 1341 </provider>
1304 1342 </entry>
  1343 + <entry file="file://$PROJECT_DIR$/pom.xml">
  1344 + <provider selected="true" editor-type-id="text-editor">
  1345 + <state vertical-scroll-proportion="0.0">
  1346 + <caret line="112" column="36" selection-start-line="112" selection-start-column="36" selection-end-line="112" selection-end-column="36" />
  1347 + <folding />
  1348 + </state>
  1349 + </provider>
  1350 + </entry>
  1351 + <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
  1352 + <provider selected="true" editor-type-id="text-editor">
  1353 + <state vertical-scroll-proportion="0.24150269">
  1354 + <caret line="9" column="58" selection-start-line="9" selection-start-column="58" selection-end-line="9" selection-end-column="58" />
  1355 + <folding />
  1356 + </state>
  1357 + </provider>
  1358 + </entry>
1305 1359 </component>
1306 1360 </project>
1307 1361 \ No newline at end of file
... ...