Skip to content

Commit 63f91aa

Browse files
author
jdasch
committed
licensing fixes
1 parent 56c2eec commit 63f91aa

File tree

7 files changed

+94
-40
lines changed

7 files changed

+94
-40
lines changed

extras/rya.pcj.fluo/pcj.fluo.test.base/src/main/java/org/apache/rya/kafka/base/EmbeddedKafkaInstance.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
119
package org.apache.rya.kafka.base;
220

321
import java.nio.file.Files;

extras/rya.pcj.fluo/pcj.fluo.test.base/src/main/java/org/apache/rya/kafka/base/EmbeddedKafkaSingleton.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
119
package org.apache.rya.kafka.base;
220

321
import java.io.IOException;

extras/rya.pcj.fluo/pcj.fluo.test.base/src/main/java/org/apache/rya/kafka/base/KafkaTestInstanceRule.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
package org.apache.rya.kafka.base;
2-
/**
1+
/*
32
* Licensed to the Apache Software Foundation (ASF) under one
43
* or more contributor license agreements. See the NOTICE file
54
* distributed with this work for additional information
@@ -8,7 +7,7 @@
87
* "License"); you may not use this file except in compliance
98
* with the License. You may obtain a copy of the License at
109
*
11-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
1211
*
1312
* Unless required by applicable law or agreed to in writing,
1413
* software distributed under the License is distributed on an
@@ -17,6 +16,7 @@
1716
* specific language governing permissions and limitations
1817
* under the License.
1918
*/
19+
package org.apache.rya.kafka.base;
2020

2121
import java.util.Properties;
2222

extras/rya.pcj.fluo/pcj.fluo.test.base/src/main/java/org/apache/rya/pcj/fluo/test/base/FluoITBase.java

Lines changed: 17 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,6 @@
1818
*/
1919
package org.apache.rya.pcj.fluo.test.base;
2020

21-
/**
22-
* Licensed to the Apache Software Foundation (ASF) under one
23-
* or more contributor license agreements. See the NOTICE file
24-
* distributed with this work for additional information
25-
* regarding copyright ownership. The ASF licenses this file
26-
* to you under the Apache License, Version 2.0 (the
27-
* "License"); you may not use this file except in compliance
28-
* with the License. You may obtain a copy of the License at
29-
*
30-
* http://www.apache.org/licenses/LICENSE-2.0
31-
*
32-
* Unless required by applicable law or agreed to in writing,
33-
* software distributed under the License is distributed on an
34-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
35-
* KIND, either express or implied. See the License for the
36-
* specific language governing permissions and limitations
37-
* under the License.
38-
*/
39-
4021
import static com.google.common.base.Preconditions.checkNotNull;
4122

4223
import java.net.UnknownHostException;
@@ -48,41 +29,40 @@
4829
import org.apache.accumulo.core.client.ZooKeeperInstance;
4930
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
5031
import org.apache.accumulo.minicluster.MiniAccumuloCluster;
51-
import org.apache.log4j.Level;
52-
import org.apache.log4j.Logger;
53-
import org.apache.rya.accumulo.MiniAccumuloClusterInstance;
54-
import org.apache.rya.accumulo.MiniAccumuloSingleton;
55-
import org.apache.rya.accumulo.RyaTestInstanceRule;
56-
import org.apache.rya.api.client.accumulo.AccumuloConnectionDetails;
57-
import org.apache.rya.api.client.accumulo.AccumuloInstall;
58-
import org.apache.zookeeper.ClientCnxn;
59-
import org.junit.After;
60-
import org.junit.Before;
61-
import org.junit.BeforeClass;
62-
import org.junit.Rule;
63-
import org.openrdf.repository.RepositoryConnection;
64-
import org.openrdf.repository.RepositoryException;
65-
import org.openrdf.sail.Sail;
66-
import org.openrdf.sail.SailException;
67-
6832
import org.apache.fluo.api.client.FluoAdmin;
6933
import org.apache.fluo.api.client.FluoAdmin.AlreadyInitializedException;
7034
import org.apache.fluo.api.client.FluoClient;
7135
import org.apache.fluo.api.client.FluoFactory;
7236
import org.apache.fluo.api.config.FluoConfiguration;
7337
import org.apache.fluo.api.mini.MiniFluo;
38+
import org.apache.log4j.Level;
39+
import org.apache.log4j.Logger;
7440
import org.apache.rya.accumulo.AccumuloRdfConfiguration;
75-
import org.apache.rya.api.client.RyaClientException;
41+
import org.apache.rya.accumulo.MiniAccumuloClusterInstance;
42+
import org.apache.rya.accumulo.MiniAccumuloSingleton;
43+
import org.apache.rya.accumulo.RyaTestInstanceRule;
7644
import org.apache.rya.api.client.Install;
7745
import org.apache.rya.api.client.Install.DuplicateInstanceNameException;
7846
import org.apache.rya.api.client.Install.InstallConfiguration;
47+
import org.apache.rya.api.client.RyaClientException;
48+
import org.apache.rya.api.client.accumulo.AccumuloConnectionDetails;
49+
import org.apache.rya.api.client.accumulo.AccumuloInstall;
7950
import org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException;
8051
import org.apache.rya.api.persist.RyaDAOException;
8152
import org.apache.rya.indexing.accumulo.ConfigUtils;
8253
import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig;
8354
import org.apache.rya.rdftriplestore.RyaSailRepository;
8455
import org.apache.rya.rdftriplestore.inference.InferenceEngineException;
8556
import org.apache.rya.sail.config.RyaSailFactory;
57+
import org.apache.zookeeper.ClientCnxn;
58+
import org.junit.After;
59+
import org.junit.Before;
60+
import org.junit.BeforeClass;
61+
import org.junit.Rule;
62+
import org.openrdf.repository.RepositoryConnection;
63+
import org.openrdf.repository.RepositoryException;
64+
import org.openrdf.sail.Sail;
65+
import org.openrdf.sail.SailException;
8666

8767
/**
8868
* Integration tests that ensure the Fluo application processes PCJs results

extras/rya.pcj.fluo/pcj.fluo.test.base/src/main/java/org/apache/rya/pcj/fluo/test/base/ModifiedAccumuloExportITBase.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
119
package org.apache.rya.pcj.fluo.test.base;
220

321
import java.util.UUID;

extras/rya.pcj.fluo/pcj.fluo.test.base/src/test/java/org/apache/rya/pcj/fluo/test/base/KafkaExportITBaseIT.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
119
package org.apache.rya.pcj.fluo.test.base;
220

321
import static org.junit.Assert.assertEquals;

pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -996,6 +996,7 @@ under the License.
996996
<enabled>false</enabled>
997997
</snapshots>
998998
</repository>
999+
<!--
9991000
<repository>
10001001
<id>geowave-maven-snapshot</id>
10011002
<name>GeoWave AWS Snapshot Repository</name>
@@ -1007,6 +1008,7 @@ under the License.
10071008
<enabled>true</enabled>
10081009
</snapshots>
10091010
</repository>
1011+
-->
10101012
<repository>
10111013
<id>osgeo</id>
10121014
<name>Open Source Geospatial Foundation Repository</name>

0 commit comments

Comments
 (0)