Index: hise-fe/pom.xml
===================================================================
--- hise-fe/pom.xml (revision 1000326)
+++ hise-fe/pom.xml (working copy)
@@ -45,6 +45,13 @@
hise-ws-client
${project.version}
+
+
+ com.h2database
+ h2
+ 1.2.143
+ runtime
+
Property changes on: hise-fe\pom.xml
___________________________________________________________________
Added: svn:eol-style
+ native
Index: hise-fe/src/main/resources/security.xml
===================================================================
--- hise-fe/src/main/resources/security.xml (revision 1000326)
+++ hise-fe/src/main/resources/security.xml (working copy)
@@ -8,13 +8,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Property changes on: hise-fe\src\main\resources\security.xml
___________________________________________________________________
Added: svn:eol-style
+ native
Index: hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java
===================================================================
--- hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java (revision 1000326)
+++ hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java (working copy)
@@ -33,7 +33,7 @@
/**
* Task Assignee - member of generic human role.
- * @author Witek Wołejszo
+ * @author Witek Wo?ejszo
*/
@Entity
@Table(name = "HISE_ENTITY")
@@ -51,6 +51,8 @@
private TaskOrgEntity.OrgEntityType type;
private String userPassword;
+ private String role;
+ private boolean enabled;
@OneToMany(cascade = {CascadeType.ALL})
@JoinTable(name="HISE_USER_GROUPS")
@@ -90,6 +92,22 @@
this.type = type;
}
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ public void setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ }
+
+ public String getRole() {
+ return role;
+ }
+
+ public void setRole(String role) {
+ this.role=role;
+ }
+
@Override
public Object[] getKeys() {
return new Object[] {name} ;
Index: hise-web/pom.xml
===================================================================
--- hise-web/pom.xml (revision 1000326)
+++ hise-web/pom.xml (working copy)
@@ -23,7 +23,7 @@
com.h2database
h2
- 1.1.108
+ 1.2.143
runtime