Adding some missing license headers and a RAT config, which was missing from the corepersistence module.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/96ae3179 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/96ae3179 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/96ae3179 Branch: refs/heads/release-2.1.1 Commit: 96ae317992fb3d5f52b64f0b45cf76248b348ea2 Parents: fb1d78d Author: Dave Johnson <[email protected]> Authored: Wed Jun 22 10:47:59 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Wed Jun 22 10:47:59 2016 -0400 ---------------------------------------------------------------------- .../uniquevalues/UniqueValuesServiceImpl.java | 1 - .../core/guice/SettingsValidationCluster.java | 18 +++++ .../core/guice/MigrationManagerRule.java | 18 +++++ .../guice/SettingsValidationClusterTest.java | 19 ++++++ .../src/test/resources/usergrid-UNIT.properties | 19 ++++++ .../src/test/resources/usergrid.properties | 19 ++++++ stack/corepersistence/model/pom.xml | 24 +++---- .../persistence/model/entity/EntityMap.java | 18 +++++ .../persistence/model/util/EntityUtils.java | 18 +++++ .../persistence/model/util/UUIDGenerator.java | 18 +++++ .../persistence/model/field/EntityTest.java | 18 +++++ .../model/util/UUIDGeneratorTest.java | 18 +++++ stack/corepersistence/pom.xml | 71 ++++++++++++++++++++ 13 files changed, 266 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/96ae3179/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesServiceImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesServiceImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesServiceImpl.java index 6035e04..119d6f6 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesServiceImpl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesServiceImpl.java @@ -31,7 +31,6 @@ import akka.util.Timeout; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Singleton; -import org.apache.usergrid.persistence.actorsystem.ActorSystemFig; import org.apache.usergrid.persistence.actorsystem.ActorSystemManager; import org.apache.usergrid.persistence.actorsystem.GuiceActorProducer; import org.apache.usergrid.persistence.core.scope.ApplicationScope; http://git-wip-us.apache.org/repos/asf/usergrid/blob/96ae3179/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/SettingsValidationCluster.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/SettingsValidationCluster.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/SettingsValidationCluster.java index f77a86c..95ad216 100644 --- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/SettingsValidationCluster.java +++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/SettingsValidationCluster.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.usergrid.persistence.core.guice; http://git-wip-us.apache.org/repos/asf/usergrid/blob/96ae3179/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/guice/MigrationManagerRule.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/guice/MigrationManagerRule.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/guice/MigrationManagerRule.java index ac6c169..7e02a8e 100644 --- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/guice/MigrationManagerRule.java +++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/guice/MigrationManagerRule.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.usergrid.persistence.core.guice; http://git-wip-us.apache.org/repos/asf/usergrid/blob/96ae3179/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/guice/SettingsValidationClusterTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/guice/SettingsValidationClusterTest.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/guice/SettingsValidationClusterTest.java index 262fec7..97b7ac0 100644 --- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/guice/SettingsValidationClusterTest.java +++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/guice/SettingsValidationClusterTest.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.usergrid.persistence.core.guice; import org.apache.usergrid.persistence.core.guicyfig.ClusterFig; @@ -6,6 +24,7 @@ import org.junit.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; + /** * Created by russo on 8/27/15. */ http://git-wip-us.apache.org/repos/asf/usergrid/blob/96ae3179/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties b/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties index 2004d9e..c94ea57 100644 --- a/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties +++ b/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties @@ -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. +# + # Keep nothing but overriding test defaults in here cassandra.connections=50 cassandra.port=9160 http://git-wip-us.apache.org/repos/asf/usergrid/blob/96ae3179/stack/corepersistence/common/src/test/resources/usergrid.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/resources/usergrid.properties b/stack/corepersistence/common/src/test/resources/usergrid.properties index 015c681..0e954ce 100644 --- a/stack/corepersistence/common/src/test/resources/usergrid.properties +++ b/stack/corepersistence/common/src/test/resources/usergrid.properties @@ -1,2 +1,21 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + # This property is required to be set and cannot be defaulted anywhere usergrid.cluster_name=usergrid http://git-wip-us.apache.org/repos/asf/usergrid/blob/96ae3179/stack/corepersistence/model/pom.xml ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/pom.xml b/stack/corepersistence/model/pom.xml index 2c2b557..5c41340 100644 --- a/stack/corepersistence/model/pom.xml +++ b/stack/corepersistence/model/pom.xml @@ -1,19 +1,19 @@ <?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 +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. +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"; http://git-wip-us.apache.org/repos/asf/usergrid/blob/96ae3179/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/EntityMap.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/EntityMap.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/EntityMap.java index 5c8fd77..bb89f12 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/EntityMap.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/EntityMap.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.usergrid.persistence.model.entity; import com.google.common.base.*; http://git-wip-us.apache.org/repos/asf/usergrid/blob/96ae3179/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/util/EntityUtils.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/util/EntityUtils.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/util/EntityUtils.java index 929a563..76d5d7d 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/util/EntityUtils.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/util/EntityUtils.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.usergrid.persistence.model.util; http://git-wip-us.apache.org/repos/asf/usergrid/blob/96ae3179/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/util/UUIDGenerator.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/util/UUIDGenerator.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/util/UUIDGenerator.java index 176c97b..9e4b306 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/util/UUIDGenerator.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/util/UUIDGenerator.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.usergrid.persistence.model.util; http://git-wip-us.apache.org/repos/asf/usergrid/blob/96ae3179/stack/corepersistence/model/src/test/java/org/apache/usergrid/persistence/model/field/EntityTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/test/java/org/apache/usergrid/persistence/model/field/EntityTest.java b/stack/corepersistence/model/src/test/java/org/apache/usergrid/persistence/model/field/EntityTest.java index 06b8030..89ffb3e 100644 --- a/stack/corepersistence/model/src/test/java/org/apache/usergrid/persistence/model/field/EntityTest.java +++ b/stack/corepersistence/model/src/test/java/org/apache/usergrid/persistence/model/field/EntityTest.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.usergrid.persistence.model.field; http://git-wip-us.apache.org/repos/asf/usergrid/blob/96ae3179/stack/corepersistence/model/src/test/java/org/apache/usergrid/persistence/model/util/UUIDGeneratorTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/test/java/org/apache/usergrid/persistence/model/util/UUIDGeneratorTest.java b/stack/corepersistence/model/src/test/java/org/apache/usergrid/persistence/model/util/UUIDGeneratorTest.java index 509e80f..143f9ae 100644 --- a/stack/corepersistence/model/src/test/java/org/apache/usergrid/persistence/model/util/UUIDGeneratorTest.java +++ b/stack/corepersistence/model/src/test/java/org/apache/usergrid/persistence/model/util/UUIDGeneratorTest.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.usergrid.persistence.model.util; http://git-wip-us.apache.org/repos/asf/usergrid/blob/96ae3179/stack/corepersistence/pom.xml ---------------------------------------------------------------------- diff --git a/stack/corepersistence/pom.xml b/stack/corepersistence/pom.xml index 5d4ccac..7ff5dfe 100644 --- a/stack/corepersistence/pom.xml +++ b/stack/corepersistence/pom.xml @@ -219,6 +219,77 @@ limitations under the License. <artifactId>jacoco-maven-plugin</artifactId> </plugin> + <!--<plugin>--> + <!--<groupId>org.apache.rat</groupId>--> + <!--<artifactId>apache-rat-plugin</artifactId>--> + <!--<executions>--> + <!--<execution>--> + <!--<phase>verify</phase>--> + <!--<goals>--> + <!--<goal>check</goal>--> + <!--</goals>--> + <!--</execution>--> + <!--</executions>--> + <!--<configuration>--> + <!--<excludes>--> + <!--<exclude>**/Coverage.md</exclude>--> + <!--<exclude>**/jacoco/**</exclude>--> + <!--<exclude>**/README.md</exclude>--> + <!--<exclude>**/CHANGES.txt</exclude>--> + <!--<exclude>**/*.json</exclude>--> + <!--<exclude>**/*.log</exclude>--> + <!--<exclude>**/*.md5</exclude>--> + <!--<exclude>**/*.opts</exclude>--> + + <!--<!– git and IDE project files –>--> + <!--<exclude>**/.git/**</exclude>--> + <!--<exclude>**/.gitignore</exclude>--> + <!--<exclude>**/.idea/**</exclude>--> + <!--<exclude>**/*.iml</exclude>--> + <!--<exclude>**/*.log</exclude>--> + <!--<exclude>**/nbactions.xml</exclude>--> + <!--<exclude>**/nb-configuration.xml</exclude>--> + <!--<exclude>**/.classpath/**</exclude>--> + <!--<exclude>**/.project</exclude>--> + <!--<exclude>**/.settings/**</exclude>--> + + <!--<!– temporary build files –>--> + <!--<exclude>**/logs/**</exclude>--> + <!--<exclude>**/docs/**</exclude>--> + <!--<exclude>**/tmp/**</exclude>--> + <!--<exclude>**/target/**</exclude>--> + <!--<exclude>**/antlr3/**</exclude>--> + <!--<exclude>**/META-INF/**</exclude>--> + <!--<exclude>**/dependency-reduced-pom.xml</exclude>--> + <!--<exclude>**/**QueryFilter.tokens</exclude>--> + <!--<exclude>**/**QueryFilterLexer.java</exclude>--> + <!--<exclude>**/**QueryFilterParser.java</exclude>--> + <!--<exclude>**/**.conf</exclude>--> + <!--<exclude>**/**.csv</exclude>--> + <!--<exclude>**/aws.properties</exclude>--> + <!--<exclude>**/tempExport*</exclude>--> + <!--<exclude>loadtests/loadtest_setup.sh</exclude>--> + <!--<exclude>loadtests/gatling/user-files/request-bodies/**</exclude>--> + <!--<exclude>loadtests/.java-version</exclude>--> + + <!--<!– gatling loadtest data files –>--> + <!--<exclude>loadtests/src/main/scala/org/apache/usergrid/datagenerators/datafiles/**.txt</exclude>--> + <!--<exclude>loadtests/src/main/scala/org/apache/usergrid/datagenerators/**.txt</exclude>--> + <!--<exclude>loadtests/src/test/resources/**.csv</exclude>--> + + <!--<!– other –>--> + <!--<exclude>**/catalina_base/**</exclude>--> + <!--<exclude>**/m2/**</exclude>--> + <!--<exclude>**/*.asc</exclude>--> + <!--<exclude>**/dummy.txt</exclude>--> + <!--<exclude>**/cloudbees.xml</exclude>--> + <!--<exclude>**/catalina_base/**</exclude>--> + + <!--</excludes>--> + <!--</configuration>--> + + <!--</plugin>--> + </plugins> <resources>
