Updated packages to match spring boot

Author: dogeared

tutorials/spring/00-the-basics/src/main/java/com/stormpath/tutorial/WebAppInitializer.java

@@ -15,6 +15,7 @@
  */
 package com.stormpath.tutorial;
 
+import com.stormpath.tutorial.config.WebAppConfig;
 import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.context.ContextLoaderListener;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;

tutorials/spring/00-the-basics/src/main/java/com/stormpath/tutorial/WebAppConfig.java renamed to tutorials/spring/00-the-basics/src/main/java/com/stormpath/tutorial/config/WebAppConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.stormpath.tutorial;
+package com.stormpath.tutorial.config;
 
 import com.stormpath.sdk.application.Application;
 import com.stormpath.sdk.client.Client;
@@ -34,7 +34,7 @@
 @EnableWebMvc
 @EnableStormpath //Stormpath base beans
 @EnableStormpathWebMvc //Stormpath web mvc beans plus out-of-the-box views
-@ComponentScan
+@ComponentScan("com.stormpath.tutorial")
 @PropertySource("classpath:application.properties")
 public class WebAppConfig {
 

tutorials/spring/00-the-basics/src/main/java/com/stormpath/tutorial/HelloController.java renamed to tutorials/spring/00-the-basics/src/main/java/com/stormpath/tutorial/controller/HelloController.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.stormpath.tutorial;
+package com.stormpath.tutorial.controller;
 
 import com.stormpath.sdk.application.Application;
 import com.stormpath.sdk.servlet.application.ApplicationResolver;

tutorials/spring/01-some-access-controls/src/main/java/com/stormpath/tutorial/WebAppInitializer.java

@@ -15,6 +15,7 @@
  */
 package com.stormpath.tutorial;
 
+import com.stormpath.tutorial.config.WebAppConfig;
 import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.context.ContextLoaderListener;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;

tutorials/spring/01-some-access-controls/src/main/java/com/stormpath/tutorial/WebAppConfig.java renamed to tutorials/spring/01-some-access-controls/src/main/java/com/stormpath/tutorial/config/WebAppConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.stormpath.tutorial;
+package com.stormpath.tutorial.config;
 
 import com.stormpath.sdk.application.Application;
 import com.stormpath.sdk.client.Client;
@@ -34,7 +34,7 @@
 @EnableWebMvc
 @EnableStormpath //Stormpath base beans
 @EnableStormpathWebMvc //Stormpath web mvc beans plus out-of-the-box views
-@ComponentScan
+@ComponentScan("com.stormpath.tutorial")
 @PropertySource("classpath:application.properties")
 public class WebAppConfig {
 

tutorials/spring/01-some-access-controls/src/main/java/com/stormpath/tutorial/HelloController.java renamed to tutorials/spring/01-some-access-controls/src/main/java/com/stormpath/tutorial/controller/HelloController.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.stormpath.tutorial;
+package com.stormpath.tutorial.controller;
 
 import com.stormpath.sdk.servlet.account.AccountResolver;
 import org.springframework.stereotype.Controller;
@@ -29,13 +29,13 @@
 public class HelloController {
 
     @RequestMapping("/")
-    String home(HttpServletRequest req, Model model) {
+    public String home(HttpServletRequest req, Model model) {
         model.addAttribute("status", req.getParameter("status"));
         return "home";
     }
 
     @RequestMapping("/restricted")
-    String restricted(HttpServletRequest req) {
+    public String restricted(HttpServletRequest req) {
         if (AccountResolver.INSTANCE.getAccount(req) != null) {
             return "restricted";
         }

tutorials/spring/02-spring-security-ftw/src/main/java/com/stormpath/tutorial/WebAppInitializer.java

@@ -1,6 +1,7 @@
 package com.stormpath.tutorial;
 
 import com.stormpath.sdk.servlet.filter.StormpathFilter;
+import com.stormpath.tutorial.config.SpringSecurityWebAppConfig;
 import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer;
 import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.context.ContextLoaderListener;

tutorials/spring/02-spring-security-ftw/src/main/java/com/stormpath/tutorial/SpringSecurityWebAppConfig.java renamed to tutorials/spring/02-spring-security-ftw/src/main/java/com/stormpath/tutorial/config/SpringSecurityWebAppConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.stormpath.tutorial;
+package com.stormpath.tutorial.config;
 
 import com.stormpath.spring.config.EnableStormpathWebSecurity;
 import org.springframework.context.annotation.ComponentScan;
@@ -28,7 +28,7 @@
  * @since 1.3.0
  */
 @Configuration
-@ComponentScan
+@ComponentScan("com.stormpath.tutorial")
 @PropertySource("classpath:application.properties")
 @EnableStormpathWebSecurity
 public class SpringSecurityWebAppConfig extends WebSecurityConfigurerAdapter {

tutorials/spring/04-a-finer-grain-of-control/src/main/java/com/stormpath/tutorial/ErrorController.java renamed to tutorials/spring/02-spring-security-ftw/src/main/java/com/stormpath/tutorial/controller/ErrorController.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.stormpath.tutorial;
+package com.stormpath.tutorial.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

tutorials/spring/03-spring-security-refined/src/main/java/com/stormpath/tutorial/HelloController.java renamed to tutorials/spring/02-spring-security-ftw/src/main/java/com/stormpath/tutorial/controller/HelloController.java

@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.stormpath.tutorial;
+package com.stormpath.tutorial.controller;
 
 import com.stormpath.sdk.servlet.account.AccountResolver;
+import com.stormpath.tutorial.service.HelloService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;