Repository: incubator-rya Updated Branches: refs/heads/master 1d99212e6 -> 2326e2dd8
RYA-306 Removed rya.benchmark gen source files from git. Closes #191. Made all generated files appear automatically in their corresponding Eclipse project .classpath file when updating through Maven. Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/2326e2dd Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/2326e2dd Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/2326e2dd Branch: refs/heads/master Commit: 2326e2dd8969cf8295f1f7cb2798efa140b0c2ae Parents: 1d99212 Author: eric.white <eric.wh...@parsons.com> Authored: Tue Aug 1 11:32:06 2017 -0400 Committer: Caleb Meier <caleb.me...@parsons.com> Committed: Tue Aug 8 12:34:15 2017 -0700 ---------------------------------------------------------------------- extras/rya.benchmark/pom.xml | 46 +-- .../src/main/gen/META-INF/sun-jaxb.episode | 26 -- .../rya/benchmark/query/ObjectFactory.java | 113 ------ .../apache/rya/benchmark/query/Parameters.java | 257 -------------- .../benchmark/query/QueriesBenchmarkConf.java | 117 ------- .../gen/org/apache/rya/benchmark/query/Rya.java | 351 ------------------- .../benchmark/query/PCJOptimizerBenchmark.java | 29 +- .../src/main/resources/LICENSE.txt | 16 - extras/rya.export/export.accumulo/pom.xml | 26 +- extras/rya.export/export.api/pom.xml | 28 +- pom.xml | 13 +- 11 files changed, 80 insertions(+), 942 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/2326e2dd/extras/rya.benchmark/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.benchmark/pom.xml b/extras/rya.benchmark/pom.xml index b75b5f0..32c101e 100644 --- a/extras/rya.benchmark/pom.xml +++ b/extras/rya.benchmark/pom.xml @@ -20,7 +20,7 @@ --> <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"> - + <parent> <artifactId>rya.extras</artifactId> <groupId>org.apache.rya</groupId> @@ -43,26 +43,26 @@ <artifactId>jmh-generator-annprocess</artifactId> <scope>provided</scope> </dependency> - + <!-- Rya --> <dependency> <groupId>org.apache.rya</groupId> <artifactId>rya.indexing</artifactId> </dependency> - + <!-- Utils --> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - + <!-- Testing --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> - + <dependency> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-minicluster</artifactId> @@ -71,12 +71,6 @@ </dependencies> <build> - <resources> - <resource> - <directory>src/main/xsd</directory> - </resource> - </resources> - <plugins> <plugin> @@ -105,34 +99,32 @@ </execution> </executions> <configuration> - <!-- Place the generated source within the 'src' directory so license-maven-plugin will find it. --> - <outputDirectory>src/main/gen</outputDirectory> <packageName>org.apache.rya.benchmark.query</packageName> </configuration> </plugin> - - <!-- Automatically place Apache 2 license headers at the top of all of the project's Java files. - Rat runs during the 'validate' lifecycle step, so it will fail the build before this one - executes if any of the headers are missing. Run the build with rat turned off to add - missing headers to the Java files. --> + <plugin> - <groupId>com.mycila</groupId> + <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> - <version>2.6</version> - <configuration> - <!-- We use a custome Apache 2.0 license because we do not include a copywrite section. --> - <header>src/main/resources/LICENSE.txt</header> - </configuration> <executions> <execution> - <phase>process-sources</phase> + <id>update-generated-source-headers</id> <goals> - <goal>format</goal> + <goal>update-file-header</goal> </goals> + <phase>process-sources</phase> + <configuration> + <roots> + <root>${project.build.directory}/generated-sources/jaxb</root> + </roots> + <extraFiles> + <sun-jaxb.episode>xml</sun-jaxb.episode> + </extraFiles> + </configuration> </execution> </executions> </plugin> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/2326e2dd/extras/rya.benchmark/src/main/gen/META-INF/sun-jaxb.episode ---------------------------------------------------------------------- diff --git a/extras/rya.benchmark/src/main/gen/META-INF/sun-jaxb.episode b/extras/rya.benchmark/src/main/gen/META-INF/sun-jaxb.episode deleted file mode 100644 index 81fca66..0000000 --- a/extras/rya.benchmark/src/main/gen/META-INF/sun-jaxb.episode +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<jaxb:bindings version="2.1" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"> - <!-- - -This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 -See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> -Any modifications to this file will be lost upon recompilation of the source schema. -Generated on: 2016.12.16 at 01:22:14 PM PST - - --> - <jaxb:bindings scd="x-schema::"> - <jaxb:schemaBindings map="false"> - <jaxb:package name="org.apache.rya.benchmark.query"/> - </jaxb:schemaBindings> - <jaxb:bindings scd="~Parameters"> - <jaxb:class ref="org.apache.rya.benchmark.query.Parameters"/> - </jaxb:bindings> - <jaxb:bindings scd="~Rya"> - <jaxb:class ref="org.apache.rya.benchmark.query.Rya"/> - </jaxb:bindings> - <jaxb:bindings scd="QueriesBenchmarkConf"> - <jaxb:class ref="org.apache.rya.benchmark.query.QueriesBenchmarkConf"/> - </jaxb:bindings> - </jaxb:bindings> -</jaxb:bindings> - http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/2326e2dd/extras/rya.benchmark/src/main/gen/org/apache/rya/benchmark/query/ObjectFactory.java ---------------------------------------------------------------------- diff --git a/extras/rya.benchmark/src/main/gen/org/apache/rya/benchmark/query/ObjectFactory.java b/extras/rya.benchmark/src/main/gen/org/apache/rya/benchmark/query/ObjectFactory.java deleted file mode 100644 index 8762e8e..0000000 --- a/extras/rya.benchmark/src/main/gen/org/apache/rya/benchmark/query/ObjectFactory.java +++ /dev/null @@ -1,113 +0,0 @@ -/** - * 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 - * with the License. You may obtain a copy of the License at - * - * 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. - */ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.12.16 at 01:22:14 PM PST -// - - -package org.apache.rya.benchmark.query; - -import javax.xml.bind.annotation.XmlRegistry; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.apache.rya.benchmark.query package. - * <p>An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.rya.benchmark.query - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link Parameters } - * - */ - public Parameters createParameters() { - return new Parameters(); - } - - /** - * Create an instance of {@link Rya } - * - */ - public Rya createRya() { - return new Rya(); - } - - /** - * Create an instance of {@link QueriesBenchmarkConf } - * - */ - public QueriesBenchmarkConf createQueriesBenchmarkConf() { - return new QueriesBenchmarkConf(); - } - - /** - * Create an instance of {@link Parameters.NumReadsRuns } - * - */ - public Parameters.NumReadsRuns createParametersNumReadsRuns() { - return new Parameters.NumReadsRuns(); - } - - /** - * Create an instance of {@link Parameters.Queries } - * - */ - public Parameters.Queries createParametersQueries() { - return new Parameters.Queries(); - } - - /** - * Create an instance of {@link Rya.Accumulo } - * - */ - public Rya.Accumulo createRyaAccumulo() { - return new Rya.Accumulo(); - } - - /** - * Create an instance of {@link Rya.SecondaryIndexing } - * - */ - public Rya.SecondaryIndexing createRyaSecondaryIndexing() { - return new Rya.SecondaryIndexing(); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/2326e2dd/extras/rya.benchmark/src/main/gen/org/apache/rya/benchmark/query/Parameters.java ---------------------------------------------------------------------- diff --git a/extras/rya.benchmark/src/main/gen/org/apache/rya/benchmark/query/Parameters.java b/extras/rya.benchmark/src/main/gen/org/apache/rya/benchmark/query/Parameters.java deleted file mode 100644 index a5f7181..0000000 --- a/extras/rya.benchmark/src/main/gen/org/apache/rya/benchmark/query/Parameters.java +++ /dev/null @@ -1,257 +0,0 @@ -/** - * 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 - * with the License. You may obtain a copy of the License at - * - * 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. - */ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.12.16 at 01:22:14 PM PST -// - - -package org.apache.rya.benchmark.query; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for Parameters complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="Parameters"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="NumReadsRuns"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="NumReads" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </element> - * <element name="Queries" minOccurs="0"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="SPARQL" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </element> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Parameters", propOrder = { - "numReadsRuns", - "queries" -}) -public class Parameters { - - @XmlElement(name = "NumReadsRuns", required = true) - protected Parameters.NumReadsRuns numReadsRuns; - @XmlElement(name = "Queries") - protected Parameters.Queries queries; - - /** - * Gets the value of the numReadsRuns property. - * - * @return - * possible object is - * {@link Parameters.NumReadsRuns } - * - */ - public Parameters.NumReadsRuns getNumReadsRuns() { - return numReadsRuns; - } - - /** - * Sets the value of the numReadsRuns property. - * - * @param value - * allowed object is - * {@link Parameters.NumReadsRuns } - * - */ - public void setNumReadsRuns(Parameters.NumReadsRuns value) { - this.numReadsRuns = value; - } - - /** - * Gets the value of the queries property. - * - * @return - * possible object is - * {@link Parameters.Queries } - * - */ - public Parameters.Queries getQueries() { - return queries; - } - - /** - * Sets the value of the queries property. - * - * @param value - * allowed object is - * {@link Parameters.Queries } - * - */ - public void setQueries(Parameters.Queries value) { - this.queries = value; - } - - - /** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="NumReads" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "numReads" - }) - public static class NumReadsRuns { - - @XmlElement(name = "NumReads", required = true) - protected List<String> numReads; - - /** - * Gets the value of the numReads property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the numReads property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getNumReads().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List<String> getNumReads() { - if (numReads == null) { - numReads = new ArrayList<String>(); - } - return this.numReads; - } - - } - - - /** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="SPARQL" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "sparql" - }) - public static class Queries { - - @XmlElement(name = "SPARQL", required = true) - protected List<String> sparql; - - /** - * Gets the value of the sparql property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the sparql property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getSPARQL().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List<String> getSPARQL() { - if (sparql == null) { - sparql = new ArrayList<String>(); - } - return this.sparql; - } - - } - -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/2326e2dd/extras/rya.benchmark/src/main/gen/org/apache/rya/benchmark/query/QueriesBenchmarkConf.java ---------------------------------------------------------------------- diff --git a/extras/rya.benchmark/src/main/gen/org/apache/rya/benchmark/query/QueriesBenchmarkConf.java b/extras/rya.benchmark/src/main/gen/org/apache/rya/benchmark/query/QueriesBenchmarkConf.java deleted file mode 100644 index fa5cf08..0000000 --- a/extras/rya.benchmark/src/main/gen/org/apache/rya/benchmark/query/QueriesBenchmarkConf.java +++ /dev/null @@ -1,117 +0,0 @@ -/** - * 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 - * with the License. You may obtain a copy of the License at - * - * 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. - */ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.12.16 at 01:22:14 PM PST -// - - -package org.apache.rya.benchmark.query; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="Rya" type="{}Rya"/> - * <element name="Parameters" type="{}Parameters"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "rya", - "parameters" -}) -@XmlRootElement(name = "QueriesBenchmarkConf") -public class QueriesBenchmarkConf { - - @XmlElement(name = "Rya", required = true) - protected Rya rya; - @XmlElement(name = "Parameters", required = true) - protected Parameters parameters; - - /** - * Gets the value of the rya property. - * - * @return - * possible object is - * {@link Rya } - * - */ - public Rya getRya() { - return rya; - } - - /** - * Sets the value of the rya property. - * - * @param value - * allowed object is - * {@link Rya } - * - */ - public void setRya(Rya value) { - this.rya = value; - } - - /** - * Gets the value of the parameters property. - * - * @return - * possible object is - * {@link Parameters } - * - */ - public Parameters getParameters() { - return parameters; - } - - /** - * Sets the value of the parameters property. - * - * @param value - * allowed object is - * {@link Parameters } - * - */ - public void setParameters(Parameters value) { - this.parameters = value; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/2326e2dd/extras/rya.benchmark/src/main/gen/org/apache/rya/benchmark/query/Rya.java ---------------------------------------------------------------------- diff --git a/extras/rya.benchmark/src/main/gen/org/apache/rya/benchmark/query/Rya.java b/extras/rya.benchmark/src/main/gen/org/apache/rya/benchmark/query/Rya.java deleted file mode 100644 index 98e3c52..0000000 --- a/extras/rya.benchmark/src/main/gen/org/apache/rya/benchmark/query/Rya.java +++ /dev/null @@ -1,351 +0,0 @@ -/** - * 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 - * with the License. You may obtain a copy of the License at - * - * 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. - */ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.12.16 at 01:22:14 PM PST -// - - -package org.apache.rya.benchmark.query; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for Rya complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="Rya"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="ryaInstanceName" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="accumulo"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="username" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="password" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="zookeepers" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="instanceName" type="{http://www.w3.org/2001/XMLSchema}string"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </element> - * <element name="secondaryIndexing"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="usePCJ" type="{http://www.w3.org/2001/XMLSchema}boolean"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </element> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Rya", propOrder = { - "ryaInstanceName", - "accumulo", - "secondaryIndexing" -}) -public class Rya { - - @XmlElement(required = true) - protected String ryaInstanceName; - @XmlElement(required = true) - protected Rya.Accumulo accumulo; - @XmlElement(required = true) - protected Rya.SecondaryIndexing secondaryIndexing; - - /** - * Gets the value of the ryaInstanceName property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getRyaInstanceName() { - return ryaInstanceName; - } - - /** - * Sets the value of the ryaInstanceName property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setRyaInstanceName(String value) { - this.ryaInstanceName = value; - } - - /** - * Gets the value of the accumulo property. - * - * @return - * possible object is - * {@link Rya.Accumulo } - * - */ - public Rya.Accumulo getAccumulo() { - return accumulo; - } - - /** - * Sets the value of the accumulo property. - * - * @param value - * allowed object is - * {@link Rya.Accumulo } - * - */ - public void setAccumulo(Rya.Accumulo value) { - this.accumulo = value; - } - - /** - * Gets the value of the secondaryIndexing property. - * - * @return - * possible object is - * {@link Rya.SecondaryIndexing } - * - */ - public Rya.SecondaryIndexing getSecondaryIndexing() { - return secondaryIndexing; - } - - /** - * Sets the value of the secondaryIndexing property. - * - * @param value - * allowed object is - * {@link Rya.SecondaryIndexing } - * - */ - public void setSecondaryIndexing(Rya.SecondaryIndexing value) { - this.secondaryIndexing = value; - } - - - /** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="username" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="password" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="zookeepers" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="instanceName" type="{http://www.w3.org/2001/XMLSchema}string"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "username", - "password", - "zookeepers", - "instanceName" - }) - public static class Accumulo { - - @XmlElement(required = true) - protected String username; - @XmlElement(required = true) - protected String password; - @XmlElement(required = true) - protected String zookeepers; - @XmlElement(required = true) - protected String instanceName; - - /** - * Gets the value of the username property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getUsername() { - return username; - } - - /** - * Sets the value of the username property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setUsername(String value) { - this.username = value; - } - - /** - * Gets the value of the password property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPassword() { - return password; - } - - /** - * Sets the value of the password property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPassword(String value) { - this.password = value; - } - - /** - * Gets the value of the zookeepers property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getZookeepers() { - return zookeepers; - } - - /** - * Sets the value of the zookeepers property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setZookeepers(String value) { - this.zookeepers = value; - } - - /** - * Gets the value of the instanceName property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getInstanceName() { - return instanceName; - } - - /** - * Sets the value of the instanceName property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setInstanceName(String value) { - this.instanceName = value; - } - - } - - - /** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="usePCJ" type="{http://www.w3.org/2001/XMLSchema}boolean"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "usePCJ" - }) - public static class SecondaryIndexing { - - protected boolean usePCJ; - - /** - * Gets the value of the usePCJ property. - * - */ - public boolean isUsePCJ() { - return usePCJ; - } - - /** - * Sets the value of the usePCJ property. - * - */ - public void setUsePCJ(boolean value) { - this.usePCJ = value; - } - - } - -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/2326e2dd/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java ---------------------------------------------------------------------- diff --git a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java index efbe745..6841048 100644 --- a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java +++ b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java @@ -16,24 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -/** -ll * 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 - * with the License. You may obtain a copy of the License at - * - * 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. - */ package org.apache.rya.benchmark.query; import static com.google.common.base.Preconditions.checkArgument; @@ -46,9 +28,9 @@ import java.util.Map; import java.util.Objects; import java.util.Queue; -import edu.umd.cs.findbugs.annotations.DefaultAnnotation; -import edu.umd.cs.findbugs.annotations.NonNull; - +import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; +import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet; +import org.apache.rya.indexing.pcj.matching.PCJOptimizer; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; @@ -67,9 +49,8 @@ import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.base.Joiner; import com.google.common.collect.Lists; -import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; -import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet; -import org.apache.rya.indexing.pcj.matching.PCJOptimizer; +import edu.umd.cs.findbugs.annotations.DefaultAnnotation; +import edu.umd.cs.findbugs.annotations.NonNull; /** * A benchmark that may be used to evaluate the performance of {@link PCJOptimizer}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/2326e2dd/extras/rya.benchmark/src/main/resources/LICENSE.txt ---------------------------------------------------------------------- diff --git a/extras/rya.benchmark/src/main/resources/LICENSE.txt b/extras/rya.benchmark/src/main/resources/LICENSE.txt deleted file mode 100644 index 4a9fe83..0000000 --- a/extras/rya.benchmark/src/main/resources/LICENSE.txt +++ /dev/null @@ -1,16 +0,0 @@ -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 -with the License. You may obtain a copy of the License at - - 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. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/2326e2dd/extras/rya.export/export.accumulo/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.accumulo/pom.xml b/extras/rya.export/export.accumulo/pom.xml index 194e8bb..19342d2 100644 --- a/extras/rya.export/export.accumulo/pom.xml +++ b/extras/rya.export/export.accumulo/pom.xml @@ -95,13 +95,31 @@ under the License. </execution> </executions> <configuration> - <sources> - <source>src/main/xsd/AccumuloMergeConfiguration.xsd</source> - </sources> <packageName>org.apache.rya.export</packageName> - <outputDirectory>src/gen/java</outputDirectory> </configuration> </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <executions> + <execution> + <id>update-generated-source-headers</id> + <goals> + <goal>update-file-header</goal> + </goals> + <phase>process-sources</phase> + <configuration> + <roots> + <root>${project.build.directory}/generated-sources/jaxb</root> + </roots> + <extraFiles> + <sun-jaxb.episode>xml</sun-jaxb.episode> + </extraFiles> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/2326e2dd/extras/rya.export/export.api/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.api/pom.xml b/extras/rya.export/export.api/pom.xml index f881849..f699bec 100644 --- a/extras/rya.export/export.api/pom.xml +++ b/extras/rya.export/export.api/pom.xml @@ -72,11 +72,6 @@ under the License. <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> - <dependency> - <groupId>org.glassfish.jaxb</groupId> - <artifactId>jaxb-xjc</artifactId> - <version>2.2.11</version> - </dependency> </dependencies> <build> @@ -94,10 +89,31 @@ under the License. </executions> <configuration> <packageName>org.apache.rya.export</packageName> - <outputDirectory>src/gen/java</outputDirectory> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <executions> + <execution> + <id>update-generated-source-headers</id> + <goals> + <goal>update-file-header</goal> + </goals> + <phase>process-sources</phase> + <configuration> + <roots> + <root>${project.build.directory}/generated-sources/jaxb</root> + </roots> + <extraFiles> + <sun-jaxb.episode>xml</sun-jaxb.episode> + </extraFiles> + </configuration> + </execution> + </executions> + </plugin> + <!--Create shaded jar with all the dependencies--> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/2326e2dd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1f4241d..66356c5 100644 --- a/pom.xml +++ b/pom.xml @@ -846,7 +846,7 @@ under the License. <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jaxb2-maven-plugin</artifactId> - <version>2.2</version> + <version>2.3.1</version> </plugin> <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <plugin> @@ -889,6 +889,17 @@ under the License. </excludes> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <version>1.13</version> + <configuration> + <licenseName>apache_v2</licenseName> + <processStartTag>========================LICENSE_START=================================</processStartTag> + <processEndTag>=========================LICENSE_END==================================</processEndTag> + <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage> + </configuration> + </plugin> </plugins> </pluginManagement>