Author: gk
Date: Tue Jun 16 10:34:57 2015
New Revision: 1685755
URL: http://svn.apache.org/r1685755
Log:
- moved test example classes from api test folder to module tests
Added:
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/Rectangle.java
(with props)
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/TestClass.java
(with props)
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/Rectangle.java
(with props)
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/TestClass.java
(with props)
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/Rectangle.java
(with props)
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/TestClass.java
(with props)
Removed:
turbine/fulcrum/trunk/json/api/src/test/org/apache/fulcrum/json/Rectangle.java
turbine/fulcrum/trunk/json/api/src/test/org/apache/fulcrum/json/TestClass.java
Modified:
turbine/fulcrum/trunk/json/ (props changed)
turbine/fulcrum/trunk/json/api/pom.xml
turbine/fulcrum/trunk/json/gson/pom.xml
turbine/fulcrum/trunk/json/jackson/pom.xml
turbine/fulcrum/trunk/json/jackson2/pom.xml
Propchange: turbine/fulcrum/trunk/json/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun 16 10:34:57 2015
@@ -2,3 +2,4 @@
.project
.settings
target
+tests
Modified: turbine/fulcrum/trunk/json/api/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/api/pom.xml?rev=1685755&r1=1685754&r2=1685755&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/api/pom.xml (original)
+++ turbine/fulcrum/trunk/json/api/pom.xml Tue Jun 16 10:34:57 2015
@@ -38,11 +38,6 @@
<dependencies>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
<version>4.3.1</version>
@@ -50,21 +45,5 @@
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <phase>test-compile</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
</project>
Modified: turbine/fulcrum/trunk/json/gson/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/pom.xml?rev=1685755&r1=1685754&r2=1685755&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/gson/pom.xml (original)
+++ turbine/fulcrum/trunk/json/gson/pom.xml Tue Jun 16 10:34:57 2015
@@ -77,13 +77,6 @@
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-json-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.6</version>
<scope>test</scope>
Added:
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/Rectangle.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/Rectangle.java?rev=1685755&view=auto
==============================================================================
---
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/Rectangle.java
(added)
+++
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/Rectangle.java
Tue Jun 16 10:34:57 2015
@@ -0,0 +1,41 @@
+package org.apache.fulcrum.json;
+
+public final class Rectangle {
+ private int w, h;
+ private String name;
+
+ public Rectangle() {
+ // may be this is needed for deserialization, if not set otherwise
+ }
+
+ public Rectangle(int w, int h) {
+ this.w = w;
+ this.h = h;
+ }
+
+ public Rectangle(int w, int h, String name) {
+ this.w = w;
+ this.h = h;
+ this.name = name;
+ }
+
+ public int getW() {
+ return w;
+ }
+
+ public int getH() {
+ return h;
+ }
+
+ public int getSize() {
+ return w * h;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
\ No newline at end of file
Propchange:
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/Rectangle.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/TestClass.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/TestClass.java?rev=1685755&view=auto
==============================================================================
---
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/TestClass.java
(added)
+++
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/TestClass.java
Tue Jun 16 10:34:57 2015
@@ -0,0 +1,51 @@
+package org.apache.fulcrum.json;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class TestClass
+
+{
+ /** Container for the components */
+ private Map<String, Object> container;
+ /** Setup our default configurationFileName */
+ private String configurationName = "Config.xml";
+
+ public Map<String, Object> getContainer() {
+ return container;
+ }
+
+ public void setContainer(Map<String, Object> container) {
+ this.container = container;
+ }
+
+ /** Setup our default parameterFileName */
+ private String name = null;
+
+ public TestClass() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public TestClass(String name) {
+ this.name = name;
+ this.container = new HashMap<String, Object>();
+ this.container.put("cf", configurationName);
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getConfigurationName() {
+ return configurationName;
+ }
+
+ public void setConfigurationName(String configurationName) {
+ this.configurationName = configurationName;
+ }
+
+}
Propchange:
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/TestClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: turbine/fulcrum/trunk/json/jackson/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/pom.xml?rev=1685755&r1=1685754&r2=1685755&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson/pom.xml Tue Jun 16 10:34:57 2015
@@ -77,13 +77,6 @@
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-json-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.6</version>
<scope>test</scope>
Added:
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/Rectangle.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/Rectangle.java?rev=1685755&view=auto
==============================================================================
---
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/Rectangle.java
(added)
+++
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/Rectangle.java
Tue Jun 16 10:34:57 2015
@@ -0,0 +1,41 @@
+package org.apache.fulcrum.json;
+
+public final class Rectangle {
+ private int w, h;
+ private String name;
+
+ public Rectangle() {
+ // may be this is needed for deserialization, if not set otherwise
+ }
+
+ public Rectangle(int w, int h) {
+ this.w = w;
+ this.h = h;
+ }
+
+ public Rectangle(int w, int h, String name) {
+ this.w = w;
+ this.h = h;
+ this.name = name;
+ }
+
+ public int getW() {
+ return w;
+ }
+
+ public int getH() {
+ return h;
+ }
+
+ public int getSize() {
+ return w * h;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
\ No newline at end of file
Propchange:
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/Rectangle.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/TestClass.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/TestClass.java?rev=1685755&view=auto
==============================================================================
---
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/TestClass.java
(added)
+++
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/TestClass.java
Tue Jun 16 10:34:57 2015
@@ -0,0 +1,51 @@
+package org.apache.fulcrum.json;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class TestClass
+
+{
+ /** Container for the components */
+ private Map<String, Object> container;
+ /** Setup our default configurationFileName */
+ private String configurationName = "Config.xml";
+
+ public Map<String, Object> getContainer() {
+ return container;
+ }
+
+ public void setContainer(Map<String, Object> container) {
+ this.container = container;
+ }
+
+ /** Setup our default parameterFileName */
+ private String name = null;
+
+ public TestClass() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public TestClass(String name) {
+ this.name = name;
+ this.container = new HashMap<String, Object>();
+ this.container.put("cf", configurationName);
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getConfigurationName() {
+ return configurationName;
+ }
+
+ public void setConfigurationName(String configurationName) {
+ this.configurationName = configurationName;
+ }
+
+}
Propchange:
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/TestClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: turbine/fulcrum/trunk/json/jackson2/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/pom.xml?rev=1685755&r1=1685754&r2=1685755&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson2/pom.xml Tue Jun 16 10:34:57 2015
@@ -77,13 +77,6 @@
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-json-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.6</version>
<scope>test</scope>
Added:
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/Rectangle.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/Rectangle.java?rev=1685755&view=auto
==============================================================================
---
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/Rectangle.java
(added)
+++
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/Rectangle.java
Tue Jun 16 10:34:57 2015
@@ -0,0 +1,41 @@
+package org.apache.fulcrum.json;
+
+public final class Rectangle {
+ private int w, h;
+ private String name;
+
+ public Rectangle() {
+ // may be this is needed for deserialization, if not set otherwise
+ }
+
+ public Rectangle(int w, int h) {
+ this.w = w;
+ this.h = h;
+ }
+
+ public Rectangle(int w, int h, String name) {
+ this.w = w;
+ this.h = h;
+ this.name = name;
+ }
+
+ public int getW() {
+ return w;
+ }
+
+ public int getH() {
+ return h;
+ }
+
+ public int getSize() {
+ return w * h;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
\ No newline at end of file
Propchange:
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/Rectangle.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/TestClass.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/TestClass.java?rev=1685755&view=auto
==============================================================================
---
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/TestClass.java
(added)
+++
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/TestClass.java
Tue Jun 16 10:34:57 2015
@@ -0,0 +1,51 @@
+package org.apache.fulcrum.json;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class TestClass
+
+{
+ /** Container for the components */
+ private Map<String, Object> container;
+ /** Setup our default configurationFileName */
+ private String configurationName = "Config.xml";
+
+ public Map<String, Object> getContainer() {
+ return container;
+ }
+
+ public void setContainer(Map<String, Object> container) {
+ this.container = container;
+ }
+
+ /** Setup our default parameterFileName */
+ private String name = null;
+
+ public TestClass() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public TestClass(String name) {
+ this.name = name;
+ this.container = new HashMap<String, Object>();
+ this.container.put("cf", configurationName);
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getConfigurationName() {
+ return configurationName;
+ }
+
+ public void setConfigurationName(String configurationName) {
+ this.configurationName = configurationName;
+ }
+
+}
Propchange:
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/TestClass.java
------------------------------------------------------------------------------
svn:eol-style = native
