This commit is contained in:
Marcin Michalek committed 2014-06-10 08:23:12 +02:00
1 parent 78aaebc8bb
commit 92e67341b4
2 files changed
+3 -18

No files matched your search

+1 -18
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="D:\NFCapp_SERVER" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web Gradle : nfc_server-0.1.0.war">
<configuration>
@@ -12,23 +12,6 @@
</sourceRoots>
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration>
<fileset id="fileset" name="Spring Application Context" removed="false">
<file>file://$MODULE_DIR$/src/main/java/application/Config.java</file>
<file>file://$MODULE_DIR$/src/main/resources/Spring-Module.xml</file>
</fileset>
</configuration>
</facet>
<facet type="hibernate" name="Hibernate">
<configuration>
<datasource-map>
<unit-entry name="hibernate.cfg.xml" />
</datasource-map>
<naming-strategy-map />
<deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/src/main/resources/hibernate.cfg.xml" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
@@ -60,9 +60,11 @@ public class UserController {
//access codes
JSONArray accessCodes = new JSONArray();
// array of obejcts {role:role, code:code}
//message
JSONObject message = new JSONObject();
// {role:role, message:message}
loginResponse.put("accessCodes", accessCodes);
loginResponse.put("message", message);