|
Jaromír Cápík |
26dfd3a |
diff -Naur snakeyaml.orig/pom.xml snakeyaml/pom.xml
|
|
Jaromír Cápík |
26dfd3a |
--- snakeyaml.orig/pom.xml 2011-05-27 19:26:23.000000000 +0200
|
|
Jaromír Cápík |
26dfd3a |
+++ snakeyaml/pom.xml 2011-05-27 19:32:07.000000000 +0200
|
|
Jaromír Cápík |
26dfd3a |
@@ -61,12 +61,12 @@
|
|
Jaromír Cápík |
26dfd3a |
<version>4.7</version>
|
|
Jaromír Cápík |
26dfd3a |
<scope>test</scope>
|
|
Jaromír Cápík |
26dfd3a |
</dependency>
|
|
Jaromír Cápík |
26dfd3a |
- <dependency>
|
|
Jaromír Cápík |
26dfd3a |
+
|
|
Jaromír Cápík |
26dfd3a |
<groupId>org.springframework</groupId>
|
|
Jaromír Cápík |
26dfd3a |
<artifactId>spring</artifactId>
|
|
Jaromír Cápík |
26dfd3a |
<version>2.5.6</version>
|
|
Jaromír Cápík |
26dfd3a |
<scope>test</scope>
|
|
Jaromír Cápík |
26dfd3a |
- </dependency>
|
|
Jaromír Cápík |
26dfd3a |
+ </dependency-->
|
|
Jaromír Cápík |
26dfd3a |
<dependency>
|
|
Jaromír Cápík |
26dfd3a |
<groupId>org.apache.velocity</groupId>
|
|
Jaromír Cápík |
26dfd3a |
<artifactId>velocity</artifactId>
|
|
Jaromír Cápík |
26dfd3a |
diff -Naur snakeyaml.orig/src/test/java/examples/SpringTest.java snakeyaml/src/test/java/examples/SpringTest.java
|
|
Jaromír Cápík |
26dfd3a |
--- snakeyaml.orig/src/test/java/examples/SpringTest.java 2011-01-12 13:56:10.000000000 +0100
|
|
Jaromír Cápík |
26dfd3a |
+++ snakeyaml/src/test/java/examples/SpringTest.java 2011-05-27 19:34:14.000000000 +0200
|
|
Jaromír Cápík |
26dfd3a |
@@ -18,12 +18,15 @@
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
import junit.framework.TestCase;
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
+/* WORKAROUND FOR : springframework dependency removal
|
|
Jaromír Cápík |
26dfd3a |
import org.springframework.context.ApplicationContext;
|
|
Jaromír Cápík |
26dfd3a |
import org.springframework.context.support.ClassPathXmlApplicationContext;
|
|
Jaromír Cápík |
26dfd3a |
+*/
|
|
Jaromír Cápík |
26dfd3a |
import org.yaml.snakeyaml.Yaml;
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
public class SpringTest extends TestCase {
|
|
Jaromír Cápík |
26dfd3a |
public void testSimple() {
|
|
Jaromír Cápík |
26dfd3a |
+/* WORKAROUND FOR : springframework dependency removal
|
|
Jaromír Cápík |
26dfd3a |
ApplicationContext context = new ClassPathXmlApplicationContext("examples/spring.xml");
|
|
Jaromír Cápík |
26dfd3a |
Yaml yaml = (Yaml) context.getBean("standardYaml");
|
|
Jaromír Cápík |
26dfd3a |
assertNotNull(yaml);
|
|
Jaromír Cápík |
26dfd3a |
@@ -33,5 +36,6 @@
|
|
Jaromír Cápík |
26dfd3a |
//
|
|
Jaromír Cápík |
26dfd3a |
yaml = (Yaml) context.getBean("snakeYaml");
|
|
Jaromír Cápík |
26dfd3a |
assertNotNull(yaml);
|
|
Jaromír Cápík |
26dfd3a |
+*/
|
|
Jaromír Cápík |
26dfd3a |
}
|
|
Jaromír Cápík |
26dfd3a |
}
|
|
Jaromír Cápík |
26dfd3a |
\ Chybí znak konce řádku na konci souboru
|
|
Jaromír Cápík |
26dfd3a |
diff -Naur snakeyaml.orig/src/test/java/org/yaml/snakeyaml/issues/issue9/BeanHolder.java snakeyaml/src/test/java/org/yaml/snakeyaml/issues/issue9/BeanHolder.java
|
|
Jaromír Cápík |
26dfd3a |
--- snakeyaml.orig/src/test/java/org/yaml/snakeyaml/issues/issue9/BeanHolder.java 2011-01-12 13:56:10.000000000 +0100
|
|
Jaromír Cápík |
26dfd3a |
+++ snakeyaml/src/test/java/org/yaml/snakeyaml/issues/issue9/BeanHolder.java 2011-05-27 19:48:24.012406769 +0200
|
|
Jaromír Cápík |
26dfd3a |
@@ -16,7 +16,9 @@
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
package org.yaml.snakeyaml.issues.issue9;
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
+/* WORKAROUND FOR : springframework dependency removal
|
|
Jaromír Cápík |
26dfd3a |
import org.springframework.core.style.ToStringCreator;
|
|
Jaromír Cápík |
26dfd3a |
+*/
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
public class BeanHolder {
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
@@ -41,8 +43,11 @@
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
@Override
|
|
Jaromír Cápík |
26dfd3a |
public String toString() {
|
|
Jaromír Cápík |
26dfd3a |
+/* WORKAROUND FOR : springframework dependency removal
|
|
Jaromír Cápík |
26dfd3a |
ToStringCreator builder = new ToStringCreator(this);
|
|
Jaromír Cápík |
26dfd3a |
builder.append(this.bean);
|
|
Jaromír Cápík |
26dfd3a |
return builder.toString();
|
|
Jaromír Cápík |
26dfd3a |
+*/
|
|
Jaromír Cápík |
26dfd3a |
+ return "";
|
|
Jaromír Cápík |
26dfd3a |
}
|
|
Jaromír Cápík |
26dfd3a |
}
|
|
Jaromír Cápík |
26dfd3a |
diff -Naur snakeyaml.orig/src/test/java/org/yaml/snakeyaml/issues/issue9/Bean1.java snakeyaml/src/test/java/org/yaml/snakeyaml/issues/issue9/Bean1.java
|
|
Jaromír Cápík |
26dfd3a |
--- snakeyaml.orig/src/test/java/org/yaml/snakeyaml/issues/issue9/Bean1.java 2011-01-12 13:56:10.000000000 +0100
|
|
Jaromír Cápík |
26dfd3a |
+++ snakeyaml/src/test/java/org/yaml/snakeyaml/issues/issue9/Bean1.java 2011-05-27 19:48:19.260945240 +0200
|
|
Jaromír Cápík |
26dfd3a |
@@ -16,7 +16,9 @@
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
package org.yaml.snakeyaml.issues.issue9;
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
+/* WORKAROUND FOR : springframework dependency removal
|
|
Jaromír Cápík |
26dfd3a |
import org.springframework.core.style.ToStringCreator;
|
|
Jaromír Cápík |
26dfd3a |
+*/
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
public class Bean1 implements IBean {
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
@@ -50,10 +52,13 @@
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
@Override
|
|
Jaromír Cápík |
26dfd3a |
public String toString() {
|
|
Jaromír Cápík |
26dfd3a |
+/* WORKAROUND FOR : springframework dependency removal
|
|
Jaromír Cápík |
26dfd3a |
ToStringCreator builder = new ToStringCreator(this);
|
|
Jaromír Cápík |
26dfd3a |
builder.append(this.strVal);
|
|
Jaromír Cápík |
26dfd3a |
builder.append(this.intVal);
|
|
Jaromír Cápík |
26dfd3a |
return builder.toString();
|
|
Jaromír Cápík |
26dfd3a |
+*/
|
|
Jaromír Cápík |
26dfd3a |
+ return "";
|
|
Jaromír Cápík |
26dfd3a |
}
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
}
|
|
Jaromír Cápík |
26dfd3a |
diff -Naur snakeyaml.orig/src/test/java/org/yaml/snakeyaml/issues/issue9/Bean2.java snakeyaml/src/test/java/org/yaml/snakeyaml/issues/issue9/Bean2.java
|
|
Jaromír Cápík |
26dfd3a |
--- snakeyaml.orig/src/test/java/org/yaml/snakeyaml/issues/issue9/Bean2.java 2011-01-12 13:56:10.000000000 +0100
|
|
Jaromír Cápík |
26dfd3a |
+++ snakeyaml/src/test/java/org/yaml/snakeyaml/issues/issue9/Bean2.java 2011-05-27 19:48:49.388530893 +0200
|
|
Jaromír Cápík |
26dfd3a |
@@ -16,7 +16,9 @@
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
package org.yaml.snakeyaml.issues.issue9;
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
+/* WORKAROUND FOR : springframework dependency removal
|
|
Jaromír Cápík |
26dfd3a |
import org.springframework.core.style.ToStringCreator;
|
|
Jaromír Cápík |
26dfd3a |
+*/
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
public class Bean2 implements IBean {
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
@@ -46,10 +48,13 @@
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
@Override
|
|
Jaromír Cápík |
26dfd3a |
public String toString() {
|
|
Jaromír Cápík |
26dfd3a |
+/* WORKAROUND FOR : springframework dependency removal
|
|
Jaromír Cápík |
26dfd3a |
ToStringCreator builder = new ToStringCreator(this);
|
|
Jaromír Cápík |
26dfd3a |
builder.append(this.strVal);
|
|
Jaromír Cápík |
26dfd3a |
builder.append(this.intVal);
|
|
Jaromír Cápík |
26dfd3a |
return builder.toString();
|
|
Jaromír Cápík |
26dfd3a |
+*/
|
|
Jaromír Cápík |
26dfd3a |
+ return "";
|
|
Jaromír Cápík |
26dfd3a |
}
|
|
Jaromír Cápík |
26dfd3a |
|
|
Jaromír Cápík |
26dfd3a |
}
|