Browse Source

Fix eclipse errors and warnings

Fix some eclipse errors and warnings caused by XSD validation errors and
classes in the wrong place.
pull/2479/merge
Phillip Webb 11 years ago
parent
commit
8e594c790e
  1. 1
      spring-boot-deployment-tests/pom.xml
  2. 5
      spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml
  3. 0
      spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/BootRunResourceTests.java
  4. 0
      spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/boot-run-resources/build.gradle
  5. 0
      spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/boot-run-resources/src/main/java/BootRunResourcesApplication.java
  6. 0
      spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/boot-run-resources/src/main/resources/test.txt
  7. 4
      spring-boot-samples/spring-boot-sample-integration/src/main/resources/integration-context.xml
  8. 6
      spring-boot-samples/spring-boot-sample-parent-context/src/main/resources/integration-context.xml

1
spring-boot-deployment-tests/pom.xml

@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
</organization>
<properties>
<main.basedir>${basedir}/..</main.basedir>
<java.version>1.7</java.version>
</properties>
<modules>
<module>spring-boot-deployment-test-tomee</module>

5
spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml

@ -30,6 +30,11 @@ @@ -30,6 +30,11 @@
<artifactId>spring-boot-dependency-tools</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<repositories>
<repository>

0
spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/BootRunResourceTests.java → spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/BootRunResourceTests.java

0
spring-boot-integration-tests/src/test/resources/boot-run-resources/build.gradle → spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/boot-run-resources/build.gradle

0
spring-boot-integration-tests/src/test/resources/boot-run-resources/src/main/java/BootRunResourcesApplication.java → spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/boot-run-resources/src/main/java/BootRunResourcesApplication.java

0
spring-boot-integration-tests/src/test/resources/boot-run-resources/src/main/resources/test.txt → spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/boot-run-resources/src/main/resources/test.txt

4
spring-boot-samples/spring-boot-sample-integration/src/main/resources/integration-context.xml

@ -3,8 +3,8 @@ @@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:int="http://www.springframework.org/schema/integration"
xmlns:int-file="http://www.springframework.org/schema/integration/file"
xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file.xsd
xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-4.1.xsd
http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-4.1.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<int-file:inbound-channel-adapter channel="input" directory="target/input" filename-pattern="*">

6
spring-boot-samples/spring-boot-sample-parent-context/src/main/resources/integration-context.xml

@ -3,12 +3,12 @@ @@ -3,12 +3,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:int="http://www.springframework.org/schema/integration"
xmlns:int-file="http://www.springframework.org/schema/integration/file"
xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file.xsd
xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-4.1.xsd
http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-4.1.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<int-file:inbound-channel-adapter channel="input" directory="target/input" filename-pattern="*">
<int:poller fixed-rate="500"/>
<int:poller fixed-rate="500" />
</int-file:inbound-channel-adapter>
<int:service-activator input-channel="input" ref="sampleEndpoint" output-channel="output"/>

Loading…
Cancel
Save