Browse Source

Netbeans сделака

Кинетик 5 years ago
parent
commit
328ebddd61

+ 16 - 0
.classpath

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Spring-4.3.4.RELEASE"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Spring MVC-4.3.4.RELEASE"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Hibernate 5.2.3-5.2.3"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/com.mysql.jdbc_5.1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jstl-1.2"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jquery-latest"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/gson-2.2.2"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jQuery-2.0.0"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jstl"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/com.fasterxml.jackson.core:jackson-core:2.8.5"/>
+	<classpathentry kind="output" path="out/production/MephorceAuth"/>
+</classpath>

+ 2 - 2
.idea/dataSources.xml

@@ -32,10 +32,10 @@
       </driver-properties>
       <libraries>
         <library>
-          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/mysql-connector-license.txt</url>
+          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-license.txt</url>
         </library>
         <library>
-          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/mysql-connector-java-5.1.35-bin.jar</url>
+          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-java-5.1.35-bin.jar</url>
         </library>
       </libraries>
     </data-source>

+ 250 - 208
.idea/dataSources/4eb729b2-843d-44b4-aab0-d35125e95ae3.xml

@@ -1,239 +1,281 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dataSource name="hibernate.cfg.xml/Hibernate">
-  <database-model serializer="dbm" rdbms="MYSQL" format-version="2.6">
-    <schema id="1" name="anketa">
-      <visible>1</visible>
+  <database-model serializer="dbm" rdbms="MYSQL" format-version="4.0">
+    <root id="1"/>
+    <schema id="2" parent="1" name="anketa">
+      <Current>1</Current>
+      <Visible>1</Visible>
     </schema>
-    <schema id="2" name="information_schema"/>
-    <schema id="3" name="mysql"/>
-    <schema id="4" name="performance_schema"/>
-    <schema id="5" name="sakila"/>
-    <schema id="6" name="sys"/>
-    <schema id="7" name="test1"/>
-    <schema id="8" name="test_db"/>
-    <schema id="9" name="world"/>
-    <table id="10" parent="1" name="clients"/>
-    <table id="11" parent="1" name="groups"/>
-    <table id="12" parent="1" name="moderators"/>
-    <table id="13" parent="1" name="projects"/>
-    <table id="14" parent="1" name="st_pr"/>
-    <table id="15" parent="1" name="students"/>
-    <table id="16" parent="1" name="users"/>
-    <column id="17" parent="10" name="client_id">
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="18" parent="10" name="cl_family">
-      <data-type>varchar(45)|0</data-type>
-    </column>
-    <column id="19" parent="10" name="cl_first_name">
-      <data-type>varchar(45)|0</data-type>
-    </column>
-    <column id="20" parent="10" name="cl_sec_name">
-      <data-type>varchar(45)|0</data-type>
-    </column>
-    <column id="21" parent="10" name="cl_password">
-      <data-type>varchar(45)|0</data-type>
-    </column>
-    <key id="22" parent="10" name="PRIMARY">
-      <columns>client_id</columns>
-      <primary>1</primary>
+    <schema id="3" parent="1" name="information_schema"/>
+    <schema id="4" parent="1" name="mysql"/>
+    <schema id="5" parent="1" name="performance_schema"/>
+    <schema id="6" parent="1" name="sakila"/>
+    <schema id="7" parent="1" name="sys"/>
+    <schema id="8" parent="1" name="world"/>
+    <table id="9" parent="2" name="clients"/>
+    <table id="10" parent="2" name="groups"/>
+    <table id="11" parent="2" name="moderators"/>
+    <table id="12" parent="2" name="projects"/>
+    <table id="13" parent="2" name="st_pr"/>
+    <table id="14" parent="2" name="students"/>
+    <table id="15" parent="2" name="users"/>
+    <column id="16" parent="9" name="client_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="17" parent="9" name="cl_family">
+      <Position>2</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="18" parent="9" name="cl_first_name">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="19" parent="9" name="cl_sec_name">
+      <Position>4</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="20" parent="9" name="cl_password">
+      <Position>5</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <key id="21" parent="9" name="PRIMARY">
+      <ColNames>client_id</ColNames>
+      <Primary>1</Primary>
     </key>
-    <column id="23" parent="11" name="group_id">
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="24" parent="11" name="group_name">
-      <data-type>varchar(45)|0</data-type>
-    </column>
-    <column id="25" parent="11" name="year">
-      <data-type>varchar(45)|0</data-type>
-    </column>
-    <key id="26" parent="11" name="PRIMARY">
-      <columns>group_id</columns>
-      <primary>1</primary>
+    <column id="22" parent="10" name="group_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="23" parent="10" name="group_name">
+      <Position>2</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="24" parent="10" name="year">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <key id="25" parent="10" name="PRIMARY">
+      <ColNames>group_id</ColNames>
+      <Primary>1</Primary>
     </key>
-    <column id="27" parent="12" name="mod_id">
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="28" parent="12" name="mod_family">
-      <data-type>varchar(45)|0</data-type>
-    </column>
-    <column id="29" parent="12" name="mod_first_name">
-      <data-type>varchar(45)|0</data-type>
-    </column>
-    <column id="30" parent="12" name="mod_sec_name">
-      <data-type>varchar(45)|0</data-type>
-    </column>
-    <column id="31" parent="12" name="mod_password">
-      <data-type>varchar(45)|0</data-type>
-    </column>
-    <column id="32" parent="12" name="mod_birthdate">
-      <data-type>varchar(255)|0</data-type>
-      <default-expression>&apos;11.11.2011&apos;</default-expression>
-    </column>
-    <column id="33" parent="12" name="mod_email">
-      <data-type>varchar(255)|0</data-type>
-      <default-expression>&apos;pochta@mail.ru&apos;</default-expression>
-    </column>
-    <column id="34" parent="12" name="mod_hometown">
-      <data-type>varchar(255)|0</data-type>
-      <default-expression>&apos;Город&apos;</default-expression>
-    </column>
-    <column id="35" parent="12" name="mod_phone">
-      <data-type>varchar(255)|0</data-type>
-      <default-expression>&apos;0000000000&apos;</default-expression>
-    </column>
-    <key id="36" parent="12" name="PRIMARY">
-      <columns>mod_id</columns>
-      <primary>1</primary>
+    <column id="26" parent="11" name="mod_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="27" parent="11" name="mod_family">
+      <Position>2</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="28" parent="11" name="mod_first_name">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="29" parent="11" name="mod_sec_name">
+      <Position>4</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="30" parent="11" name="mod_password">
+      <Position>5</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="31" parent="11" name="mod_birthdate">
+      <Position>6</Position>
+      <DataType>varchar(255)|0</DataType>
+      <DefaultExpression>&apos;11.11.2011&apos;</DefaultExpression>
+    </column>
+    <column id="32" parent="11" name="mod_email">
+      <Position>7</Position>
+      <DataType>varchar(255)|0</DataType>
+      <DefaultExpression>&apos;pochta@mail.ru&apos;</DefaultExpression>
+    </column>
+    <column id="33" parent="11" name="mod_hometown">
+      <Position>8</Position>
+      <DataType>varchar(255)|0</DataType>
+      <DefaultExpression>&apos;Город&apos;</DefaultExpression>
+    </column>
+    <column id="34" parent="11" name="mod_phone">
+      <Position>9</Position>
+      <DataType>varchar(255)|0</DataType>
+      <DefaultExpression>&apos;0000000000&apos;</DefaultExpression>
+    </column>
+    <key id="35" parent="11" name="PRIMARY">
+      <ColNames>mod_id</ColNames>
+      <Primary>1</Primary>
     </key>
-    <column id="37" parent="13" name="pr_id">
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <sequence-identity>1</sequence-identity>
-    </column>
-    <column id="38" parent="13" name="title">
-      <data-type>varchar(45)|0</data-type>
-    </column>
-    <column id="39" parent="13" name="description">
-      <data-type>varchar(45)|0</data-type>
-    </column>
-    <column id="40" parent="13" name="date_of_creation">
-      <mandatory>1</mandatory>
-      <data-type>timestamp|0</data-type>
-      <default-expression>CURRENT_TIMESTAMP</default-expression>
-    </column>
-    <column id="41" parent="13" name="status">
-      <data-type>varchar(45)|0</data-type>
-    </column>
-    <column id="42" parent="13" name="date_of_ready">
-      <data-type>date|0</data-type>
-    </column>
-    <column id="43" parent="13" name="sum">
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="44" parent="13" name="mod_id">
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="45" parent="13" name="client_id">
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="46" parent="13" name="jsondata">
-      <data-type>varchar(255)|0</data-type>
-      <default-expression>&apos;[]&apos;</default-expression>
-    </column>
-    <index id="47" parent="13" name="FK_ffb6klvqmnwust69pdfgau69i">
-      <columns>client_id</columns>
-      <desc-columns></desc-columns>
+    <column id="36" parent="12" name="pr_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+      <SequenceIdentity>1</SequenceIdentity>
+    </column>
+    <column id="37" parent="12" name="title">
+      <Position>2</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="38" parent="12" name="description">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="39" parent="12" name="date_of_creation">
+      <Position>4</Position>
+      <DataType>timestamp|0</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>CURRENT_TIMESTAMP</DefaultExpression>
+    </column>
+    <column id="40" parent="12" name="status">
+      <Position>5</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="41" parent="12" name="date_of_ready">
+      <Position>6</Position>
+      <DataType>date|0</DataType>
+    </column>
+    <column id="42" parent="12" name="sum">
+      <Position>7</Position>
+      <DataType>int(11)|0</DataType>
+    </column>
+    <column id="43" parent="12" name="mod_id">
+      <Position>8</Position>
+      <DataType>int(11)|0</DataType>
+    </column>
+    <column id="44" parent="12" name="client_id">
+      <Position>9</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="45" parent="12" name="jsondata">
+      <Position>10</Position>
+      <DataType>varchar(255)|0</DataType>
+      <DefaultExpression>&apos;[]&apos;</DefaultExpression>
+    </column>
+    <index id="46" parent="12" name="FK_ffb6klvqmnwust69pdfgau69i">
+      <ColNames>client_id</ColNames>
     </index>
-    <index id="48" parent="13" name="pr_modFK_idx">
-      <columns>mod_id</columns>
-      <desc-columns></desc-columns>
+    <index id="47" parent="12" name="pr_modFK_idx">
+      <ColNames>mod_id</ColNames>
     </index>
-    <key id="49" parent="13" name="PRIMARY">
-      <columns>pr_id</columns>
-      <primary>1</primary>
+    <key id="48" parent="12" name="PRIMARY">
+      <ColNames>pr_id</ColNames>
+      <Primary>1</Primary>
     </key>
-    <foreign-key id="50" parent="13" name="pr_modFK">
-      <columns>mod_id</columns>
-      <ref-key>~.moderators.PRIMARY</ref-key>
-      <cascade-update-rule>no_action</cascade-update-rule>
-      <cascade-delete-rule>no_action</cascade-delete-rule>
+    <foreign-key id="49" parent="12" name="pr_modFK">
+      <ColNames>mod_id</ColNames>
+      <RefSchemaName>anketa</RefSchemaName>
+      <RefTableName>moderators</RefTableName>
+      <RefKeyName>PRIMARY</RefKeyName>
+      <RefColNames>mod_id</RefColNames>
+      <OnUpdate>no-action</OnUpdate>
+      <OnDelete>no-action</OnDelete>
     </foreign-key>
-    <foreign-key id="51" parent="13" name="FK_ffb6klvqmnwust69pdfgau69i">
-      <columns>client_id</columns>
-      <ref-key>~.clients.PRIMARY</ref-key>
-      <cascade-update-rule>restrict</cascade-update-rule>
-      <cascade-delete-rule>restrict</cascade-delete-rule>
+    <foreign-key id="50" parent="12" name="FK_ffb6klvqmnwust69pdfgau69i">
+      <ColNames>client_id</ColNames>
+      <RefSchemaName>anketa</RefSchemaName>
+      <RefTableName>clients</RefTableName>
+      <RefKeyName>PRIMARY</RefKeyName>
+      <RefColNames>client_id</RefColNames>
     </foreign-key>
-    <column id="52" parent="14" name="id">
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
+    <column id="51" parent="13" name="id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
     </column>
-    <column id="53" parent="14" name="st_id">
-      <data-type>int(11)|0</data-type>
+    <column id="52" parent="13" name="st_id">
+      <Position>2</Position>
+      <DataType>int(11)|0</DataType>
     </column>
-    <column id="54" parent="14" name="pr_id">
-      <data-type>int(11)|0</data-type>
+    <column id="53" parent="13" name="pr_id">
+      <Position>3</Position>
+      <DataType>int(11)|0</DataType>
     </column>
-    <index id="55" parent="14" name="prFK_idx">
-      <columns>pr_id</columns>
-      <desc-columns></desc-columns>
+    <index id="54" parent="13" name="prFK_idx">
+      <ColNames>pr_id</ColNames>
     </index>
-    <index id="56" parent="14" name="stFK_idx">
-      <columns>st_id</columns>
-      <desc-columns></desc-columns>
+    <index id="55" parent="13" name="stFK_idx">
+      <ColNames>st_id</ColNames>
     </index>
-    <key id="57" parent="14" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
+    <key id="56" parent="13" name="PRIMARY">
+      <ColNames>id</ColNames>
+      <Primary>1</Primary>
     </key>
-    <foreign-key id="58" parent="14" name="stFK">
-      <columns>st_id</columns>
-      <ref-key>~.students.PRIMARY</ref-key>
-      <cascade-update-rule>no_action</cascade-update-rule>
-      <cascade-delete-rule>no_action</cascade-delete-rule>
+    <foreign-key id="57" parent="13" name="stFK">
+      <ColNames>st_id</ColNames>
+      <RefSchemaName>anketa</RefSchemaName>
+      <RefTableName>students</RefTableName>
+      <RefKeyName>PRIMARY</RefKeyName>
+      <RefColNames>students_id</RefColNames>
+      <OnUpdate>no-action</OnUpdate>
+      <OnDelete>no-action</OnDelete>
     </foreign-key>
-    <foreign-key id="59" parent="14" name="prFK">
-      <columns>pr_id</columns>
-      <ref-key>~.projects.PRIMARY</ref-key>
-      <cascade-update-rule>no_action</cascade-update-rule>
-      <cascade-delete-rule>no_action</cascade-delete-rule>
+    <foreign-key id="58" parent="13" name="prFK">
+      <ColNames>pr_id</ColNames>
+      <RefSchemaName>anketa</RefSchemaName>
+      <RefTableName>projects</RefTableName>
+      <RefKeyName>PRIMARY</RefKeyName>
+      <RefColNames>pr_id</RefColNames>
+      <OnUpdate>no-action</OnUpdate>
+      <OnDelete>no-action</OnDelete>
     </foreign-key>
-    <column id="60" parent="15" name="students_id">
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
+    <column id="59" parent="14" name="students_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
     </column>
-    <column id="61" parent="15" name="group_id">
-      <data-type>int(11)|0</data-type>
+    <column id="60" parent="14" name="group_id">
+      <Position>2</Position>
+      <DataType>int(11)|0</DataType>
     </column>
-    <column id="62" parent="15" name="st_family">
-      <data-type>varchar(45)|0</data-type>
+    <column id="61" parent="14" name="st_family">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="63" parent="15" name="st_first_name">
-      <data-type>varchar(45)|0</data-type>
+    <column id="62" parent="14" name="st_first_name">
+      <Position>4</Position>
+      <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="64" parent="15" name="st_sec_name">
-      <data-type>varchar(45)|0</data-type>
+    <column id="63" parent="14" name="st_sec_name">
+      <Position>5</Position>
+      <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="65" parent="15" name="st_pk_number">
-      <data-type>varchar(45)|0</data-type>
+    <column id="64" parent="14" name="st_pk_number">
+      <Position>6</Position>
+      <DataType>varchar(45)|0</DataType>
     </column>
-    <index id="66" parent="15" name="stud_groupFK_idx">
-      <columns>group_id</columns>
-      <desc-columns></desc-columns>
+    <index id="65" parent="14" name="stud_groupFK_idx">
+      <ColNames>group_id</ColNames>
     </index>
-    <key id="67" parent="15" name="PRIMARY">
-      <columns>students_id</columns>
-      <primary>1</primary>
+    <key id="66" parent="14" name="PRIMARY">
+      <ColNames>students_id</ColNames>
+      <Primary>1</Primary>
     </key>
-    <foreign-key id="68" parent="15" name="stud_groupFK">
-      <columns>group_id</columns>
-      <ref-key>~.groups.PRIMARY</ref-key>
-      <cascade-update-rule>no_action</cascade-update-rule>
-      <cascade-delete-rule>no_action</cascade-delete-rule>
+    <foreign-key id="67" parent="14" name="stud_groupFK">
+      <ColNames>group_id</ColNames>
+      <RefSchemaName>anketa</RefSchemaName>
+      <RefTableName>groups</RefTableName>
+      <RefKeyName>PRIMARY</RefKeyName>
+      <RefColNames>group_id</RefColNames>
+      <OnUpdate>no-action</OnUpdate>
+      <OnDelete>no-action</OnDelete>
     </foreign-key>
-    <column id="69" parent="16" name="user_id">
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="70" parent="16" name="user_login">
-      <data-type>varchar(45)|0</data-type>
-    </column>
-    <column id="71" parent="16" name="user_password">
-      <data-type>varchar(45)|0</data-type>
-    </column>
-    <column id="72" parent="16" name="enabled">
-      <mandatory>1</mandatory>
-      <data-type>tinyint(4)|0</data-type>
-      <default-expression>&apos;1&apos;</default-expression>
-    </column>
-    <key id="73" parent="16" name="PRIMARY">
-      <columns>user_id</columns>
-      <primary>1</primary>
+    <column id="68" parent="15" name="user_id">
+      <Position>1</Position>
+      <DataType>int(11)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="69" parent="15" name="user_login">
+      <Position>2</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <column id="70" parent="15" name="user_password">
+      <Position>3</Position>
+      <DataType>varchar(45)|0</DataType>
+    </column>
+    <key id="71" parent="15" name="PRIMARY">
+      <ColNames>user_id</ColNames>
+      <Primary>1</Primary>
     </key>
   </database-model>
 </dataSource>

+ 15 - 0
.project

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>MephorceAuth</name>
+	<comment/>
+	<projects/>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments/>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

+ 16 - 0
MephorceAuth.eml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component inherit-compiler-output="true" inheritJdk="true">
+	<output-test url="file://$MODULE_DIR$/out/test/MephorceAuth"/>
+	<exclude-output/>
+	<contentEntry url="file://$MODULE_DIR$"/>
+	<levels>
+		<level name="Spring-4.3.4.RELEASE" value="project"/>
+		<level name="Spring MVC-4.3.4.RELEASE" value="project"/>
+		<level name="Hibernate 5.2.3-5.2.3" value="project"/>
+		<level name="com.mysql.jdbc_5.1.5" value="project"/>
+		<level name="jstl-1.2" value="project"/>
+		<level name="gson-2.2.2" value="project"/>
+		<level name="jstl" value="project"/>
+		<level name="com.fasterxml.jackson.core:jackson-core:2.8.5" value="project"/>
+	</levels>
+</component>

+ 1 - 19
MephorceAuth.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
+<module classpath="eclipse" classpath-dir="$MODULE_DIR$" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="web" name="Web">
       <configuration>
@@ -36,22 +36,4 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Spring-4.3.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Spring MVC-4.3.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Hibernate 5.2.3-5.2.3" level="project" />
-    <orderEntry type="library" name="com.mysql.jdbc_5.1.5" level="project" />
-    <orderEntry type="library" name="jstl-1.2" level="project" />
-    <orderEntry type="library" name="jquery-latest" level="application" />
-    <orderEntry type="library" name="gson-2.2.2" level="project" />
-    <orderEntry type="library" name="jQuery-2.0.0" level="application" />
-    <orderEntry type="library" name="jstl" level="project" />
-    <orderEntry type="library" name="com.fasterxml.jackson.core:jackson-core:2.8.5" level="project" />
-  </component>
 </module>

+ 1 - 1
web/WEB-INF/views/loginViews/studentBar.jsp

@@ -20,7 +20,7 @@
         <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
     </style>
     <script type="text/javascript"
-            src="<c:url value='/WEB-INF/lib/jquery-3.1.1.min.js' />"></script>
+            src="<c:url value='/WEB-INF/lib/jquery-3.1.1.js' />"></script>
 
     <c:url var="getGroups" value="/loadGroups" />
     <script type="text/javascript">