Skip to content

Commit 75b533e

Browse files
author
eugenp
committed
perperties work
1 parent 556b7ca commit 75b533e

9 files changed

+15
-34
lines changed

‎spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigTwo.java‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

spring-all/src/main/resources/configForPropertiesTwo.xml renamed to spring-all/src/main/resources/basicConfigForPropertiesTwo.xml

File renamed without changes.

‎spring-all/src/main/resources/springScheduled-config.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:task="http://www.springframework.org/schema/task"
33
xmlns:context="http://www.springframework.org/schema/context"
44
xsi:schemaLocation="
5-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
6-
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.1.xsd
7-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"
5+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
6+
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.2.xsd
7+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"
88
>
99

1010
<context:property-placeholder location="classpath:springScheduled.properties"/>

spring-all/src/test/java/org/baeldung/properties/core/PropertiesWithMultipleXmlsIntegrationTest.java renamed to spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithMultipleXmlsIntegrationTest.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
package org.baeldung.properties.core;
1+
package org.baeldung.properties.basic;
22

3-
import org.baeldung.properties.spring.PropertiesWithXmlConfigOne;
4-
import org.baeldung.properties.spring.PropertiesWithXmlConfigTwo;
53
import org.junit.Test;
64
import org.junit.runner.RunWith;
75
import org.springframework.beans.factory.annotation.Autowired;
86
import org.springframework.beans.factory.annotation.Value;
97
import org.springframework.core.env.Environment;
108
import org.springframework.test.context.ContextConfiguration;
119
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
12-
import org.springframework.test.context.support.AnnotationConfigContextLoader;
1310

1411
@RunWith(SpringJUnit4ClassRunner.class)
15-
@ContextConfiguration(classes = { PropertiesWithXmlConfigOne.class, PropertiesWithXmlConfigTwo.class }, loader = AnnotationConfigContextLoader.class)
12+
@ContextConfiguration(locations = { "classpath:configForPropertiesOne.xml", "classpath:basicConfigForPropertiesTwo.xml" })
1613
public class PropertiesWithMultipleXmlsIntegrationTest {
1714

1815
@Autowired

spring-all/src/test/java/org/baeldung/properties/core/PropertiesWithXmlIntegrationTest.java renamed to spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithXmlIntegrationTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
package org.baeldung.properties.core;
1+
package org.baeldung.properties.basic;
22

3-
import org.baeldung.properties.spring.PropertiesWithXmlConfig;
43
import org.junit.Test;
54
import org.junit.runner.RunWith;
65
import org.springframework.beans.factory.annotation.Autowired;
76
import org.springframework.beans.factory.annotation.Value;
87
import org.springframework.core.env.Environment;
98
import org.springframework.test.context.ContextConfiguration;
109
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
11-
import org.springframework.test.context.support.AnnotationConfigContextLoader;
1210

1311
@RunWith(SpringJUnit4ClassRunner.class)
14-
@ContextConfiguration(classes = { PropertiesWithXmlConfig.class }, loader = AnnotationConfigContextLoader.class)
12+
@ContextConfiguration(locations = "classpath:basicConfigForProperties.xml")
1513
public class PropertiesWithXmlIntegrationTest {
1614

1715
@Autowired

spring-all/src/test/java/org/baeldung/properties/core/ExternalPropertiesWithJavaIntegrationTest.java renamed to spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithJavaIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.properties.core;
1+
package org.baeldung.properties.external;
22

33
import org.baeldung.properties.spring.PropertiesWithJavaConfig;
44
import org.baeldung.properties.spring.PropertiesWithJavaConfigOther;

spring-all/src/test/java/org/baeldung/properties/core/ExternalPropertiesWithMultipleXmlsIntegrationTest.java renamed to spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithMultipleXmlsIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.properties.core;
1+
package org.baeldung.properties.external;
22

33
import org.baeldung.properties.spring.PropertiesWithXmlConfigOne;
44
import org.baeldung.properties.spring.PropertiesWithXmlConfigTwo;

spring-all/src/test/java/org/baeldung/properties/core/ExternalPropertiesWithXmlIntegrationTest.java renamed to spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithXmlIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.properties.core;
1+
package org.baeldung.properties.external;
22

33
import org.baeldung.properties.spring.PropertiesWithXmlConfig;
44
import org.junit.Ignore;

‎spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.baeldung.test;
22

3-
import org.baeldung.properties.core.ExternalPropertiesWithJavaIntegrationTest;
4-
import org.baeldung.properties.core.ExternalPropertiesWithMultipleXmlsIntegrationTest;
5-
import org.baeldung.properties.core.ExternalPropertiesWithXmlIntegrationTest;
3+
import org.baeldung.properties.basic.PropertiesWithMultipleXmlsIntegrationTest;
4+
import org.baeldung.properties.basic.PropertiesWithXmlIntegrationTest;
65
import org.baeldung.properties.core.PropertiesWithJavaIntegrationTest;
7-
import org.baeldung.properties.core.PropertiesWithMultipleXmlsIntegrationTest;
8-
import org.baeldung.properties.core.PropertiesWithXmlIntegrationTest;
6+
import org.baeldung.properties.external.ExternalPropertiesWithJavaIntegrationTest;
7+
import org.baeldung.properties.external.ExternalPropertiesWithMultipleXmlsIntegrationTest;
8+
import org.baeldung.properties.external.ExternalPropertiesWithXmlIntegrationTest;
99
import org.junit.runner.RunWith;
1010
import org.junit.runners.Suite;
1111
import org.junit.runners.Suite.SuiteClasses;

0 commit comments

Comments
 (0)