/*
 * Copyright (c) 2015 Espark And ©Adarsh Development Services @copyright All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 *   - Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 *
 *   - Redistributions in binary form must reproduce the above copyright
 *     notice, this list of conditions and the following disclaimer in the
 *     documentation and/or other materials provided with the distribution.
 *
 *   - Neither the name of Espark nor the names of its
 *     contributors may be used to endorse or promote products derived
 *     from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
 * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
package com.heroku.config;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.web.SpringBootServletInitializer;
import org.springframework.context.annotation.ComponentScan;
/**
 * @author Adarsh Kumar
 * @author $LastChangedBy: Adarsh Kumar$
 * @version $Revision: 0001 $, $Date:: 1/1/10 0:00 AM#$
 * @Espark @copyright all right reserve
 */
@SpringBootApplication
@ComponentScan("com.heroku")
<<<<<<< HEAD
public class WebMvcJspApplication /*extends SpringBootServletInitializer*/ {
	private static  Logger LOGGER =  LoggerFactory.getLogger(WebMvcJspApplication.class);

	/*@Override
	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
		return application.sources(WebMvcJspApplication.class);
	}*/
=======
public class WebMvcJspApplication extends SpringBootServletInitializer {
	private static  Logger LOGGER =  LoggerFactory.getLogger(WebMvcJspApplication.class);


	@Override
	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
		return application.sources(WebMvcJspApplication.class);
	}
>>>>>>> origin/master

	public static void main(String[] args) throws Exception {
		LOGGER.info("Starting Main Application...");
		SpringApplication.run(WebMvcJspApplication.class, args);
<<<<<<< HEAD
		
=======
		 LOGGER.info("Access URLs: http://localhost:8080\n");
>>>>>>> origin/master
	}

}

@@ -2235,29 +2235,16 @@
 eroku%22)%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A
 public c
@@ -2566,359 +2566,8 @@
 %7D*/%0A
-=======%0Apublic class WebMvcJspApplication extends SpringBootServletInitializer %7B%0A%09private static  Logger LOGGER =  LoggerFactory.getLogger(WebMvcJspApplication.class);%0A%0A%0A%09@Override%0A%09protected SpringApplicationBuilder configure(SpringApplicationBuilder application) %7B%0A%09%09return application.sources(WebMvcJspApplication.class);%0A%09%7D%0A%3E%3E%3E%3E%3E%3E%3E origin/master%0A%0A
 %09pub
@@ -2731,109 +2731,9 @@
 s);%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A%09%09%0A=======%0A%09%09 LOGGER.info(%22Access URLs: http://localhost:8080%5Cn%22);%0A%3E%3E%3E%3E%3E%3E%3E origin/master
+%0A
 %0A%09%7D%0A

Update WebMvcJspApplication.java