Commits

Juan Carlos Picado Herrera committed 4187165

Trying to resolve classpath issue

Comments (0)

Files changed (5)

 encuestame-war/src/main/webapp/resource/js/dijit/
 encuestame-war/src/main/webapp/resource/js/dojox/
 encuestame-war/src/main/webapp/resource/js/dojo/
-encuestame-war/src/main/webapp/resource/js/org/
+encuestame-war/src/main/webapp/resource/js/org/
+encuestame-config-custom.properties
+encuestame-war/src/main/resources/encuestame-config-custom.properties

encuestame-business/src/main/resources/org/encuestame/business/config/encuestame-config.properties

 spring.sec.encrypt.password.key=password
 sec.suspendedNotification = true
 sec.forceLogin = true
-sec.reCaptcha = ${encuestame.recaptcha}
+sec.reCaptcha = true
 
 #--------------------------------------------------------------------------------
 # Required app config.
 # default app encoding
 application.encoding = UTF-8
 # google maps key
-application.apiKeygoogle = ${google.maps.key}
+application.apiKeygoogle = xxxxx
 # this is default domain, is used on vote support and short url operations.
 application.domain = http://localhost:8080/
 # default small logo app

encuestame-war/pom.xml

     <packaging>war</packaging>
     <name>encuestame war</name>
     <build>
+    <filters>
+            <filter>../env/${env}.properties</filter>
+       </filters>
     <finalName>encuestame-${project.version}-beta</finalName>
     <plugins>
         <plugin>
                 <includes>
                     <include>*.*</include>
                 </includes>
-                <excludes>
-                    <exclude>encuestame-config-custom.properties</exclude>
-                </excludes>
                 <filtering>true</filtering>
             </resource>
         </resources>
-        <filters>
-            <filter>../env/${env}.properties</filter>
-        </filters>
     </build>
     <dependencies>
         <dependency>
             <artifactId>ehcache-spring-annotations</artifactId>
         </dependency>
     </dependencies>
-
-    <repositories>
-         <repository>
-             <id>local-project-repo</id>
-             <url>file:${basedir}/../lib/repository</url>
-         </repository>
-    </repositories>
-
 </project>

env/development.properties

 app.proxypass = false
 encuestame.properties.path=classpath:encuestame-config.properties
 encuestame.url=http://localhost:8080/encuestame/
-hibernate.datasource.user = postgres
+hibernate.datasource.user = sa
 hibernate.datasource.password=
-hibernate.datasource.classname=org.postgresql.Driver
-hibernate.datasource.dialect=org.hibernate.dialect.PostgreSQLDialect
+hibernate.datasource.classname=org.hsqldb.jdbcDriver
+hibernate.datasource.dialect=org.hibernate.dialect.HSQLDialect
 hibernate.datasource.showsql=false
-hibernate.datasource.hbm2ddl.auto=update
+hibernate.datasource.hbm2ddl.auto=create
 hibernate.datasource.delimited=
-hibernate.datasource.core.urldb=jdbc:postgresql://192.168.1.37/encuestame
-hibernate.datasource.junit.urldb=jdbc:postgresql://192.168.1.37/encuestame_test
+hibernate.datasource.core.urldb=jdbc:hsqldb:mem:encuestame_core
+hibernate.datasource.junit.urldb=jdbc:hsqldb:mem:encuestame_test
 hibernate.properties.path=classpath:hibernate.prod.properties
 hibernate.test.properties.path=classpath:hibernate.test.properties
 log4j.properties.path=classpath:log4j.properties
                 <env>development</env>
             </properties>
         </profile>
+ 	<profile>
+            <id>jpicado</id>
+            <properties>
+                <env>jpicado</env>
+            </properties>
+        </profile>
+	<profile>
+            <id>dmorales</id>
+            <properties>
+                <env>dmorales</env>
+            </properties>
+        </profile>
         <profile>
             <id>demo</id>
             <properties>