[
https://issues.apache.org/jira/browse/STREAMS-613?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16550871#comment-16550871
]
ASF GitHub Bot commented on STREAMS-613:
----------------------------------------
steveblackmon closed pull request #456: resolves STREAMS-613
URL: https://github.com/apache/streams/pull/456
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/pom.xml b/pom.xml
index 660aa39576..c9ef5b1f76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -314,7 +314,7 @@
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <streams.version>0.5.2-SNAPSHOT</streams.version>
+ <streams.version>0.6.1-SNAPSHOT</streams.version>
<github.global.server>github</github.global.server>
<!-- Release Properties -->
diff --git a/streams-plugins/streams-plugin-cassandra/pom.xml
b/streams-plugins/streams-plugin-cassandra/pom.xml
index c92941abb6..f643bb8e44 100644
--- a/streams-plugins/streams-plugin-cassandra/pom.xml
+++ b/streams-plugins/streams-plugin-cassandra/pom.xml
@@ -38,20 +38,12 @@
<dependencies>
<dependency>
<groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
+ <artifactId>streams-schema-jsonschemaorg</artifactId>
<version>${project.version}</version>
<type>zip</type>
<classifier>schemas</classifier>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <classifier>testdata</classifier>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.streams</groupId>
<artifactId>streams-config</artifactId>
diff --git
a/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorCLITest.java
b/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorCLITest.java
index ce7e2fe8d6..954ec5056c 100644
---
a/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorCLITest.java
+++
b/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorCLITest.java
@@ -39,7 +39,7 @@
@Test
public void testStreamsCassandraResourceGeneratorCLI() throws Exception {
- String sourceDirectory = "target/dependency/activitystreams-schemas";
+ String sourceDirectory = "target/dependency/jsonschemaorg-schemas";
String targetDirectory = "target/generated-resources/test-cli";
StreamsCassandraResourceGenerator.main(new String[]{sourceDirectory,
targetDirectory});
@@ -59,6 +59,6 @@ public void testStreamsCassandraResourceGeneratorCLI() throws
Exception {
String typesCqlBytes = new String(java.nio.file.Files.readAllBytes(path));
- Assert.assertEquals(StringUtils.countMatches(typesCqlBytes, "CREATE
TYPE"), 133);
+ Assert.assertEquals(4, StringUtils.countMatches(typesCqlBytes, "CREATE
TYPE"));
}
}
\ No newline at end of file
diff --git
a/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorMojoIT.java
b/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorMojoIT.java
index d35a0d3528..ac19d411d0 100644
---
a/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorMojoIT.java
+++
b/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorMojoIT.java
@@ -81,7 +81,7 @@ public void testStreamsCassandraResourceGeneratorMojo()
throws Exception {
String typesCqlBytes = new String(java.nio.file.Files.readAllBytes(path));
- Assert.assertEquals(StringUtils.countMatches(typesCqlBytes, "CREATE
TYPE"), 133);
+ Assert.assertEquals(4, StringUtils.countMatches(typesCqlBytes, "CREATE
TYPE"));
}
}
\ No newline at end of file
diff --git
a/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorTest.java
b/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorTest.java
index 24fcf672ed..a065d32f44 100644
---
a/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorTest.java
+++
b/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorTest.java
@@ -55,7 +55,7 @@ public void testStreamsCassandraResourceGenerator() throws
Exception {
StreamsCassandraGenerationConfig config = new
StreamsCassandraGenerationConfig();
- String sourceDirectory = "target/dependency/activitystreams-schemas";
+ String sourceDirectory = "target/dependency/jsonschemaorg-schemas";
config.setSourceDirectory(sourceDirectory);
@@ -83,7 +83,7 @@ public void testStreamsCassandraResourceGenerator() throws
Exception {
String typesCqlBytes = new String(java.nio.file.Files.readAllBytes(path));
- Assert.assertEquals(StringUtils.countMatches(typesCqlBytes, "CREATE
TYPE"), 133);
+ Assert.assertEquals(4, StringUtils.countMatches(typesCqlBytes, "CREATE
TYPE"));
}
}
\ No newline at end of file
diff --git
a/streams-plugins/streams-plugin-cassandra/src/test/resources/streams-plugin-cassandra/pom.xml
b/streams-plugins/streams-plugin-cassandra/src/test/resources/streams-plugin-cassandra/pom.xml
index 18a9c20d0a..32840876c1 100644
---
a/streams-plugins/streams-plugin-cassandra/src/test/resources/streams-plugin-cassandra/pom.xml
+++
b/streams-plugins/streams-plugin-cassandra/src/test/resources/streams-plugin-cassandra/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-cassandra-test</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Test StreamsCassandraResourceGeneratorMojo</name>
@@ -99,15 +99,10 @@
<plugin>
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-cassandra</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.1-SNAPSHOT</version>
<configuration>
<sourcePaths>
-
<sourcePath>target/dependency/activitystreams-schemas/activity.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/collection.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/media_link.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/object.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/objectTypes</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/verbs</sourcePath>
+
<sourcePath>target/dependency/jsonschemaorg-schemas</sourcePath>
</sourcePaths>
<targetDirectory>target/generated-resources/test-mojo</targetDirectory>
</configuration>
diff --git a/streams-plugins/streams-plugin-elasticsearch/pom.xml
b/streams-plugins/streams-plugin-elasticsearch/pom.xml
index 16dbb2abb0..3bceb0f8e5 100644
--- a/streams-plugins/streams-plugin-elasticsearch/pom.xml
+++ b/streams-plugins/streams-plugin-elasticsearch/pom.xml
@@ -39,20 +39,12 @@
<dependencies>
<dependency>
<groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
+ <artifactId>streams-schema-jsonschemaorg</artifactId>
<version>${project.version}</version>
<type>zip</type>
<classifier>schemas</classifier>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <classifier>testdata</classifier>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.streams</groupId>
<artifactId>streams-config</artifactId>
diff --git
a/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorCLITest.java
b/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorCLITest.java
index 213b8f7bf8..d4952e28d7 100644
---
a/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorCLITest.java
+++
b/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorCLITest.java
@@ -36,7 +36,7 @@
@Test
public void testStreamsElasticsearchResourceGeneratorCLI() throws Exception {
- String sourceDirectory = "target/dependency/activitystreams-schemas";
+ String sourceDirectory = "target/dependency/jsonschemaorg-schemas";
String targetDirectory = "target/generated-resources/elasticsearch-cli";
StreamsElasticsearchResourceGenerator.main(new String[]{sourceDirectory,
targetDirectory});
@@ -48,6 +48,6 @@ public void testStreamsElasticsearchResourceGeneratorCLI()
throws Exception {
Assert.assertTrue(testOutput.isDirectory());
Collection<File> outputCollection = FileUtils.listFiles(testOutput,
StreamsElasticsearchResourceGeneratorTest.jsonFilter, true);
- Assert.assertEquals(outputCollection.size(), 133);
+ Assert.assertEquals(4, outputCollection.size());
}
}
\ No newline at end of file
diff --git
a/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorMojoIT.java
b/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorMojoIT.java
index 3b24d09575..dbfedc7291 100644
---
a/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorMojoIT.java
+++
b/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorMojoIT.java
@@ -19,14 +19,19 @@
package org.apache.streams.plugins.elasticsearch.test;
+import org.apache.commons.io.FileUtils;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.Assert;
import org.testng.annotations.Test;
import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -58,5 +63,17 @@ public void testStreamsElasticsearchResourceGeneratorMojo()
throws Exception {
verifier.resetStreams();
+ Path testOutputPath =
Paths.get(testDir.getAbsolutePath()).resolve("target/generated-resources/test-mojo");
+
+ File testOutput = testOutputPath.toFile();
+
+ Assert.assertNotNull(testOutput);
+ Assert.assertTrue(testOutput.exists());
+ Assert.assertTrue(testOutput.isDirectory());
+
+ Collection<File> outputCollection = FileUtils.listFiles(testOutput,
StreamsElasticsearchResourceGeneratorTest.jsonFilter, true);
+ Assert.assertEquals(4, outputCollection.size());
+
+
}
}
\ No newline at end of file
diff --git
a/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorTest.java
b/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorTest.java
index 02dfeffb10..7d86c8f5db 100644
---
a/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorTest.java
+++
b/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorTest.java
@@ -52,7 +52,7 @@ public void StreamsElasticsearchResourceGenerator() throws
Exception {
StreamsElasticsearchGenerationConfig config = new
StreamsElasticsearchGenerationConfig();
- String sourceDirectory = "target/dependency/activitystreams-schemas";
+ String sourceDirectory = "target/dependency/jsonschemaorg-schemas";
config.setSourceDirectory(sourceDirectory);
@@ -72,6 +72,6 @@ public void StreamsElasticsearchResourceGenerator() throws
Exception {
Assert.assertTrue(testOutput.isDirectory());
Collection<File> outputCollection = FileUtils.listFiles(testOutput,
jsonFilter, true);
- Assert.assertEquals(outputCollection.size(), 133);
+ Assert.assertEquals(4, outputCollection.size());
}
}
\ No newline at end of file
diff --git
a/streams-plugins/streams-plugin-elasticsearch/src/test/resources/streams-plugin-elasticsearch/pom.xml
b/streams-plugins/streams-plugin-elasticsearch/src/test/resources/streams-plugin-elasticsearch/pom.xml
index a15933adca..bac0f2adc6 100644
---
a/streams-plugins/streams-plugin-elasticsearch/src/test/resources/streams-plugin-elasticsearch/pom.xml
+++
b/streams-plugins/streams-plugin-elasticsearch/src/test/resources/streams-plugin-elasticsearch/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-elasticsearch-test</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Test StreamsElasticsearchResourceGeneratorMojo</name>
@@ -86,7 +86,7 @@
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
+ <artifactId>streams-schema-jsonschemaorg</artifactId>
<version>${project.version}</version>
<type>zip</type>
<classifier>schemas</classifier>
@@ -99,15 +99,10 @@
<plugin>
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-elasticsearch</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.1-SNAPSHOT</version>
<configuration>
<sourcePaths>
-
<sourcePath>target/dependency/activitystreams-schemas/activity.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/collection.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/media_link.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/object.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/objectTypes</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/verbs</sourcePath>
+
<sourcePath>target/dependency/jsonschemaorg-schemas</sourcePath>
</sourcePaths>
<targetDirectory>target/generated-resources/elasticsearch-mojo</targetDirectory>
</configuration>
diff --git a/streams-plugins/streams-plugin-hbase/pom.xml
b/streams-plugins/streams-plugin-hbase/pom.xml
index c798acf67c..9e56ff216c 100644
--- a/streams-plugins/streams-plugin-hbase/pom.xml
+++ b/streams-plugins/streams-plugin-hbase/pom.xml
@@ -38,20 +38,12 @@
<dependencies>
<dependency>
<groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
+ <artifactId>streams-schema-jsonschemaorg</artifactId>
<version>${project.version}</version>
<type>zip</type>
<classifier>schemas</classifier>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <classifier>testdata</classifier>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.streams</groupId>
<artifactId>streams-config</artifactId>
@@ -73,13 +65,6 @@
<artifactId>streams-util</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
diff --git
a/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorCLITest.java
b/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorCLITest.java
index a9c6e8f750..bd807a9580 100644
---
a/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorCLITest.java
+++
b/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorCLITest.java
@@ -36,7 +36,7 @@
@Test
public void testStreamsHbaseResourceGeneratorCLI() throws Exception {
- String sourceDirectory = "target/dependency/activitystreams-schemas";
+ String sourceDirectory = "target/dependency/jsonschemaorg-schemas";
String targetDirectory = "target/generated-resources/hbase-cli";
StreamsHbaseResourceGenerator.main(new String[]{sourceDirectory,
targetDirectory});
@@ -48,6 +48,6 @@ public void testStreamsHbaseResourceGeneratorCLI() throws
Exception {
Assert.assertTrue(testOutput.isDirectory());
Collection<File> outputCollection = FileUtils.listFiles(testOutput,
StreamsHbaseResourceGeneratorTest.txtFilter, true);
- Assert.assertEquals(outputCollection.size(), 133);
+ Assert.assertEquals(4, outputCollection.size());
}
}
\ No newline at end of file
diff --git
a/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorMojoIT.java
b/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorMojoIT.java
index 82d99918f3..0b25874293 100644
---
a/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorMojoIT.java
+++
b/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorMojoIT.java
@@ -68,6 +68,6 @@ public void testStreamsHbaseResourceGeneratorMojo() throws
Exception {
Assert.assertTrue(testOutput.isDirectory());
Collection<File> outputCollection = FileUtils.listFiles(testOutput,
StreamsHbaseResourceGeneratorTest.txtFilter, true);
- Assert.assertEquals(outputCollection.size(), 133);
+ Assert.assertEquals(4, outputCollection.size());
}
}
\ No newline at end of file
diff --git
a/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorTest.java
b/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorTest.java
index c5691fae7b..b25b1fe0bb 100644
---
a/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorTest.java
+++
b/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorTest.java
@@ -52,7 +52,7 @@ public void testStreamsHbaseResourceGenerator() throws
Exception {
StreamsHbaseGenerationConfig config = new StreamsHbaseGenerationConfig();
- String sourceDirectory = "target/dependency/activitystreams-schemas";
+ String sourceDirectory = "target/dependency/jsonschemaorg-schemas";
config.setSourceDirectory(sourceDirectory);
@@ -73,6 +73,6 @@ public void testStreamsHbaseResourceGenerator() throws
Exception {
Assert.assertTrue(testOutput.isDirectory());
Collection<File> outputCollection = FileUtils.listFiles(testOutput,
txtFilter, true);
- Assert.assertEquals(outputCollection.size(), 133);
+ Assert.assertEquals(4, outputCollection.size());
}
}
\ No newline at end of file
diff --git
a/streams-plugins/streams-plugin-hbase/src/test/resources/streams-plugin-hbase/pom.xml
b/streams-plugins/streams-plugin-hbase/src/test/resources/streams-plugin-hbase/pom.xml
index 2b3fafeda1..46942b6f8d 100644
---
a/streams-plugins/streams-plugin-hbase/src/test/resources/streams-plugin-hbase/pom.xml
+++
b/streams-plugins/streams-plugin-hbase/src/test/resources/streams-plugin-hbase/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-hbase-test</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Test StreamsHbaseResourceGeneratorMojo</name>
@@ -87,7 +87,7 @@
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
+ <artifactId>streams-schema-jsonschemaorg</artifactId>
<version>${project.version}</version>
<type>zip</type>
<classifier>schemas</classifier>
@@ -100,15 +100,10 @@
<plugin>
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-hbase</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.1-SNAPSHOT</version>
<configuration>
<sourcePaths>
-
<sourcePath>target/dependency/activitystreams-schemas/activity.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/collection.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/media_link.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/object.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/objectTypes</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/verbs</sourcePath>
+
<sourcePath>target/dependency/jsonschemaorg-schemas</sourcePath>
</sourcePaths>
<targetDirectory>target/generated-resources/hbase-mojo</targetDirectory>
<columnFamily>cf</columnFamily>
diff --git a/streams-plugins/streams-plugin-hive/pom.xml
b/streams-plugins/streams-plugin-hive/pom.xml
index b1cf490860..f45402642e 100644
--- a/streams-plugins/streams-plugin-hive/pom.xml
+++ b/streams-plugins/streams-plugin-hive/pom.xml
@@ -38,20 +38,12 @@
<dependencies>
<dependency>
<groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
+ <artifactId>streams-schema-jsonschemaorg</artifactId>
<version>${project.version}</version>
<type>zip</type>
<classifier>schemas</classifier>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <classifier>testdata</classifier>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.streams</groupId>
<artifactId>streams-config</artifactId>
diff --git
a/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorCLITest.java
b/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorCLITest.java
index 401dd679ec..7d2793a262 100644
---
a/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorCLITest.java
+++
b/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorCLITest.java
@@ -36,7 +36,7 @@
@Test
public void testStreamsHiveResourceGeneratorCLI() throws Exception {
- String sourceDirectory = "target/dependency/activitystreams-schemas";
+ String sourceDirectory = "target/dependency/jsonschemaorg-schemas";
String targetDirectory = "target/generated-resources/hive-cli";
StreamsHiveResourceGenerator.main(new String[]{sourceDirectory,
targetDirectory});
@@ -48,6 +48,6 @@ public void testStreamsHiveResourceGeneratorCLI() throws
Exception {
Assert.assertTrue(testOutput.isDirectory());
Collection<File> testOutputFiles = FileUtils.listFiles(testOutput,
StreamsHiveResourceGeneratorTest.hqlFilter, true);
- Assert.assertEquals(testOutputFiles.size(), 133);
+ Assert.assertEquals(4, testOutputFiles.size());
}
}
\ No newline at end of file
diff --git
a/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorMojoIT.java
b/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorMojoIT.java
index f174e28251..2ba6920757 100644
---
a/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorMojoIT.java
+++
b/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorMojoIT.java
@@ -68,6 +68,6 @@ public void testStreamsHiveResourceGeneratorMojo() throws
Exception {
Assert.assertTrue(testOutput.isDirectory());
Collection<File> outputCollection = FileUtils.listFiles(testOutput,
StreamsHiveResourceGeneratorTest.hqlFilter, true);
- Assert.assertEquals (outputCollection.size(), 133);
+ Assert.assertEquals(4, outputCollection.size());
}
}
\ No newline at end of file
diff --git
a/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorTest.java
b/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorTest.java
index bbe7152e54..205822741d 100644
---
a/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorTest.java
+++
b/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorTest.java
@@ -54,7 +54,7 @@ public void testStreamsHiveResourceGenerator() throws
Exception {
StreamsHiveGenerationConfig config = new StreamsHiveGenerationConfig();
- String sourceDirectory = "target/dependency/activitystreams-schemas";
+ String sourceDirectory = "target/dependency/jsonschemaorg-schemas";
config.setSourceDirectory(sourceDirectory);
@@ -74,6 +74,6 @@ public void testStreamsHiveResourceGenerator() throws
Exception {
Assert.assertTrue(testOutput.isDirectory());
Collection<File> testOutputFiles = FileUtils.listFiles(testOutput,
hqlFilter, true);
- Assert.assertEquals(testOutputFiles.size(), 133);
+ Assert.assertEquals(4, testOutputFiles.size());
}
}
\ No newline at end of file
diff --git
a/streams-plugins/streams-plugin-hive/src/test/resources/streams-plugin-hive/pom.xml
b/streams-plugins/streams-plugin-hive/src/test/resources/streams-plugin-hive/pom.xml
index 999f5bcdf1..483e9b8852 100644
---
a/streams-plugins/streams-plugin-hive/src/test/resources/streams-plugin-hive/pom.xml
+++
b/streams-plugins/streams-plugin-hive/src/test/resources/streams-plugin-hive/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-hive-test</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Test StreamsPojoHiveMojo</name>
@@ -87,7 +87,7 @@
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
+ <artifactId>streams-schema-jsonschemaorg</artifactId>
<version>${project.version}</version>
<type>zip</type>
<classifier>schemas</classifier>
@@ -100,15 +100,10 @@
<plugin>
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-hive</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.1-SNAPSHOT</version>
<configuration>
<sourcePaths>
-
<sourcePath>target/dependency/activitystreams-schemas/activity.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/collection.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/media_link.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/object.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/objectTypes</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/verbs</sourcePath>
+
<sourcePath>target/dependency/jsonschemaorg-schemas</sourcePath>
</sourcePaths>
<targetDirectory>target/generated-resources/hive-mojo</targetDirectory>
</configuration>
diff --git a/streams-plugins/streams-plugin-pig/pom.xml
b/streams-plugins/streams-plugin-pig/pom.xml
index 73d997a74b..5d5cf6a43a 100644
--- a/streams-plugins/streams-plugin-pig/pom.xml
+++ b/streams-plugins/streams-plugin-pig/pom.xml
@@ -38,20 +38,12 @@
<dependencies>
<dependency>
<groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
+ <artifactId>streams-schema-jsonschemaorg</artifactId>
<version>${project.version}</version>
<type>zip</type>
<classifier>schemas</classifier>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <classifier>testdata</classifier>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.streams</groupId>
<artifactId>streams-config</artifactId>
@@ -73,13 +65,6 @@
<artifactId>streams-util</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
diff --git
a/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorCLITest.java
b/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorCLITest.java
index 0a3f0d88dc..9ba0021e79 100644
---
a/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorCLITest.java
+++
b/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorCLITest.java
@@ -36,7 +36,7 @@
@Test
public void testStreamsPigResourceGeneratorCLI() throws Exception {
- String sourceDirectory = "target/dependency/activitystreams-schemas";
+ String sourceDirectory = "target/dependency/jsonschemaorg-schemas";
String targetDirectory = "target/generated-resources/pig-cli";
StreamsPigResourceGenerator.main(new String[]{sourceDirectory,
targetDirectory});
@@ -48,6 +48,6 @@ public void testStreamsPigResourceGeneratorCLI() throws
Exception {
Assert.assertTrue(testOutput.isDirectory());
Collection<File> outputCollection = FileUtils.listFiles(testOutput,
StreamsPigResourceGeneratorTest.pigFilter, true);
- Assert.assertEquals(outputCollection.size(), 133);
+ Assert.assertEquals(4, outputCollection.size());
}
}
\ No newline at end of file
diff --git
a/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorMojoIT.java
b/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorMojoIT.java
index f168c56770..8c0fa64fc1 100644
---
a/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorMojoIT.java
+++
b/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorMojoIT.java
@@ -68,6 +68,6 @@ public void testStreamsPigResourceGeneratorMojo() throws
Exception {
Assert.assertTrue(testOutput.isDirectory());
Collection<File> outputCollection = FileUtils.listFiles(testOutput,
StreamsPigResourceGeneratorTest.pigFilter, true);
- Assert.assertEquals(outputCollection.size(), 133 );
+ Assert.assertEquals(4, outputCollection.size());
}
}
\ No newline at end of file
diff --git
a/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorTest.java
b/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorTest.java
index 1787473c5c..c8157e1e08 100644
---
a/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorTest.java
+++
b/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorTest.java
@@ -52,7 +52,7 @@ public void testStreamsPigResourceGenerator() throws
Exception {
StreamsPigGenerationConfig config = new StreamsPigGenerationConfig();
- String sourceDirectory = "target/dependency/activitystreams-schemas";
+ String sourceDirectory = "target/dependency/jsonschemaorg-schemas";
config.setSourceDirectory(sourceDirectory);
@@ -72,6 +72,6 @@ public void testStreamsPigResourceGenerator() throws
Exception {
Assert.assertTrue(testOutput.isDirectory());
Collection<File> outputCollection = FileUtils.listFiles(testOutput,
pigFilter, true);
- Assert.assertEquals(outputCollection.size(), 133);
+ Assert.assertEquals(4, outputCollection.size());
}
}
\ No newline at end of file
diff --git
a/streams-plugins/streams-plugin-pig/src/test/resources/streams-plugin-pig/pom.xml
b/streams-plugins/streams-plugin-pig/src/test/resources/streams-plugin-pig/pom.xml
index 5cf38d70de..e5e6a02814 100644
---
a/streams-plugins/streams-plugin-pig/src/test/resources/streams-plugin-pig/pom.xml
+++
b/streams-plugins/streams-plugin-pig/src/test/resources/streams-plugin-pig/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-pig-test</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Test StreamsPigResourceGeneratorMojo</name>
@@ -87,7 +87,7 @@
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
+ <artifactId>streams-schema-jsonschemaorg</artifactId>
<version>${project.version}</version>
<type>zip</type>
<classifier>schemas</classifier>
@@ -100,15 +100,10 @@
<plugin>
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-pig</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.1-SNAPSHOT</version>
<configuration>
<sourcePaths>
-
<sourcePath>target/dependency/activitystreams-schemas/activity.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/collection.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/media_link.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/object.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/objectTypes</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/verbs</sourcePath>
+
<sourcePath>target/dependency/jsonschemaorg-schemas</sourcePath>
</sourcePaths>
<targetDirectory>target/generated-resources/pig-mojo</targetDirectory>
</configuration>
diff --git a/streams-plugins/streams-plugin-pojo/pom.xml
b/streams-plugins/streams-plugin-pojo/pom.xml
index e4cf466c06..ab15049c8d 100644
--- a/streams-plugins/streams-plugin-pojo/pom.xml
+++ b/streams-plugins/streams-plugin-pojo/pom.xml
@@ -34,20 +34,12 @@
<dependencies>
<dependency>
<groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
+ <artifactId>streams-schema-jsonschemaorg</artifactId>
<version>${project.version}</version>
<type>zip</type>
<classifier>schemas</classifier>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <classifier>testdata</classifier>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
diff --git
a/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorCLITest.java
b/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorCLITest.java
index f6f4d35168..91da025a2f 100644
---
a/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorCLITest.java
+++
b/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorCLITest.java
@@ -40,7 +40,7 @@
@Test
public void testStreamsPojoSourceGeneratorCLI() throws Exception {
- String sourceDirectory = "target/dependency/activitystreams-schemas";
+ String sourceDirectory = "target/dependency/jsonschemaorg-schemas";
String targetDirectory = "target/generated-sources/test-cli";
StreamsPojoSourceGenerator.main(new String[]{sourceDirectory,
targetDirectory});
@@ -52,6 +52,6 @@ public void testStreamsPojoSourceGeneratorCLI() throws
Exception {
Assert.assertTrue(testOutput.isDirectory());
Collection<File> testOutputFiles = FileUtils.listFiles(testOutput,
StreamsPojoSourceGeneratorTest.javaFilter, true);
- Assert.assertTrue(testOutputFiles.size() > 133);
+ Assert.assertTrue(testOutputFiles.size() == 7);
}
}
diff --git
a/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorMojoIT.java
b/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorMojoIT.java
index 96cd066b17..dcd47f65c8 100644
---
a/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorMojoIT.java
+++
b/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorMojoIT.java
@@ -78,6 +78,6 @@ public void testStreamsPojoSourceGeneratorMojo() throws
Exception {
Assert.assertTrue(testOutput.isDirectory());
Collection<File> testOutputFiles = FileUtils.listFiles(testOutput,
StreamsPojoSourceGeneratorTest.javaFilter, true);
- Assert.assertTrue( testOutputFiles.size() > 133);
+ Assert.assertTrue( testOutputFiles.size() == 7);
}
}
\ No newline at end of file
diff --git
a/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorTest.java
b/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorTest.java
index f92f5d5c6c..f7d8eabe23 100644
---
a/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorTest.java
+++
b/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorTest.java
@@ -55,16 +55,11 @@ public void testStreamsPojoSourceGenerator() throws
Exception {
StreamsPojoGenerationConfig config = new StreamsPojoGenerationConfig();
List<String> sourcePaths = Stream.of(
- "target/dependency/activitystreams-schemas/activity.json",
- "target/dependency/activitystreams-schemas/collection.json",
- "target/dependency/activitystreams-schemas/media_link.json",
- "target/dependency/activitystreams-schemas/object.json",
- "target/dependency/activitystreams-schemas/objectTypes",
- "target/dependency/activitystreams-schemas/verbs"
+ "target/dependency/jsonschemaorg-schemas"
).collect(Collectors.toList());
config.setSourcePaths(sourcePaths);
- config.setTargetPackage("org.apache.streams.pojo");
+ config.setTargetPackage("org.apache.streams.jsonschema.pojo");
config.setTargetDirectory("target/generated-sources/pojo");
StreamsPojoSourceGenerator streamsPojoSourceGenerator = new
StreamsPojoSourceGenerator(config);
@@ -75,6 +70,6 @@ public void testStreamsPojoSourceGenerator() throws Exception
{
Assert.assertTrue(config.getTargetDirectory().isDirectory());
Collection<File> targetFiles =
FileUtils.listFiles(config.getTargetDirectory(), javaFilter, true);
- Assert.assertTrue(targetFiles.size() > 133);
+ Assert.assertTrue(targetFiles.size() == 7);
}
}
\ No newline at end of file
diff --git
a/streams-plugins/streams-plugin-pojo/src/test/resources/streams-plugin-pojo/pom.xml
b/streams-plugins/streams-plugin-pojo/src/test/resources/streams-plugin-pojo/pom.xml
index aa65d1ab73..da204f8a82 100644
---
a/streams-plugins/streams-plugin-pojo/src/test/resources/streams-plugin-pojo/pom.xml
+++
b/streams-plugins/streams-plugin-pojo/src/test/resources/streams-plugin-pojo/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-pojo-test</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Test StreamsPojoMojo</name>
@@ -87,7 +87,7 @@
<dependencies>
<dependency>
<groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
+ <artifactId>streams-schema-jsonschemaorg</artifactId>
<version>${project.version}</version>
<type>zip</type>
<classifier>schemas</classifier>
@@ -144,14 +144,9 @@
<version>${project.version}</version>
<configuration>
<sourcePaths>
-
<sourcePath>target/dependency/activitystreams-schemas/activity.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/collection.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/media_link.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/object.json</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/objectTypes</sourcePath>
-
<sourcePath>target/dependency/activitystreams-schemas/verbs</sourcePath>
+
<sourcePath>target/dependency/jsonschemaorg-schemas</sourcePath>
</sourcePaths>
- <targetPackage>org.apache.streams.pojo.mojo</targetPackage>
+
<targetPackage>org.apache.streams.jsonschema.pojo.mojo</targetPackage>
<targetDirectory>target/generated-sources/pojo-mojo</targetDirectory>
</configuration>
<executions>
diff --git a/streams-plugins/streams-plugin-scala/pom.xml
b/streams-plugins/streams-plugin-scala/pom.xml
index af05d85081..87423daf4e 100644
--- a/streams-plugins/streams-plugin-scala/pom.xml
+++ b/streams-plugins/streams-plugin-scala/pom.xml
@@ -31,22 +31,6 @@
</parent>
<dependencies>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <classifier>schemas</classifier>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <classifier>testdata</classifier>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.streams</groupId>
<artifactId>streams-config</artifactId>
@@ -64,10 +48,10 @@
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
+ <artifactId>streams-pojo</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
diff --git
a/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorCLITest.java
b/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorCLITest.java
index f1e344e29b..733b53ad2b 100644
---
a/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorCLITest.java
+++
b/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorCLITest.java
@@ -55,6 +55,6 @@ public void testStreamsScalaSourceGeneratorCLI() throws
Exception {
Assert.assertTrue(testOutput.isDirectory());
Collection<File> outputCollection = FileUtils.listFiles(testOutput,
scalaFilter, true);
- assert ( outputCollection.size() > 133 );
+ assert ( outputCollection.size() >= 4 );
}
}
diff --git
a/streams-plugins/streams-plugin-scala/src/test/resources/streams-plugin-scala/pom.xml
b/streams-plugins/streams-plugin-scala/src/test/resources/streams-plugin-scala/pom.xml
index 5ae32bef38..cfbe790879 100644
---
a/streams-plugins/streams-plugin-scala/src/test/resources/streams-plugin-scala/pom.xml
+++
b/streams-plugins/streams-plugin-scala/src/test/resources/streams-plugin-scala/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-scala-test</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Test StreamsPojoScalaMojo</name>
@@ -99,11 +99,20 @@
<plugin>
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-scala</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.1-SNAPSHOT</version>
<configuration>
<packages>org.apache.streams.pojo.json</packages>
<target>target/generated-sources/scala-mojo</target>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-pojo</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<goals>
diff --git a/streams-pojo/pom.xml b/streams-pojo/pom.xml
index eebc7747f2..29fa3aa8ff 100644
--- a/streams-pojo/pom.xml
+++ b/streams-pojo/pom.xml
@@ -41,6 +41,14 @@
<classifier>schemas</classifier>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-schema-jsonschemaorg</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <classifier>schemas</classifier>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.apache.streams</groupId>
<artifactId>streams-schema-activitystreams</artifactId>
@@ -203,6 +211,7 @@
<configuration>
<sourcePaths>
<sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+
<sourcePath>${project.basedir}/target/dependency/jsonschemaorg-schemas</sourcePath>
<sourcePath>${project.basedir}/target/dependency/activitystreams-schemas</sourcePath>
<sourcePath>${project.basedir}/target/dependency/activitystreams-schemas/objectTypes</sourcePath>
<sourcePath>${project.basedir}/target/dependency/activitystreams-schemas/verbs</sourcePath>
diff --git a/streams-schemas/pom.xml b/streams-schemas/pom.xml
index 99ec5d9061..51cdf12dc7 100644
--- a/streams-schemas/pom.xml
+++ b/streams-schemas/pom.xml
@@ -35,6 +35,7 @@
<modules>
<module>streams-schema-activitystreams</module>
<module>streams-schema-activitystreams2</module>
+ <module>streams-schema-jsonschemaorg</module>
</modules>
</project>
diff --git
a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/event.json
b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/event.json
index 82993ee133..d599eab6b4 100644
---
a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/event.json
+++
b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/event.json
@@ -13,7 +13,7 @@
"$ref": "../object.json"
},
{
- "$ref": "http://www.json-schema.org/calendar";
+ "$ref":
"../../../../../streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/calendar.json"
}
],
"properties": {
diff --git
a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/person.json
b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/person.json
index e508bdd275..0105e3f9fb 100644
---
a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/person.json
+++
b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/person.json
@@ -13,7 +13,7 @@
"$ref": "../object.json"
},
{
- "$ref": "http://www.json-schema.org/card";
+ "$ref":
"./../../../../streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/card.json"
}
],
"properties": {
diff --git
a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/place.json
b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/place.json
index 1f5cba65d5..474efc99d2 100644
---
a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/place.json
+++
b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/place.json
@@ -18,7 +18,7 @@
"address": {
"type": "object",
"extends": {
- "$ref": "http://www.json-schema.org/address";
+ "$ref":
"./../../../../../streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/address.json"
}
},
"position": {
diff --git a/streams-schemas/streams-schema-jsonschemaorg/pom.xml
b/streams-schemas/streams-schema-jsonschemaorg/pom.xml
new file mode 100644
index 0000000000..62085c8a22
--- /dev/null
+++ b/streams-schemas/streams-schema-jsonschemaorg/pom.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-schemas</artifactId>
+ <version>0.6.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>streams-schema-jsonschemaorg</artifactId>
+ <name>${project.artifactId}</name>
+
+ <description>Jsonschema.org schemas</description>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-resource</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+
<directory>${project.basedir}/src/main/jsonschema</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>schemas</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/resources/assembly-schemas.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git
a/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/address.json
b/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/address.json
new file mode 100644
index 0000000000..074d34e82b
--- /dev/null
+++
b/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/address.json
@@ -0,0 +1,20 @@
+{
+ "description" : "An Address following the convention of
http://microformats.org/wiki/hcard";,
+ "type" : "object",
+ "properties" : {
+ "post-office-box" : { "type" : "string" },
+ "extended-address" : { "type" : "string" },
+ "street-address" : { "type":"string" },
+ "locality" : { "type" : "string", "required" : true },
+ "region" : { "type" : "string", "required" : true },
+ "postal-code" : { "type" : "string" },
+ "country-name" : { "type" : "string", "required" : true }
+ },
+ "dependencies" : {
+ "post-office-box" : "street-address",
+ "extended-address" : "street-address",
+ "street-address" : "region",
+ "locality" : "region",
+ "region" : "country-name"
+ }
+}
\ No newline at end of file
diff --git
a/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/calendar.json
b/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/calendar.json
new file mode 100644
index 0000000000..be6e885120
--- /dev/null
+++
b/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/calendar.json
@@ -0,0 +1,53 @@
+{
+ "description" : "A representation of an event",
+ "type" : "object",
+ "properties" : {
+ "dtstart" : {
+ "format" : "date-time",
+ "type" : "string",
+ "description" : "Event starting time",
+ "required":true
+ },
+ "summary" : {
+ "type":"string",
+ "required":true
+ },
+ "location" : {
+ "type" : "string"
+ },
+ "url" : {
+ "type" : "string",
+ "format" : "url"
+ },
+ "dtend" : {
+ "format" : "date-time",
+ "type" : "string",
+ "description" : "Event ending time"
+ },
+ "duration" : {
+ "format" : "date",
+ "type" : "string",
+ "description" : "Event duration"
+ },
+ "rdate" : {
+ "format" : "date-time",
+ "type" : "string",
+ "description" : "Recurrence date"
+ },
+ "rrule" : {
+ "type" : "string",
+ "description" : "Recurrence rule"
+ },
+ "category" : {
+ "type" : "string"
+ },
+ "description" : {
+ "type" : "string"
+ },
+ "geo" : { "$ref" : "./geo.json" }
+ }
+}
+
+
+
+
diff --git
a/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/card.json
b/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/card.json
new file mode 100644
index 0000000000..48dd3de070
--- /dev/null
+++ b/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/card.json
@@ -0,0 +1,105 @@
+{
+ "description":"A representation of a person, company, organization, or
place",
+ "type":"object",
+ "properties":{
+ "fn":{
+ "description":"Formatted Name",
+ "type":"string"
+ },
+ "familyName":{
+ "type":"string",
+ "required":true
+ },
+ "givenName":{
+ "type":"string",
+ "required":true
+ },
+ "additionalName":{
+ "type":"array",
+ "items":{
+ "type":"string"
+ }
+ },
+ "honorificPrefix":{
+ "type":"array",
+ "items":{
+ "type":"string"
+ }
+ },
+ "honorificSuffix":{
+ "type":"array",
+ "items":{
+ "type":"string"
+ }
+ },
+ "nickname":{
+ "type":"string"
+ },
+ "url":{
+ "type":"string",
+ "format":"url"
+ },
+ "email":{
+ "type":"object",
+ "properties":{
+ "type":{
+ "type":"string"
+ },
+ "value":{
+ "type":"string",
+ "format":"email"
+ }
+ }
+ },
+ "tel":{
+ "type":"object",
+ "properties":{
+ "type":{
+ "type":"string"
+ },
+ "value":{
+ "type":"string",
+ "format":"phone"
+ }
+ }
+ },
+ "adr":{"$ref" : "./address.json"},
+ "geo":{"$ref" : "./geo.json"},
+ "tz":{
+ "type":"string"
+ },
+ "photo":{
+ "format":"image",
+ "type":"string"
+ },
+ "logo":{
+ "format":"image",
+ "type":"string"
+ },
+ "sound":{
+ "format":"attachment",
+ "type":"string"
+ },
+ "bday":{
+ "type":"string",
+ "format":"date"
+ },
+ "title":{
+ "type":"string"
+ },
+ "role":{
+ "type":"string"
+ },
+ "org":{
+ "type":"object",
+ "properties":{
+ "organizationName":{
+ "type":"string"
+ },
+ "organizationUnit":{
+ "type":"string"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git
a/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/geo.json
b/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/geo.json
new file mode 100644
index 0000000000..73ac7e538f
--- /dev/null
+++ b/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/geo.json
@@ -0,0 +1,8 @@
+{
+ "description" : "A geographical coordinate",
+ "type" : "object",
+ "properties" : {
+ "latitude" : { "type" : "number" },
+ "longitude" : { "type" : "number" }
+ }
+}
\ No newline at end of file
diff --git
a/streams-schemas/streams-schema-jsonschemaorg/src/main/resources/assembly-schemas.xml
b/streams-schemas/streams-schema-jsonschemaorg/src/main/resources/assembly-schemas.xml
new file mode 100644
index 0000000000..4f7fc12a68
--- /dev/null
+++
b/streams-schemas/streams-schema-jsonschemaorg/src/main/resources/assembly-schemas.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>schemas</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/jsonschema</directory>
+ <outputDirectory>/jsonschemaorg-schemas</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> http://www.json-schema.org/address is 404
> -----------------------------------------
>
> Key: STREAMS-613
> URL: https://issues.apache.org/jira/browse/STREAMS-613
> Project: Streams
> Issue Type: Bug
> Reporter: Steve Blackmon
> Assignee: Steve Blackmon
> Priority: Major
>
> Streams won’t build because http://www.json-schema.org/address is returning
> 404
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
