This is an automated email from the ASF dual-hosted git repository.
fhanik pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 89012cf Checkstyle adjustments for Graal native AOT files
89012cf is described below
commit 89012cf4701d73c0997566f1f8413ded0b50cce5
Author: Filip Hanik <fha...@pivotal.io>
AuthorDate: Tue Apr 14 12:35:55 2020 -0700
Checkstyle adjustments for Graal native AOT files
---
res/graal/README.md | 34 ++++++++++++++----
res/graal/build-tomcat-native-image.sh | 15 ++++++++
res/graal/graal-measure.sh | 15 ++++++++
.../native-image/native-image.properties | 1 +
.../native-image/native-image.properties | 1 +
.../native-image/native-image.properties | 1 +
.../native-image/native-image.properties | 1 +
.../apache/catalina/startup/EmbeddedTomcat.java | 40 ++++++++++++++++------
8 files changed, 91 insertions(+), 17 deletions(-)
diff --git a/res/graal/README.md b/res/graal/README.md
index 8446b6b..717c761 100644
--- a/res/graal/README.md
+++ b/res/graal/README.md
@@ -1,18 +1,40 @@
+<!--
+
+ 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.
+
+-->
+
Introduction
===
-GraalVM is a polyglot virtual machine. In addition to that, it supports Ahead
of Time, AOT, compilation of Java applications
-into native executable files via its
[native-image`](https://github.com/oracle/graal/tree/master/substratevm)
compiler.
+GraalVM is a polyglot virtual machine. In addition to that, it supports Ahead
of Time,
+AOT, compilation of Java applications into native executable files via its
+[native-image`](https://github.com/oracle/graal/tree/master/substratevm)
compiler.
Reflection Directives
===
This directory contains directives to the compiler on what classes use
reflection.
-These are currently stored in a file called `tomcat-reflection.json` in the
`META-INF/native-image/groupId/artifactId`
+These are currently stored in a file called `tomcat-reflection.json` in the
`META-INF/native-image/groupId/artifactId`
location.
-This directory also contains resource directives, so that resource files
normally included in a JAR file
-also get compiled into the executable image.
-These are currently stored in a file called `tomcat-resource.json` in the
`META-INF/native-image/groupId/artifactId`
+This directory also contains resource directives, so that resource files
normally included in a JAR file
+also get compiled into the executable image.
+These are currently stored in a file called `tomcat-resource.json` in the
`META-INF/native-image/groupId/artifactId`
location.
diff --git a/res/graal/build-tomcat-native-image.sh
b/res/graal/build-tomcat-native-image.sh
index 1a211c9..5fe6a16 100755
--- a/res/graal/build-tomcat-native-image.sh
+++ b/res/graal/build-tomcat-native-image.sh
@@ -1,5 +1,20 @@
#!/bin/bash
+# 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.
+
CURDIR=`pwd`
# resolve links - $0 may be a softlink
diff --git a/res/graal/graal-measure.sh b/res/graal/graal-measure.sh
index 00ea504..599f1b5 100755
--- a/res/graal/graal-measure.sh
+++ b/res/graal/graal-measure.sh
@@ -1,5 +1,20 @@
#!/bin/bash
+# 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.
+
GREEN='\033[0;32m'
RED='\033[0;31m'
NC='\033[0m'
diff --git a/res/graal/tomcat-embed-core/native-image/native-image.properties
b/res/graal/tomcat-embed-core/native-image/native-image.properties
index 9c4e82a..29b501f 100644
--- a/res/graal/tomcat-embed-core/native-image/native-image.properties
+++ b/res/graal/tomcat-embed-core/native-image/native-image.properties
@@ -12,4 +12,5 @@
# 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.
+
Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
\ No newline at end of file
diff --git a/res/graal/tomcat-embed-el/native-image/native-image.properties
b/res/graal/tomcat-embed-el/native-image/native-image.properties
index 9c4e82a..29b501f 100644
--- a/res/graal/tomcat-embed-el/native-image/native-image.properties
+++ b/res/graal/tomcat-embed-el/native-image/native-image.properties
@@ -12,4 +12,5 @@
# 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.
+
Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
\ No newline at end of file
diff --git a/res/graal/tomcat-embed-jasper/native-image/native-image.properties
b/res/graal/tomcat-embed-jasper/native-image/native-image.properties
index 9c4e82a..29b501f 100644
--- a/res/graal/tomcat-embed-jasper/native-image/native-image.properties
+++ b/res/graal/tomcat-embed-jasper/native-image/native-image.properties
@@ -12,4 +12,5 @@
# 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.
+
Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
\ No newline at end of file
diff --git
a/res/graal/tomcat-embed-websocket/native-image/native-image.properties
b/res/graal/tomcat-embed-websocket/native-image/native-image.properties
index 9c4e82a..29b501f 100644
--- a/res/graal/tomcat-embed-websocket/native-image/native-image.properties
+++ b/res/graal/tomcat-embed-websocket/native-image/native-image.properties
@@ -12,4 +12,5 @@
# 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.
+
Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
\ No newline at end of file
diff --git a/test/org/apache/catalina/startup/EmbeddedTomcat.java
b/test/org/apache/catalina/startup/EmbeddedTomcat.java
index a9ce725..e4eb433 100644
--- a/test/org/apache/catalina/startup/EmbeddedTomcat.java
+++ b/test/org/apache/catalina/startup/EmbeddedTomcat.java
@@ -1,16 +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.catalina.startup;
-import org.apache.catalina.Context;
-import org.apache.catalina.connector.Connector;
-import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.scan.StandardJarScanFilter;
-import org.apache.tomcat.util.scan.StandardJarScanner;
-import org.junit.Ignore;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -18,6 +23,19 @@ import java.nio.charset.StandardCharsets;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.LogManager;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.Ignore;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.connector.Connector;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.scan.StandardJarScanFilter;
+import org.apache.tomcat.util.scan.StandardJarScanner;
+
@Ignore
public class EmbeddedTomcat {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
