Skip to content

Commit

Permalink
Tutto aggiustato
Browse files Browse the repository at this point in the history
  • Loading branch information
giorgio-ciacchella committed Dec 1, 2013
1 parent 5c52e11 commit e112a75
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .settings/org.jboss.ide.eclipse.as.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.jboss.ide.eclipse.as.core.singledeployable.deployableList=
2 changes: 1 addition & 1 deletion src/main/java/ai/server/config/MvcConfiguration.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import dati.Dati;

@Configuration
@ComponentScan(basePackages="ai.supermarket")
@ComponentScan(basePackages="ai.server")
@EnableWebMvc
@ImportResource("classpath:spring-security.xml")
public class MvcConfiguration extends WebMvcConfigurerAdapter{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/beans.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

</bean>

<bean id="mail" class="ai.supermarket.controller.Mail">
<bean id="mail" class="ai.server.controller.Mail">
<property name="mailSender" ref="mailSender"></property>
</bean>
</beans>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/spring-security.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</http>


<beans:bean id="customUserDetailService" class="ai.supermarket.controller.CustomUserDetailsService"></beans:bean>
<beans:bean id="customUserDetailService" class="ai.server.controller.CustomUserDetailsService"></beans:bean>

<authentication-manager>
<authentication-provider user-service-ref="customUserDetailService">
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</init-param>
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>ai.supermarket</param-value>
<param-value>ai.server</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
Expand All @@ -44,7 +44,7 @@

<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>ai.supermarket.config</param-value>
<param-value>ai.server.config</param-value>
</context-param>
<filter>
<filter-name>springSecurityFilterChain</filter-name>
Expand Down

0 comments on commit e112a75

Please sign in to comment.