http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/CardinalityIdentityReducerTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/CardinalityIdentityReducerTest.java b/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/CardinalityIdentityReducerTest.java index eb480ad..4a57f31 100644 --- a/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/CardinalityIdentityReducerTest.java +++ b/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/CardinalityIdentityReducerTest.java @@ -1,25 +1,26 @@ package mvm.rya.joinselect.mr; /* - * #%L - * mvm.rya.rya.prospector - * %% - * Copyright (C) 2014 - 2015 Rya - * %% - * Licensed 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 + * 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 + * 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. - * #L% + * 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. */ + + import java.io.IOException; import java.util.ArrayList; import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/CardinalityMapperTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/CardinalityMapperTest.java b/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/CardinalityMapperTest.java index 8647294..3818300 100644 --- a/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/CardinalityMapperTest.java +++ b/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/CardinalityMapperTest.java @@ -1,25 +1,26 @@ package mvm.rya.joinselect.mr; /* - * #%L - * mvm.rya.rya.prospector - * %% - * Copyright (C) 2014 - 2015 Rya - * %% - * Licensed 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 + * 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 + * 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. - * #L% + * 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. */ + + import java.io.IOException; import mvm.rya.joinselect.mr.JoinSelectProspectOutput; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/FullTableSizeTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/FullTableSizeTest.java b/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/FullTableSizeTest.java index c070488..705edb1 100644 --- a/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/FullTableSizeTest.java +++ b/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/FullTableSizeTest.java @@ -1,25 +1,26 @@ package mvm.rya.joinselect.mr; /* - * #%L - * mvm.rya.rya.prospector - * %% - * Copyright (C) 2014 - 2015 Rya - * %% - * Licensed 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 + * 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 + * 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. - * #L% + * 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. */ + + import java.io.IOException; import mvm.rya.joinselect.mr.FullTableSize; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinReducerTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinReducerTest.java b/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinReducerTest.java index 5d2acb7..be03565 100644 --- a/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinReducerTest.java +++ b/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinReducerTest.java @@ -1,25 +1,26 @@ package mvm.rya.joinselect.mr; /* - * #%L - * mvm.rya.rya.prospector - * %% - * Copyright (C) 2014 - 2015 Rya - * %% - * Licensed 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 + * 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 + * 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. - * #L% + * 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. */ + + import java.io.IOException; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectMapperTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectMapperTest.java b/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectMapperTest.java index e9281da..0d53b90 100644 --- a/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectMapperTest.java +++ b/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectMapperTest.java @@ -1,25 +1,26 @@ package mvm.rya.joinselect.mr; /* - * #%L - * mvm.rya.rya.prospector - * %% - * Copyright (C) 2014 - 2015 Rya - * %% - * Licensed 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 + * 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 + * 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. - * #L% + * 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. */ + + import java.io.IOException; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectProspectOutputTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectProspectOutputTest.java b/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectProspectOutputTest.java index c00f8ff..19c90a3 100644 --- a/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectProspectOutputTest.java +++ b/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectProspectOutputTest.java @@ -1,5 +1,25 @@ package mvm.rya.joinselect.mr; +/* + * 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. + */ + + import static org.junit.Assert.*; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectStatisticsSumTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectStatisticsSumTest.java b/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectStatisticsSumTest.java index 525cd94..98236d3 100644 --- a/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectStatisticsSumTest.java +++ b/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectStatisticsSumTest.java @@ -1,25 +1,26 @@ package mvm.rya.joinselect.mr; /* - * #%L - * mvm.rya.rya.prospector - * %% - * Copyright (C) 2014 - 2015 Rya - * %% - * Licensed 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 + * 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 + * 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. - * #L% + * 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. */ + + import java.io.IOException; import mvm.rya.joinselect.mr.JoinSelectStatisticsSum; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectStatisticsTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectStatisticsTest.java b/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectStatisticsTest.java index c9a04a9..7061a2c 100644 --- a/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectStatisticsTest.java +++ b/extras/rya.prospector/src/test/java/mvm/rya/joinselect/mr/JoinSelectStatisticsTest.java @@ -1,25 +1,26 @@ package mvm.rya.joinselect.mr; /* - * #%L - * mvm.rya.rya.prospector - * %% - * Copyright (C) 2014 - 2015 Rya - * %% - * Licensed 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 + * 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 + * 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. - * #L% + * 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. */ + + import static mvm.rya.joinselect.mr.utils.JoinSelectConstants.INPUTPATH; import static mvm.rya.joinselect.mr.utils.JoinSelectConstants.INSTANCE; import static mvm.rya.joinselect.mr.utils.JoinSelectConstants.OUTPUTPATH; @@ -83,6 +84,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.IntWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.Job; +import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.hadoop.mapreduce.lib.input.MultipleInputs; import org.apache.hadoop.mapreduce.lib.input.SequenceFileInputFormat; import org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat; @@ -124,7 +126,7 @@ public class JoinSelectStatisticsTest { Job job = new Job(conf, this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); job.setJarByClass(this.getClass()); - job.setUserClassesTakesPrecedence(true); + conf.setBoolean(MRJobConfig.MAPREDUCE_JOB_USER_CLASSPATH_FIRST, true); initTabToSeqFileJob(job, inTable, outPath); job.setMapperClass(JoinSelectMapper.class); @@ -153,7 +155,7 @@ public class JoinSelectStatisticsTest { Job job = new Job(conf, this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); job.setJarByClass(this.getClass()); - job.setUserClassesTakesPrecedence(true); + conf.setBoolean(MRJobConfig.MAPREDUCE_JOB_USER_CLASSPATH_FIRST, true); initTabToSeqFileJob(job, inTable, outPath); job.setMapperClass(CardinalityMapper.class); @@ -175,9 +177,9 @@ public class JoinSelectStatisticsTest { Configuration conf = getConf(); String outpath = conf.get(OUTPUTPATH); - Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); + Job job = new Job(conf, this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); job.setJarByClass(this.getClass()); - job.setUserClassesTakesPrecedence(true); + conf.setBoolean(MRJobConfig.MAPREDUCE_JOB_USER_CLASSPATH_FIRST, true); MultipleInputs.addInputPath(job, new Path(PROSPECTSOUT.getAbsolutePath()), SequenceFileInputFormat.class, JoinSelectAggregateMapper.class); @@ -867,4 +869,4 @@ public class JoinSelectStatisticsTest { - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/rya.prospector/src/test/resources/stats_cluster_config.xml ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/test/resources/stats_cluster_config.xml b/extras/rya.prospector/src/test/resources/stats_cluster_config.xml index 7287813..5c96044 100644 --- a/extras/rya.prospector/src/test/resources/stats_cluster_config.xml +++ b/extras/rya.prospector/src/test/resources/stats_cluster_config.xml @@ -1,4 +1,25 @@ <?xml version="1.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. +--> + <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> <configuration> <!-- Accumulo info --> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/tinkerpop.rya/pom.xml ---------------------------------------------------------------------- diff --git a/extras/tinkerpop.rya/pom.xml b/extras/tinkerpop.rya/pom.xml index 51e21eb..88d7a09 100644 --- a/extras/tinkerpop.rya/pom.xml +++ b/extras/tinkerpop.rya/pom.xml @@ -1,42 +1,64 @@ <?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 +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. +--> + <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>mvm.rya</groupId> + <groupId>org.apache.rya</groupId> <artifactId>rya.extras</artifactId> <version>3.2.10-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <name>${project.groupId}.${project.artifactId}</name> <artifactId>tinkerpop.rya</artifactId> + <name>Apache Rya Tinkerpop</name> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>mvm.rya</groupId> - <artifactId>rya.sail.impl</artifactId> + <groupId>org.apache.rya</groupId> + <artifactId>rya.sail</artifactId> </dependency> <dependency> - <groupId>mvm.rya</groupId> + <groupId>org.apache.rya</groupId> <artifactId>accumulo.rya</artifactId> </dependency> + <dependency> <groupId>com.tinkerpop.gremlin</groupId> <artifactId>gremlin-groovy</artifactId> </dependency> + <dependency> <groupId>com.tinkerpop.rexster</groupId> <artifactId>rexster-server</artifactId> - <version>${blueprints.version}</version> </dependency> <dependency> <groupId>com.tinkerpop.blueprints</groupId> <artifactId>blueprints-sail-graph</artifactId> </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> @@ -44,7 +66,6 @@ <plugin> <groupId>org.codehaus.gmaven</groupId> <artifactId>gmaven-plugin</artifactId> - <version>1.3</version> <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> @@ -80,57 +101,4 @@ </plugins> </build> - <profiles> - <profile> - <id>accumulo</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-core</artifactId> - <optional>true</optional> - </dependency> - </dependencies> - </profile> - <profile> - <id>cloudbase</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>com.texeltek</groupId> - <artifactId>accumulo-cloudbase-shim</artifactId> - <optional>true</optional> - </dependency> - </dependencies> - </profile> - <profile> - <id>uberjar</id> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - </project> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/config/RyaGraphConfiguration.groovy ---------------------------------------------------------------------- diff --git a/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/config/RyaGraphConfiguration.groovy b/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/config/RyaGraphConfiguration.groovy index 6559370..fc3419d 100644 --- a/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/config/RyaGraphConfiguration.groovy +++ b/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/config/RyaGraphConfiguration.groovy @@ -1,3 +1,22 @@ +/* + * 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 mvm.rya.blueprints.config import com.tinkerpop.blueprints.Direction; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailEdge.groovy ---------------------------------------------------------------------- diff --git a/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailEdge.groovy b/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailEdge.groovy index 13a6470..73c4fc1 100644 --- a/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailEdge.groovy +++ b/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailEdge.groovy @@ -1,3 +1,22 @@ +/* + * 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 mvm.rya.blueprints.sail // //import com.tinkerpop.blueprints.pgm.impls.sail.SailEdge http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailEdgeSequence.groovy ---------------------------------------------------------------------- diff --git a/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailEdgeSequence.groovy b/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailEdgeSequence.groovy index 2bf26af..8d04c75 100644 --- a/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailEdgeSequence.groovy +++ b/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailEdgeSequence.groovy @@ -1,3 +1,22 @@ +/* + * 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 mvm.rya.blueprints.sail import com.tinkerpop.blueprints.Edge http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailGraph.groovy ---------------------------------------------------------------------- diff --git a/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailGraph.groovy b/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailGraph.groovy index e5783e2..7c78e31 100644 --- a/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailGraph.groovy +++ b/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailGraph.groovy @@ -1,3 +1,22 @@ +/* + * 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 mvm.rya.blueprints.sail import com.tinkerpop.blueprints.impls.sail.SailGraph http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailVertex.groovy ---------------------------------------------------------------------- diff --git a/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailVertex.groovy b/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailVertex.groovy index 3f6ec64..96ef08e 100644 --- a/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailVertex.groovy +++ b/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailVertex.groovy @@ -1,3 +1,22 @@ +/* + * 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 mvm.rya.blueprints.sail // //import com.tinkerpop.blueprints.pgm.impls.MultiIterable http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailVertexSequence.groovy ---------------------------------------------------------------------- diff --git a/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailVertexSequence.groovy b/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailVertexSequence.groovy index e0d7479..451955d 100644 --- a/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailVertexSequence.groovy +++ b/extras/tinkerpop.rya/src/main/groovy/mvm/rya/blueprints/sail/RyaSailVertexSequence.groovy @@ -1,3 +1,22 @@ +/* + * 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 mvm.rya.blueprints.sail import com.google.common.collect.Iterators http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailEdge.java ---------------------------------------------------------------------- diff --git a/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailEdge.java b/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailEdge.java index 4345283..22eff06 100644 --- a/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailEdge.java +++ b/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailEdge.java @@ -1,25 +1,26 @@ package mvm.rya.blueprints.sail; /* - * #%L - * mvm.rya.tinkerpop.rya - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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 + * 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 + * 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. - * #L% + * 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. */ + + import com.tinkerpop.blueprints.impls.sail.SailEdge; import org.openrdf.model.Resource; import org.openrdf.model.Statement; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailVertex.java ---------------------------------------------------------------------- diff --git a/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailVertex.java b/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailVertex.java index c02a376..2bb8f3f 100644 --- a/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailVertex.java +++ b/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailVertex.java @@ -1,25 +1,26 @@ package mvm.rya.blueprints.sail; /* - * #%L - * mvm.rya.tinkerpop.rya - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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 + * 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 + * 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. - * #L% + * 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. */ + + import com.tinkerpop.blueprints.Direction; import com.tinkerpop.blueprints.Edge; import com.tinkerpop.blueprints.util.MultiIterable; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/tinkerpop.rya/src/test/groovy/mvm/rya/blueprints/TstGremlinRya.groovy ---------------------------------------------------------------------- diff --git a/extras/tinkerpop.rya/src/test/groovy/mvm/rya/blueprints/TstGremlinRya.groovy b/extras/tinkerpop.rya/src/test/groovy/mvm/rya/blueprints/TstGremlinRya.groovy index 2914ac1..fe0f4e0 100644 --- a/extras/tinkerpop.rya/src/test/groovy/mvm/rya/blueprints/TstGremlinRya.groovy +++ b/extras/tinkerpop.rya/src/test/groovy/mvm/rya/blueprints/TstGremlinRya.groovy @@ -1,3 +1,22 @@ +/* + * 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 mvm.rya.blueprints // //import com.tinkerpop.blueprints.pgm.impls.sail.SailGraph @@ -24,25 +43,6 @@ // // def conf = new AccumuloRdfConfiguration(); -/* - * #%L - * mvm.rya.tinkerpop.rya - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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. - * #L% - */ // conf.setDisplayQueryPlan(true); // def store = new RdfCloudTripleStore(); // store.setConf(conf); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/tinkerpop.rya/src/test/groovy/mvm/rya/blueprints/config/RyaGraphConfigurationTest.groovy ---------------------------------------------------------------------- diff --git a/extras/tinkerpop.rya/src/test/groovy/mvm/rya/blueprints/config/RyaGraphConfigurationTest.groovy b/extras/tinkerpop.rya/src/test/groovy/mvm/rya/blueprints/config/RyaGraphConfigurationTest.groovy index 1de38f6..9dd0627 100644 --- a/extras/tinkerpop.rya/src/test/groovy/mvm/rya/blueprints/config/RyaGraphConfigurationTest.groovy +++ b/extras/tinkerpop.rya/src/test/groovy/mvm/rya/blueprints/config/RyaGraphConfigurationTest.groovy @@ -1,3 +1,22 @@ +/* + * 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 mvm.rya.blueprints.config import com.tinkerpop.blueprints.Vertex @@ -28,25 +47,6 @@ import org.apache.accumulo.core.security.TablePermission class RyaGraphConfigurationTest extends TestCase { private String user = "user"; -/* - * #%L - * mvm.rya.tinkerpop.rya - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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. - * #L% - */ private String pwd = "pwd"; private String instance = "myinstance"; private String tablePrefix = "t_"; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/tinkerpop.rya/src/test/groovy/mvm/rya/blueprints/sail/RyaSailVertexSequenceTest.groovy ---------------------------------------------------------------------- diff --git a/extras/tinkerpop.rya/src/test/groovy/mvm/rya/blueprints/sail/RyaSailVertexSequenceTest.groovy b/extras/tinkerpop.rya/src/test/groovy/mvm/rya/blueprints/sail/RyaSailVertexSequenceTest.groovy index 9196eb7..c661350 100644 --- a/extras/tinkerpop.rya/src/test/groovy/mvm/rya/blueprints/sail/RyaSailVertexSequenceTest.groovy +++ b/extras/tinkerpop.rya/src/test/groovy/mvm/rya/blueprints/sail/RyaSailVertexSequenceTest.groovy @@ -1,3 +1,22 @@ +/* + * 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 mvm.rya.blueprints.sail import mvm.rya.api.utils.IteratorWrapper @@ -24,25 +43,6 @@ class RyaSailVertexSequenceTest extends TestCase { ] ); -/* - * #%L - * mvm.rya.tinkerpop.rya - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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. - * #L% - */ def a = vf.createURI(namespace, "a") def b = vf.createURI(namespace, "b") def c = vf.createURI(namespace, "c") http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/extras/tinkerpop.rya/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/extras/tinkerpop.rya/src/test/resources/log4j.properties b/extras/tinkerpop.rya/src/test/resources/log4j.properties index 8ed05c6..598d7b5 100644 --- a/extras/tinkerpop.rya/src/test/resources/log4j.properties +++ b/extras/tinkerpop.rya/src/test/resources/log4j.properties @@ -1,19 +1,19 @@ -### -# #%L -# mvm.rya.tinkerpop.rya -# %% -# Copyright (C) 2014 Rya -# %% -# Licensed 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 +# 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 +# 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. -# #L% -### +# 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. + + + http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/iterators/accumulo.iterators/pom.xml ---------------------------------------------------------------------- diff --git a/iterators/accumulo.iterators/pom.xml b/iterators/accumulo.iterators/pom.xml deleted file mode 100644 index fe36f39..0000000 --- a/iterators/accumulo.iterators/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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> - <groupId>mvm.rya</groupId> - <artifactId>rya.iterators</artifactId> - <version>3.2.10-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>accumulo.iterators</artifactId> - <name>${project.groupId}.${project.artifactId}</name> - <properties> - - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - -</project> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/iterators/accumulo.iterators/src/main/java/mvm/rya/iterators/LimitingAgeOffFilter.java ---------------------------------------------------------------------- diff --git a/iterators/accumulo.iterators/src/main/java/mvm/rya/iterators/LimitingAgeOffFilter.java b/iterators/accumulo.iterators/src/main/java/mvm/rya/iterators/LimitingAgeOffFilter.java deleted file mode 100644 index 33d5b98..0000000 --- a/iterators/accumulo.iterators/src/main/java/mvm/rya/iterators/LimitingAgeOffFilter.java +++ /dev/null @@ -1,138 +0,0 @@ -package mvm.rya.iterators; - -/* - * #%L - * mvm.rya.accumulo.iterators - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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. - * #L% - */ - -import java.io.IOException; -import java.util.Map; - -import org.apache.accumulo.core.client.IteratorSetting; -import org.apache.accumulo.core.data.Key; -import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.iterators.Filter; -import org.apache.accumulo.core.iterators.IteratorEnvironment; -import org.apache.accumulo.core.iterators.SortedKeyValueIterator; - -/** - * A small modification of the age off filter that ships with Accumulo which ages off key/value pairs based on the - * Key's timestamp. It removes an entry if its timestamp is less than currentTime - threshold. - * - * The modification will now allow rows with timestamp > currentTime to pass through. - * - * This filter requires a "ttl" option, in milliseconds, to determine the age off threshold. - */ -public class LimitingAgeOffFilter extends Filter { - - public static final String TTL = "ttl"; - public static final String CURRENT_TIME = "currentTime"; - - protected long threshold; - - /** - * The use of private for this member in the original AgeOffFilter wouldn't allow me to extend it. Setting to protected. - */ - protected long currentTime; - - /** - * Accepts entries whose timestamps are less than currentTime - threshold. - * - * @see org.apache.accumulo.core.iterators.Filter#accept(org.apache.accumulo.core.data.Key, org.apache.accumulo.core.data.Value) - */ - @Override - public boolean accept(Key k, Value v) { - long diff = currentTime - k.getTimestamp(); - return !(diff > threshold || diff < 0); - } - - @Override - public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> options, IteratorEnvironment env) throws IOException { - super.init(source, options, env); - threshold = -1; - if (options == null) - throw new IllegalArgumentException(TTL + " must be set for LimitingAgeOffFilter"); - - String ttl = options.get(TTL); - if (ttl == null) - throw new IllegalArgumentException(TTL + " must be set for LimitingAgeOffFilter"); - - threshold = Long.parseLong(ttl); - - String time = options.get(CURRENT_TIME); - if (time != null) - currentTime = Long.parseLong(time); - else - currentTime = System.currentTimeMillis(); - - // add sanity checks for threshold and currentTime? - } - - @Override - public SortedKeyValueIterator<Key,Value> deepCopy(IteratorEnvironment env) { - LimitingAgeOffFilter copy = (LimitingAgeOffFilter) super.deepCopy(env); - copy.currentTime = currentTime; - copy.threshold = threshold; - return copy; - } - - @Override - public IteratorOptions describeOptions() { - IteratorOptions io = super.describeOptions(); - io.addNamedOption(TTL, "time to live (milliseconds)"); - io.addNamedOption(CURRENT_TIME, "if set, use the given value as the absolute time in milliseconds as the current time of day"); - io.setName("ageoff"); - io.setDescription("LimitingAgeOffFilter removes entries with timestamps more than <ttl> milliseconds old & timestamps newer than currentTime"); - return io; - } - - @Override - public boolean validateOptions(Map<String,String> options) { - super.validateOptions(options); - try { - Long.parseLong(options.get(TTL)); - } catch (NumberFormatException e) { - return false; - } - return true; - } - - /** - * A convenience method for setting the age off threshold. - * - * @param is - * IteratorSetting object to configure. - * @param ttl - * age off threshold in milliseconds. - */ - public static void setTTL(IteratorSetting is, Long ttl) { - is.addOption(TTL, Long.toString(ttl)); - } - - /** - * A convenience method for setting the current time (from which to measure the age off threshold). - * - * @param is - * IteratorSetting object to configure. - * @param currentTime - * time in milliseconds. - */ - public static void setCurrentTime(IteratorSetting is, Long currentTime) { - is.addOption(CURRENT_TIME, Long.toString(currentTime)); - } -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/iterators/accumulo.iterators/src/test/java/mvm/rya/iterators/LimitingAgeOffFilterTest.java ---------------------------------------------------------------------- diff --git a/iterators/accumulo.iterators/src/test/java/mvm/rya/iterators/LimitingAgeOffFilterTest.java b/iterators/accumulo.iterators/src/test/java/mvm/rya/iterators/LimitingAgeOffFilterTest.java deleted file mode 100644 index 5e8e2ee..0000000 --- a/iterators/accumulo.iterators/src/test/java/mvm/rya/iterators/LimitingAgeOffFilterTest.java +++ /dev/null @@ -1,80 +0,0 @@ -package mvm.rya.iterators; - -/* - * #%L - * mvm.rya.accumulo.iterators - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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. - * #L% - */ - -import org.apache.accumulo.core.data.Key; -import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.iterators.SortedMapIterator; -import org.apache.hadoop.io.Text; -import org.junit.Test; - -import java.util.HashMap; -import java.util.Map; -import java.util.TreeMap; - -import static org.junit.Assert.*; - -/** - * Date: 1/11/13 - * Time: 10:18 AM - */ -public class LimitingAgeOffFilterTest { - - @Test - public void testTimeRange() throws Exception { - LimitingAgeOffFilter filter = new LimitingAgeOffFilter(); - Map<String, String> map = new HashMap<String, String>(); - map.put(LimitingAgeOffFilter.TTL, "10000"); - map.put(LimitingAgeOffFilter.CURRENT_TIME, "1010001"); - filter.init(new SortedMapIterator(new TreeMap<Key, Value>()), map, null); - - assertFalse(filter.accept(new Key(new Text("row1"), 1000000), null)); - assertTrue(filter.accept(new Key(new Text("row1"), 1000001), null)); - assertTrue(filter.accept(new Key(new Text("row1"), 1000011), null)); - assertTrue(filter.accept(new Key(new Text("row1"), 1010001), null)); - assertFalse(filter.accept(new Key(new Text("row1"), 1010002), null)); - assertFalse(filter.accept(new Key(new Text("row1"), 1010012), null)); - } - - @Test - public void testTimeRangeSetOptions() throws Exception { - try { - LimitingAgeOffFilter filter = new LimitingAgeOffFilter(); - Map<String, String> map = new HashMap<String, String>(); - filter.init(new SortedMapIterator(new TreeMap<Key, Value>()), map, null); - fail(); - } catch (Exception e) { - } - } - - @Test - public void testTimeRangeCurrentTime() throws Exception { - long currentTime = System.currentTimeMillis(); - LimitingAgeOffFilter filter = new LimitingAgeOffFilter(); - Map<String, String> map = new HashMap<String, String>(); - map.put(LimitingAgeOffFilter.TTL, "10000"); - filter.init(new SortedMapIterator(new TreeMap<Key, Value>()), map, null); - - assertFalse(filter.accept(new Key(new Text("row1"), currentTime - 15000), null)); - assertTrue(filter.accept(new Key(new Text("row1"), currentTime - 5000), null)); - assertFalse(filter.accept(new Key(new Text("row1"), currentTime + 5000), null)); - } -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/iterators/cloudbase.iterators/pom.xml ---------------------------------------------------------------------- diff --git a/iterators/cloudbase.iterators/pom.xml b/iterators/cloudbase.iterators/pom.xml deleted file mode 100644 index bc3c81e..0000000 --- a/iterators/cloudbase.iterators/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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> - <groupId>mvm.rya</groupId> - <artifactId>rya.iterators</artifactId> - <version>3.2.10-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>cloudbase.iterators</artifactId> - <name>${project.groupId}.${project.artifactId}</name> - <properties> - - </properties> - - <dependencies> - <dependency> - <groupId>cloudbase</groupId> - <artifactId>cloudbase-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - -</project> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/iterators/cloudbase.iterators/src/main/java/mvm/rya/iterators/LimitingAgeOffFilter.java ---------------------------------------------------------------------- diff --git a/iterators/cloudbase.iterators/src/main/java/mvm/rya/iterators/LimitingAgeOffFilter.java b/iterators/cloudbase.iterators/src/main/java/mvm/rya/iterators/LimitingAgeOffFilter.java deleted file mode 100644 index 44fe945..0000000 --- a/iterators/cloudbase.iterators/src/main/java/mvm/rya/iterators/LimitingAgeOffFilter.java +++ /dev/null @@ -1,76 +0,0 @@ -package mvm.rya.iterators; - -import cloudbase.core.data.Key; -import cloudbase.core.data.Value; -import cloudbase.core.iterators.OptionDescriber; -import cloudbase.core.iterators.filter.Filter; - -import java.util.Map; -import java.util.TreeMap; - -/** - * A small modification of the age off filter that ships with Accumulo which ages off key/value pairs based on the - * Key's timestamp. It removes an entry if its timestamp is less than currentTime - threshold. - * <p/> - * The modification will now allow rows with timestamp > currentTime to pass through. - * <p/> - * This filter requires a "ttl" option, in milliseconds, to determine the age off threshold. - */ -public class LimitingAgeOffFilter implements Filter, OptionDescriber { - - public static final String TTL = "ttl"; - public static final String CURRENT_TIME = "currentTime"; - - protected long threshold; - - /** - * The use of private for this member in the original AgeOffFilter wouldn't allow me to extend it. Setting to protected. - */ - protected long currentTime; - - @Override - public boolean accept(Key k, Value v) { - long diff = currentTime - k.getTimestamp(); - return !(diff > threshold || diff < 0); - } - - @Override - public void init(Map<String, String> options) { - threshold = -1; - if (options == null) - throw new IllegalArgumentException(TTL + " must be set for LimitingAgeOffFilter"); - - String ttl = options.get(TTL); - if (ttl == null) - throw new IllegalArgumentException(TTL + " must be set for LimitingAgeOffFilter"); - - threshold = Long.parseLong(ttl); - - String time = options.get(CURRENT_TIME); - if (time != null) - currentTime = Long.parseLong(time); - else - currentTime = System.currentTimeMillis(); - - // add sanity checks for threshold and currentTime? - } - - @Override - public IteratorOptions describeOptions() { - Map<String, String> options = new TreeMap<String, String>(); - options.put(TTL, "time to live (milliseconds)"); - options.put(CURRENT_TIME, "if set, use the given value as the absolute time in milliseconds as the current time of day"); - return new OptionDescriber.IteratorOptions("limitingAgeOff", "LimitingAgeOffFilter removes entries with timestamps more than <ttl> milliseconds old & timestamps newer than currentTime", - options, null); - } - - @Override - public boolean validateOptions(Map<String, String> options) { - try { - Long.parseLong(options.get(TTL)); - } catch (NumberFormatException e) { - return false; - } - return true; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/iterators/cloudbase.iterators/src/test/java/mvm/rya/iterators/LimitingAgeOffFilterTest.java ---------------------------------------------------------------------- diff --git a/iterators/cloudbase.iterators/src/test/java/mvm/rya/iterators/LimitingAgeOffFilterTest.java b/iterators/cloudbase.iterators/src/test/java/mvm/rya/iterators/LimitingAgeOffFilterTest.java deleted file mode 100644 index 83b2f2c..0000000 --- a/iterators/cloudbase.iterators/src/test/java/mvm/rya/iterators/LimitingAgeOffFilterTest.java +++ /dev/null @@ -1,59 +0,0 @@ -package mvm.rya.iterators; - -import cloudbase.core.data.Key; -import org.apache.hadoop.io.Text; -import org.junit.Test; - -import java.util.HashMap; -import java.util.Map; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -/** - * Date: Mar 23, 2011 - * Time: 10:08:58 AM - */ -public class LimitingAgeOffFilterTest { - - @Test - public void testTimeRange() throws Exception { - LimitingAgeOffFilter filter = new LimitingAgeOffFilter(); - Map<String, String> map = new HashMap<String, String>(); - map.put(LimitingAgeOffFilter.TTL, "10000"); - map.put(LimitingAgeOffFilter.CURRENT_TIME, "1010001"); - filter.init(map); - - assertFalse(filter.accept(new Key(new Text("row1"), 1000000), null)); - assertTrue(filter.accept(new Key(new Text("row1"), 1000001), null)); - assertTrue(filter.accept(new Key(new Text("row1"), 1000011), null)); - assertTrue(filter.accept(new Key(new Text("row1"), 1010001), null)); - assertFalse(filter.accept(new Key(new Text("row1"), 1010002), null)); - assertFalse(filter.accept(new Key(new Text("row1"), 1010012), null)); - } - - @Test - public void testTimeRangeSetOptions() throws Exception { - try { - LimitingAgeOffFilter filter = new LimitingAgeOffFilter(); - Map<String, String> map = new HashMap<String, String>(); - filter.init(map); - fail(); - } catch (Exception e) { - } - } - - @Test - public void testTimeRangeCurrentTime() throws Exception { - long currentTime = System.currentTimeMillis(); - LimitingAgeOffFilter filter = new LimitingAgeOffFilter(); - Map<String, String> map = new HashMap<String, String>(); - map.put(LimitingAgeOffFilter.TTL, "10000"); - filter.init(map); - - assertFalse(filter.accept(new Key(new Text("row1"), currentTime - 15000), null)); - assertTrue(filter.accept(new Key(new Text("row1"), currentTime - 5000), null)); - assertFalse(filter.accept(new Key(new Text("row1"), currentTime + 5000), null)); - } -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/iterators/pom.xml ---------------------------------------------------------------------- diff --git a/iterators/pom.xml b/iterators/pom.xml deleted file mode 100644 index 5d88b63..0000000 --- a/iterators/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<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>mvm.rya</groupId> - <artifactId>parent</artifactId> - <version>3.2.10-SNAPSHOT</version> - </parent> - <artifactId>rya.iterators</artifactId> - <packaging>pom</packaging> - <name>${project.groupId}.${project.artifactId}</name> - - <modules> - <module>accumulo.iterators</module> - </modules> - - <profiles> - <profile> - <id>cloudbase</id> - <modules> - <module>cloudbase.iterators</module> - </modules> - </profile> - </profiles> -</project> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/osgi/alx.rya.console/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/alx.rya.console/pom.xml b/osgi/alx.rya.console/pom.xml index 8dfeed3..9f5020c 100644 --- a/osgi/alx.rya.console/pom.xml +++ b/osgi/alx.rya.console/pom.xml @@ -1,30 +1,50 @@ <?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 +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. +--> + <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>mvm.rya</groupId> + <groupId>org.apache.rya</groupId> <artifactId>rya.osgi</artifactId> <version>3.2.10-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>bundle</packaging> <artifactId>alx.rya.console</artifactId> - <name>${project.groupId}.${project.artifactId}</name> + <name>Apache Rya ALX Console</name> + + <packaging>bundle</packaging> <dependencies> <dependency> - <groupId>mvm.rya</groupId> + <groupId>org.apache.rya</groupId> <artifactId>rya.api</artifactId> </dependency> + <dependency> <groupId>org.openrdf.sesame</groupId> <artifactId>sesame-repository-api</artifactId> - <version>${openrdf.sesame.version}</version> </dependency> <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.console</artifactId> - <version>${karaf.version}</version> <scope>provided</scope> </dependency> </dependencies> @@ -38,4 +58,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/osgi/alx.rya.console/src/main/java/mvm/rya/alx/command/AbstractRyaCommand.java ---------------------------------------------------------------------- diff --git a/osgi/alx.rya.console/src/main/java/mvm/rya/alx/command/AbstractRyaCommand.java b/osgi/alx.rya.console/src/main/java/mvm/rya/alx/command/AbstractRyaCommand.java index 2aff2f3..7fada66 100644 --- a/osgi/alx.rya.console/src/main/java/mvm/rya/alx/command/AbstractRyaCommand.java +++ b/osgi/alx.rya.console/src/main/java/mvm/rya/alx/command/AbstractRyaCommand.java @@ -1,25 +1,26 @@ package mvm.rya.alx.command; /* - * #%L - * mvm.rya.alx.rya.console - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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 + * 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 + * 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. - * #L% + * 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. */ + + import mvm.rya.api.persist.RyaDAO; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.openrdf.repository.Repository; @@ -54,4 +55,4 @@ public abstract class AbstractRyaCommand extends OsgiCommandSupport { } protected abstract Object doRyaExecute() throws Exception; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/osgi/alx.rya.console/src/main/java/mvm/rya/alx/command/GetStatementsRyaCommand.java ---------------------------------------------------------------------- diff --git a/osgi/alx.rya.console/src/main/java/mvm/rya/alx/command/GetStatementsRyaCommand.java b/osgi/alx.rya.console/src/main/java/mvm/rya/alx/command/GetStatementsRyaCommand.java index 9ae293e..658f3fc 100644 --- a/osgi/alx.rya.console/src/main/java/mvm/rya/alx/command/GetStatementsRyaCommand.java +++ b/osgi/alx.rya.console/src/main/java/mvm/rya/alx/command/GetStatementsRyaCommand.java @@ -1,25 +1,26 @@ package mvm.rya.alx.command; /* - * #%L - * mvm.rya.alx.rya.console - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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 + * 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 + * 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. - * #L% + * 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. */ + + import org.apache.felix.gogo.commands.Command; import org.apache.felix.gogo.commands.Option; import org.openrdf.model.Resource; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/osgi/alx.rya.console/src/main/java/mvm/rya/alx/command/InfoRyaCommand.java ---------------------------------------------------------------------- diff --git a/osgi/alx.rya.console/src/main/java/mvm/rya/alx/command/InfoRyaCommand.java b/osgi/alx.rya.console/src/main/java/mvm/rya/alx/command/InfoRyaCommand.java index 15ee550..19b002f 100644 --- a/osgi/alx.rya.console/src/main/java/mvm/rya/alx/command/InfoRyaCommand.java +++ b/osgi/alx.rya.console/src/main/java/mvm/rya/alx/command/InfoRyaCommand.java @@ -1,25 +1,26 @@ package mvm.rya.alx.command; /* - * #%L - * mvm.rya.alx.rya.console - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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 + * 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 + * 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. - * #L% + * 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. */ + + import mvm.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.felix.gogo.commands.Command; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/osgi/alx.rya.console/src/main/resources/OSGI-INF/blueprint/alx.rya.console-blueprint.xml ---------------------------------------------------------------------- diff --git a/osgi/alx.rya.console/src/main/resources/OSGI-INF/blueprint/alx.rya.console-blueprint.xml b/osgi/alx.rya.console/src/main/resources/OSGI-INF/blueprint/alx.rya.console-blueprint.xml index 0914832..129e9c7 100644 --- a/osgi/alx.rya.console/src/main/resources/OSGI-INF/blueprint/alx.rya.console-blueprint.xml +++ b/osgi/alx.rya.console/src/main/resources/OSGI-INF/blueprint/alx.rya.console-blueprint.xml @@ -1,4 +1,24 @@ <?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 +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. +--> + <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/osgi/alx.rya/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/alx.rya/pom.xml b/osgi/alx.rya/pom.xml index 7ce4684..e2ca105 100644 --- a/osgi/alx.rya/pom.xml +++ b/osgi/alx.rya/pom.xml @@ -1,36 +1,47 @@ +<?xml version='1.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. +--> + <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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>mvm.rya</groupId> + <groupId>org.apache.rya</groupId> <artifactId>rya.osgi</artifactId> <version>3.2.10-SNAPSHOT</version> </parent> + <artifactId>alx.rya</artifactId> + <name>Apache Rya ALX</name> + <packaging>bundle</packaging> - <name>${project.groupId}.${project.artifactId}</name> + <dependencies> <dependency> - <groupId>mvm.rya</groupId> + <groupId>org.apache.rya</groupId> <artifactId>accumulo.rya</artifactId> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> </dependencies> - <repositories> - <repository> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>aduna-opensource.releases</id> - <name>Aduna Open Source - Maven releases</name> - <url>http://repo.aduna-software.org/maven2/releases</url> - </repository> - </repositories> <build> <plugins> <plugin> @@ -47,8 +58,7 @@ </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin - </artifactId> + <artifactId>build-helper-maven-plugin</artifactId> <version>1.7</version> <executions> <execution> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/osgi/alx.rya/src/main/features/alx.rya-features.xml ---------------------------------------------------------------------- diff --git a/osgi/alx.rya/src/main/features/alx.rya-features.xml b/osgi/alx.rya/src/main/features/alx.rya-features.xml index efc6917..9e36c33 100644 --- a/osgi/alx.rya/src/main/features/alx.rya-features.xml +++ b/osgi/alx.rya/src/main/features/alx.rya-features.xml @@ -1,4 +1,24 @@ <?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 +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. +--> + <features name="alx.rya"> <feature name='org.openrdf.sesame.runtime' version="2.6.4"> <bundle>wrap:mvn:org.openrdf.sesame/sesame-model/2.6.4</bundle> @@ -81,4 +101,4 @@ <feature version="3.0.4">alx.rya</feature> <bundle>mvn:mvm.rya/alx.rya.console/3.0.4-SNAPSHOT</bundle> </feature> -</features> \ No newline at end of file +</features> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/osgi/alx.rya/src/main/java/mvm/rya/alx/util/ConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/osgi/alx.rya/src/main/java/mvm/rya/alx/util/ConfigurationFactory.java b/osgi/alx.rya/src/main/java/mvm/rya/alx/util/ConfigurationFactory.java index 4cf4edb..849cf60 100644 --- a/osgi/alx.rya/src/main/java/mvm/rya/alx/util/ConfigurationFactory.java +++ b/osgi/alx.rya/src/main/java/mvm/rya/alx/util/ConfigurationFactory.java @@ -1,25 +1,26 @@ package mvm.rya.alx.util; /* - * #%L - * mvm.rya.alx.rya - * %% - * Copyright (C) 2014 Rya - * %% - * Licensed 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 + * 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 + * 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. - * #L% + * 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. */ + + import mvm.rya.accumulo.AccumuloRdfConfiguration; import mvm.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/osgi/alx.rya/src/main/resources/META-INF/spring/alx.rya-spring-osgi.xml ---------------------------------------------------------------------- diff --git a/osgi/alx.rya/src/main/resources/META-INF/spring/alx.rya-spring-osgi.xml b/osgi/alx.rya/src/main/resources/META-INF/spring/alx.rya-spring-osgi.xml index 4c11e59..76f1bd3 100644 --- a/osgi/alx.rya/src/main/resources/META-INF/spring/alx.rya-spring-osgi.xml +++ b/osgi/alx.rya/src/main/resources/META-INF/spring/alx.rya-spring-osgi.xml @@ -1,12 +1,23 @@ -<!-- Copyright (C) 2008 PROTEUS Technologies, LLC This program is free software: - you can redistribute it and/or modify it under the terms of the GNU General - Public License as published by the Free Software Foundation, either version - 3 of the License, or (at your option) any later version. This program is - distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the GNU General Public License for more details. You should - have received a copy of the GNU General Public License along with this program. - If not, see <http://www.gnu.org/licenses/>. --> +<?xml version='1.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. +--> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:osgi="http://www.springframework.org/schema/osgi" @@ -39,4 +50,4 @@ <osgi:service ref="sailRepo" auto-export="interfaces"/> <osgi:service ref="ryaDAO" auto-export="interfaces"/> -</beans> \ No newline at end of file +</beans>