Use xml / javaconfig folders for samples

Fixes gh-3752

samples/xml/aspectj/src/main/java/sample/aspectj/SecuredService.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2002-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sample.aspectj;
+
+import org.springframework.security.access.annotation.Secured;
+
+/**
+ * Service which is secured on the class level
+ *
+ * @author Mike Wiesner
+ * @since 3.0
+ */
+@Secured("ROLE_USER")
+public class SecuredService {
+
+	public void secureMethod() {
+		// nothing
+	}
+
+}

samples/xml/aspectj/src/main/java/sample/aspectj/Service.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2002-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sample.aspectj;
+
+import org.springframework.security.access.annotation.Secured;
+
+/**
+ * Service which is secured on method level
+ *
+ * @author Mike Wiesner
+ * @since 1.0
+ */
+public class Service {
+
+	@Secured("ROLE_USER")
+	public void secureMethod() {
+		// nothing
+	}
+
+	public void publicMethod() {
+		// nothing
+	}
+
+}

samples/xml/aspectj/src/main/resources/aspectj-context.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:sec="http://www.springframework.org/schema/security"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+						http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
+
+	<sec:global-method-security secured-annotations="enabled" mode="aspectj" />
+<!--
+	<bean id="aspectJSecurityInterceptor"
+		class="org.springframework.security.access.intercept.aspectj.AspectJMethodSecurityInterceptor">
+		<property name="authenticationManager" ref="authenticationManager" />
+		<property name="accessDecisionManager" ref="accessDecisionManager" />
+		<property name="securityMetadataSource">
+			<bean
+				class="org.springframework.security.access.annotation.SecuredAnnotationSecurityMetadataSource" />
+		</property>
+	</bean>
+
+	<bean id="authenticationManager"
+		class="org.springframework.security.authentication.ProviderManager">
+		<property name="providers">
+			<bean
+				class="org.springframework.security.authentication.TestingAuthenticationProvider" />
+		</property>
+	</bean>
+
+	<bean id="accessDecisionManager"
+		class="org.springframework.security.access.vote.AffirmativeBased">
+		<property name="decisionVoters">
+			<list>
+				<bean
+					class="org.springframework.security.access.vote.RoleVoter" />
+			</list>
+		</property>
+	</bean>
+
+	<bean
+		class="org.springframework.security.access.intercept.aspectj.aspect.AnnotationSecurityAspect"
+		factory-method="aspectOf">
+		<property name="securityInterceptor" ref="aspectJSecurityInterceptor" />
+	</bean>
+ -->
+	<bean class="sample.aspectj.Service" />
+
+	<bean class="sample.aspectj.SecuredService" />
+
+</beans>

samples/xml/aspectj/src/test/java/sample/aspectj/AspectJInterceptorTests.java

@@ -0,0 +1,96 @@
+/*
+ * Copyright 2002-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sample.aspectj;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath:aspectj-context.xml")
+public class AspectJInterceptorTests {
+	private Authentication admin = new UsernamePasswordAuthenticationToken("test", "xxx",
+			AuthorityUtils.createAuthorityList("ROLE_ADMIN"));
+	private Authentication user = new UsernamePasswordAuthenticationToken("test", "xxx",
+			AuthorityUtils.createAuthorityList("ROLE_USER"));
+
+	@Autowired
+	private Service service;
+
+	@Autowired
+	private SecuredService securedService;
+
+	@Test
+	public void testPublicMethod() throws Exception {
+		service.publicMethod();
+	}
+
+	@Test(expected = AuthenticationCredentialsNotFoundException.class)
+	public void testSecuredMethodNotAuthenticated() throws Exception {
+		service.secureMethod();
+	}
+
+	@Test(expected = AccessDeniedException.class)
+	public void testSecuredMethodWrongRole() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(admin);
+		service.secureMethod();
+	}
+
+	@Test
+	public void testSecuredMethodEverythingOk() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(user);
+		service.secureMethod();
+	}
+
+	@Test(expected = AuthenticationCredentialsNotFoundException.class)
+	public void testSecuredClassNotAuthenticated() throws Exception {
+		securedService.secureMethod();
+	}
+
+	@Test(expected = AccessDeniedException.class)
+	public void testSecuredClassWrongRole() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(admin);
+		securedService.secureMethod();
+	}
+
+	@Test(expected = AccessDeniedException.class)
+	public void testSecuredClassWrongRoleOnNewedInstance() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(admin);
+		new SecuredService().secureMethod();
+	}
+
+	@Test
+	public void testSecuredClassEverythingOk() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(user);
+		securedService.secureMethod();
+		new SecuredService().secureMethod();
+	}
+
+	@After
+	public void tearDown() {
+		SecurityContextHolder.clearContext();
+	}
+
+}

samples/xml/aspectj/src/test/resources/logback-test.xml

@@ -0,0 +1,14 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+	<encoder>
+	  <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+	</encoder>
+  </appender>
+
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
+
+  <root level="${root.level}:-WARN">
+	<appender-ref ref="STDOUT" />
+  </root>
+
+</configuration>