iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5871 from eugenp/BAEL-9710-v2 

fix package name, start class
This commit is contained in:
Loredana Crusoveanu 2018-12-08 22:22:35 +02:00 committed by GitHub
parent 18f26db503 b51ae5b065
commit 0c96e90b6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-rest/pom.xml
View File

@ -183,9 +183,6 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -300,6 +297,7 @@
<json.path.version>2.2.0</json.path.version> <json.path.version>2.2.0</json.path.version>
<pact.version>3.5.11</pact.version> <pact.version>3.5.11</pact.version>
<rest-assured.version>3.1.0</rest-assured.version> <rest-assured.version>3.1.0</rest-assured.version>
<start-class>com.baeldung.sampleapp.config.MainApplication</start-class>
</properties> </properties>
</project> </project>

2
spring-rest/src/main/webapp/WEB-INF/api-servlet.xml
View File

@ -6,7 +6,7 @@
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd" http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd"
> >
<context:component-scan base-package="org.baeldung.web" /> <context:component-scan base-package="com.baeldung.sampleapp.web" />
<mvc:annotation-driven content-negotiation-manager="contentNegotiationManager" > <mvc:annotation-driven content-negotiation-manager="contentNegotiationManager" >
<mvc:message-converters register-defaults="true"> <mvc:message-converters register-defaults="true">

2
spring-rest/src/main/webapp/WEB-INF/web.xml
View File

@ -16,7 +16,7 @@
</context-param> </context-param>
<context-param> <context-param>
<param-name>contextConfigLocation</param-name> <param-name>contextConfigLocation</param-name>
<param-value>org.baeldung.config</param-value> <param-value>com.baeldung.sampleapp.config</param-value>
</context-param> </context-param>
<!-- <listener> <!-- <listener>

2
spring-rest/src/test/java/com/baeldung/web/controller/mediatypes/TestConfig.java
View File

@ -5,7 +5,7 @@ import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
@ComponentScan({ "org.baeldung.web" }) @ComponentScan({ "com.baeldung.web" })
public class TestConfig { public class TestConfig {
} }