From 82a1502018b73fb1ce43014578d7c546f3a32589 Mon Sep 17 00:00:00 2001
From: zifangsky <admin@zifangsky.cn>
Date: Fri, 22 Dec 2017 16:02:02 +0800
Subject: [PATCH] fix a bug

---
 .classpath                                 | 33 +++++++++++++++++
 .gitignore                                 |  2 +-
 .project                                   | 43 ++++++++++++++++++++++
 .settings/org.sonar.ide.eclipse.core.prefs |  5 +++
 WebContent/META-INF/MANIFEST.MF            |  3 ++
 WebContent/WEB-INF/faces-config.xml        |  8 ++++
 WebContent/WEB-INF/web.xml                 | 13 +++++++
 config.cfg                                 |  6 +--
 pom.xml                                    | 14 -------
 src/main/java/com/deem/zkui/dao/Dao.java   |  2 +-
 10 files changed, 110 insertions(+), 19 deletions(-)
 create mode 100644 .classpath
 create mode 100644 .project
 create mode 100644 .settings/org.sonar.ide.eclipse.core.prefs
 create mode 100644 WebContent/META-INF/MANIFEST.MF
 create mode 100644 WebContent/WEB-INF/faces-config.xml
 create mode 100644 WebContent/WEB-INF/web.xml

diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..5124134
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.gitignore b/.gitignore
index a0d350f..51018da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 .idea/
 zkui.iml
-/target/
+/target/
\ No newline at end of file
diff --git a/.project b/.project
new file mode 100644
index 0000000..73e81c0
--- /dev/null
+++ b/.project
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>zkui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.sonar.ide.eclipse.core.sonarNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/org.sonar.ide.eclipse.core.prefs b/.settings/org.sonar.ide.eclipse.core.prefs
new file mode 100644
index 0000000..2ebfe67
--- /dev/null
+++ b/.settings/org.sonar.ide.eclipse.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+extraProperties=
+projectKey=com.deem\:zkui
+serverUrl=
+version=2
diff --git a/WebContent/META-INF/MANIFEST.MF b/WebContent/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..254272e
--- /dev/null
+++ b/WebContent/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+
diff --git a/WebContent/WEB-INF/faces-config.xml b/WebContent/WEB-INF/faces-config.xml
new file mode 100644
index 0000000..e5deaf7
--- /dev/null
+++ b/WebContent/WEB-INF/faces-config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config
+    xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd"
+    version="2.2">
+
+</faces-config>
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
new file mode 100644
index 0000000..621c3bf
--- /dev/null
+++ b/WebContent/WEB-INF/web.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
+  <display-name>zkui</display-name>
+  <servlet>
+    <servlet-name>Faces Servlet</servlet-name>
+    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Faces Servlet</servlet-name>
+    <url-pattern>/faces/*</url-pattern>
+  </servlet-mapping>
+</web-app>
\ No newline at end of file
diff --git a/config.cfg b/config.cfg
index ec7154f..ade3169 100644
--- a/config.cfg
+++ b/config.cfg
@@ -1,7 +1,7 @@
 #Server Port
-serverPort=9090
+serverPort=6060
 #Comma seperated list of all the zookeeper servers
-zkServer=localhost:2181,localhost:2181
+zkServer=192.168.1.232:6001,192.168.1.233:6001,192.168.1.234:6001
 #Http path of the repository. Ignore if you dont intent to upload files from repository.
 scmRepo=http://myserver.com/@rev1=
 #Path appended to the repo url. Ignore if you dont intent to upload files from repository.
@@ -13,7 +13,7 @@ ldapDomain=mycompany,mydomain
 ldapUrl=ldap://<ldap_host>:<ldap_port>/dc=mycom,dc=com
 #Specific roles for ldap authenticated users. Ignore if using file based authentication.
 ldapRoleSet={"users": [{ "username":"domain\\user1" , "role": "ADMIN" }]}
-userSet = {"users": [{ "username":"admin" , "password":"manager","role": "ADMIN" },{ "username":"appconfig" , "password":"appconfig","role": "USER" }]}
+userSet = {"users": [{ "username":"admin" , "password":"admin","role": "ADMIN" },{ "username":"appconfig" , "password":"appconfig","role": "USER" }]}
 #Set to prod in production and dev in local. Setting to dev will clear history each time.
 env=prod
 jdbcClass=org.h2.Driver
diff --git a/pom.xml b/pom.xml
index 92c0fba..bce5e4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,20 +131,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.javalite</groupId>
-                <artifactId>activejdbc-instrumentation</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>instrument</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            
         </plugins>
     </build>
 </project>
diff --git a/src/main/java/com/deem/zkui/dao/Dao.java b/src/main/java/com/deem/zkui/dao/Dao.java
index ddfa0c6..378fe54 100644
--- a/src/main/java/com/deem/zkui/dao/Dao.java
+++ b/src/main/java/com/deem/zkui/dao/Dao.java
@@ -28,7 +28,7 @@
 
 public class Dao {
     
-    private final static Integer FETCH_LIMIT = 50;
+    private final static Long FETCH_LIMIT = 50l;
     private final static org.slf4j.Logger logger = LoggerFactory.getLogger(Dao.class);
     private final Properties globalProps;