You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2015/12/22 22:08:29 UTC
[17/17] incubator-geode git commit: GEODE-14: Rat cleanup
GEODE-14: Rat cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b98a7adb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b98a7adb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b98a7adb
Branch: refs/heads/feature/GEODE-14
Commit: b98a7adb216a3efa3367597c7f77822a243d926f
Parents: d360c79
Author: Jens Deppe <jd...@pivotal.io>
Authored: Tue Dec 22 13:02:04 2015 -0800
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Tue Dec 22 13:02:04 2015 -0800
----------------------------------------------------------------------
extensions/gemfire-modules-tomcat7/build.gradle | 17 +++
extensions/gemfire-modules-tomcat7/pom.xml | 98 ---------------
extensions/gemfire-modules/build.gradle | 16 +++
extensions/gemfire-modules/pom.xml | 118 -------------------
.../session/catalina/LocalStrings.properties | 15 +++
gradle/rat.gradle | 14 ++-
6 files changed, 60 insertions(+), 218 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b98a7adb/extensions/gemfire-modules-tomcat7/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-tomcat7/build.gradle b/extensions/gemfire-modules-tomcat7/build.gradle
index 9bd88b2..34dc7ef 100644
--- a/extensions/gemfire-modules-tomcat7/build.gradle
+++ b/extensions/gemfire-modules-tomcat7/build.gradle
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
+
test {
doFirst {
copy {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b98a7adb/extensions/gemfire-modules-tomcat7/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-tomcat7/pom.xml b/extensions/gemfire-modules-tomcat7/pom.xml
deleted file mode 100644
index 6722da2..0000000
--- a/extensions/gemfire-modules-tomcat7/pom.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<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>
-
- <groupId>com.gemstone</groupId>
- <artifactId>gemfire-modules-tomcat7</artifactId>
- <version>${gemfire.modules.version}</version>
- <packaging>jar</packaging>
-
- <name>gemfire-modules-tomcat7</name>
- <url>http://maven.apache.org</url>
-
- <parent>
- <groupId>com.gemstone</groupId>
- <artifactId>gemfire-modules-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>com.gemstone</groupId>
- <artifactId>gemfire-modules</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- <version>7.0.30</version>
- </dependency>
- <dependency>
- <groupId>com.gemstone.gemfire</groupId>
- <artifactId>gemfire</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-coyote</artifactId>
- <version>7.0.30</version>
- </dependency>
- <dependency>
- <groupId>org.httpunit</groupId>
- <artifactId>httpunit</artifactId>
- </dependency>
- <dependency>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.7.2</version>
- <configuration>
- <includes>
- <include>**/AllTests.java</include>
- <!-- This is a suite -->
- </includes>
- <runOrder>alphabetical</runOrder>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>s3</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b98a7adb/extensions/gemfire-modules/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules/build.gradle b/extensions/gemfire-modules/build.gradle
index 4290189..7e6a4bd 100644
--- a/extensions/gemfire-modules/build.gradle
+++ b/extensions/gemfire-modules/build.gradle
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
test {
doFirst {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b98a7adb/extensions/gemfire-modules/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules/pom.xml b/extensions/gemfire-modules/pom.xml
deleted file mode 100644
index 55c466e..0000000
--- a/extensions/gemfire-modules/pom.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<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>
-
- <groupId>com.gemstone</groupId>
- <artifactId>gemfire-modules</artifactId>
- <version>${gemfire.modules.version}</version>
- <packaging>jar</packaging>
-
- <name>gemfire-modules</name>
- <url>http://maven.apache.org</url>
-
- <parent>
- <groupId>com.gemstone</groupId>
- <artifactId>gemfire-modules-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina-ha</artifactId>
- <version>${tomcat.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.gemstone.gemfire</groupId>
- <artifactId>gemfire</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>coyote</artifactId>
- </dependency>
- <dependency>
- <groupId>org.httpunit</groupId>
- <artifactId>httpunit</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.7.2</version>
- <configuration>
- <includes>
- <!-- This is a suite -->
- <include>**/TestSessions.java</include>
- </includes>
- <runOrder>alphabetical</runOrder>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>com.google.code.maven-replacer-plugin</groupId>
- <artifactId>replacer</artifactId>
- <version>1.5.1</version>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>replace</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>
- <include>target/**/modules-version.properties</include>
- </includes>
- <replacements>
- <replacement>
- <token>@VERSION@</token>
- <value>${gemfire.modules.version}</value>
- </replacement>
- </replacements>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>s3</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b98a7adb/extensions/gemfire-modules/src/main/java/com/gemstone/gemfire/modules/session/catalina/LocalStrings.properties
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules/src/main/java/com/gemstone/gemfire/modules/session/catalina/LocalStrings.properties b/extensions/gemfire-modules/src/main/java/com/gemstone/gemfire/modules/session/catalina/LocalStrings.properties
index 5abddf7..679cad3 100644
--- a/extensions/gemfire-modules/src/main/java/com/gemstone/gemfire/modules/session/catalina/LocalStrings.properties
+++ b/extensions/gemfire-modules/src/main/java/com/gemstone/gemfire/modules/session/catalina/LocalStrings.properties
@@ -1 +1,16 @@
+# 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.
+
deltaSession.commit.ise=commit: Session {0} already invalidated
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b98a7adb/gradle/rat.gradle
----------------------------------------------------------------------
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
index 2068b88..69b69d3 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -21,6 +21,7 @@ rat {
// git
'.git/**',
'**/.gitignore',
+ '**/.gitkeep',
// gradle
'**/.gradle/**',
@@ -40,7 +41,9 @@ rat {
'**/.classpath',
'**/.settings/**',
'**/build-eclipse/**',
- '*.iml',
+ '**/*.iml',
+ '**/*.ipr',
+ '**/*.iws',
'.idea/**',
'**/tags',
@@ -69,7 +72,14 @@ rat {
// other text files
'gemfire-spark-connector/project/plugins.sbt',
'gemfire-spark-connector/project/build.properties',
- '**/log4j2*.xml',
+ '**/log4j*.xml',
+ 'extensions/gemfire-modules/src/main/java/com/gemstone/gemfire/modules/session/catalina/LocalStrings.properties',
+ 'extensions/gemfire-modules/src/main/resources/modules-version.properties',
+ 'extensions/gemfire-modules/src/test/resources/tomcat/conf/tomcat-users.xml',
+ 'extensions/gemfire-modules/src/test/resources/com/gemstone/gemfire/modules/Event.hbm.xml',
+ 'extensions/gemfire-modules/src/test/resources/com/gemstone/gemfire/modules/Person.hbm.xml',
+ 'extensions/gemfire-modules/src/test/resources/log4j.properties',
+ 'extensions/gemfire-modules-tomcat7/src/test/resources/tomcat/conf/tomcat-users.xml',
// these are test files that don't expect the first element to be a comment
'gemfire-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.xml',