Commits

Juan Carlos Picado Herrera committed 76a1dbe Merge

Merge branch 'dianmorales' into juanpicado

Comments (0)

Files changed (2)

encuestame-business/src/main/resources/org/encuestame/business/sqlscripts/mysql/install/demo.sql

 -- Username: demo
 -- Password: 12345
 -- Email: encuestamedemo@gmail.com
-INSERT INTO `userAccount` (`uid`, `name`, `date_new`, `invite_code`, `password`, `email`, `status`, `twitter`, `username`, `account_uid`, `last_ip_logged`, `last_time_logged`) VALUES
-(1, 'Demo User', '2010-01-20 12:47:40', '', '6xAX8siGWDJXfkJUVxWLqsk0rz8U+aG6Y8yA1IokxuhEIZ8+RugleJtLUYbdGxc+', 'encuestamedemo@gmail.com', ' ', NULL, 'demo', 1, NULL, '2010-09-26 10:07:25');
+INSERT INTO `userAccount` (`uid`, `name`, `date_new`, `invite_code`, `password`, `email`, `twitter`, `username`, `account_uid`, `last_ip_logged`, `last_time_logged`) VALUES
+(1, 'Demo User', '2010-01-20 12:47:40', '', '6xAX8siGWDJXfkJUVxWLqsk0rz8U+aG6Y8yA1IokxuhEIZ8+RugleJtLUYbdGxc+', 'encuestamedemo@gmail.com', NULL, 'demo', 1, NULL, '2010-09-26 10:07:25');
 
 
 -- Default Permissions

encuestame-war/pom.xml

         <dependency>
           <groupId>commons-dbcp</groupId>
           <artifactId>commons-dbcp</artifactId>
-          <version>1.4</version>
         </dependency>
     </dependencies>