Mercurial Mercurial > renkan / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify, put everythong in the same property file
authorymh <ymh.work@gmail.com>
Fri, 05 Apr 2013 19:33:39 +0200
changeset 149 554a7b55c29a
parent 148 792ec58c2140
child 150 5b62100b8562
Simplify, put everythong in the same property file
server/src/main/webapp/WEB-INF/renkan.properties file | annotate | diff | comparison | revisions
server/src/main/webapp/WEB-INF/renkan_users.properties file | annotate | diff | comparison | revisions
server/src/main/webapp/WEB-INF/spring-security.xml file | annotate | diff | comparison | revisions 
--- a/server/src/main/webapp/WEB-INF/renkan.properties	Fri Apr 05 18:42:14 2013 +0200
+++ b/server/src/main/webapp/WEB-INF/renkan.properties	Fri Apr 05 19:33:39 2013 +0200
@@ -2,6 +2,10 @@
 mongodb.host.port = 27017
 mongodb.db.name = renkan
 
+user.admin.name = admin
+#user.admin.password = admin
+user.admin.password = 8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918
+
 renkan.pagination.size = 2
 renkan.coweb.debug = false
 renkan.coweb.websocket = true
\ No newline at end of file
--- a/server/src/main/webapp/WEB-INF/renkan_users.properties	Fri Apr 05 18:42:14 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-user.admin.name = admin
-#user.admin.password = admin
-user.admin.password = 8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918
\ No newline at end of file
--- a/server/src/main/webapp/WEB-INF/spring-security.xml	Fri Apr 05 18:42:14 2013 +0200
+++ b/server/src/main/webapp/WEB-INF/spring-security.xml	Fri Apr 05 19:33:39 2013 +0200
@@ -11,25 +11,26 @@
 		http://www.springframework.org/schema/util/spring-util-3.0.xsd"
 >
 
-    <util:properties id="userPropsLocations">
-        <prop key="servletContextUserProps">WEB-INF/renkan_users.properties</prop>
-        <prop key="classpathUserProps">classpath:renkan_users_run.properties</prop>
+    <util:properties id="propsLocations">
+        <prop key="servletContextProps">WEB-INF/renkan.properties</prop>
+        <prop key="classpathProps">classpath:renkan_run.properties</prop>
     </util:properties>
     
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
         <property name="order" value="1000"/>
-        <property name="location" value="#{userPropsLocations.servletContextUserProps}"/>
+        <property name="location" value="#{propsLocations.servletContextProps}"/>
         <property name="ignoreUnresolvablePlaceholders" value="true"/>
         <property name="IgnoreResourceNotFound" value="false"/>
     </bean> 
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
         <property name="order" value="1"/>
-        <property name="location" value="#{userPropsLocations.classpathUserProps}"/>
+        <property name="location" value="#{propsLocations.classpathProps}"/>
         <property name="ignoreUnresolvablePlaceholders" value="true"/>
         <property name="IgnoreResourceNotFound" value="true"/>
     </bean>    
  
-    <security:http>
+    <security:http>        
+        <security:intercept-url pattern="/admin" access="ROLE_ADMIN" />
         <security:intercept-url pattern="/admin/*" access="ROLE_ADMIN" />
         <security:http-basic />
     </security:http>
renkan