You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@submarine.apache.org by pi...@apache.org on 2021/11/10 16:14:16 UTC
[submarine] branch master updated: SUBMARINE-1075. Delete duplicate
class and unused config file
This is an automated email from the ASF dual-hosted git repository.
pingsutw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 4090440 SUBMARINE-1075. Delete duplicate class and unused config file
4090440 is described below
commit 40904405f03f944d7a83da9d059ee1770e0085bf
Author: jeff-901 <b0...@ntu.edu.tw>
AuthorDate: Sat Nov 6 09:35:52 2021 +0800
SUBMARINE-1075. Delete duplicate class and unused config file
### What is this PR for?
Delete duplicate org.apache.submarine.commons.runtime.exception.SubmarineRuntimeException.
Change all reference to org.apache.submarine.commons.utils.exception.SubmarineRuntimeException.
Delete submarine-site.xml under server-core, which is no used by any other file.
### What type of PR is it?
Improvement
### Todos
### What is the Jira issue?
https://issues.apache.org/jira/browse/SUBMARINE-1075
### How should this be tested?
### Screenshots (if appropriate)
### Questions:
* Do the license files need updating? No
* Are there breaking changes for older versions? No
* Does this need new documentation? No
Author: jeff-901 <b0...@ntu.edu.tw>
Signed-off-by: Kevin <pi...@apache.org>
Closes #793 from jeff-901/SUBMARINE-1075 and squashes the following commits:
7f401bd0 [jeff-901] delete unused file
---
.../exception/SubmarineRuntimeException.java | 30 ----
.../server/database/utils/HibernateUtil.java | 2 +-
.../src/main/resources/submarine-site.xml | 154 ---------------------
3 files changed, 1 insertion(+), 185 deletions(-)
diff --git a/submarine-commons/commons-runtime/src/main/java/org/apache/submarine/commons/runtime/exception/SubmarineRuntimeException.java b/submarine-commons/commons-runtime/src/main/java/org/apache/submarine/commons/runtime/exception/SubmarineRuntimeException.java
deleted file mode 100644
index 15eb509..0000000
--- a/submarine-commons/commons-runtime/src/main/java/org/apache/submarine/commons/runtime/exception/SubmarineRuntimeException.java
+++ /dev/null
@@ -1,30 +0,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.
- */
-
-package org.apache.submarine.commons.runtime.exception;
-
-public class SubmarineRuntimeException extends RuntimeException {
- public SubmarineRuntimeException(String s) {
- super(s);
- }
-
- public SubmarineRuntimeException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/database/utils/HibernateUtil.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/database/utils/HibernateUtil.java
index 3df8e2f..06ff94c 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/database/utils/HibernateUtil.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/database/utils/HibernateUtil.java
@@ -17,7 +17,7 @@
package org.apache.submarine.server.database.utils;
-import org.apache.submarine.commons.runtime.exception.SubmarineRuntimeException;
+import org.apache.submarine.commons.utils.exception.SubmarineRuntimeException;
import org.hibernate.SessionFactory;
import org.hibernate.boot.MetadataSources;
import org.hibernate.boot.registry.StandardServiceRegistry;
diff --git a/submarine-server/server-core/src/main/resources/submarine-site.xml b/submarine-server/server-core/src/main/resources/submarine-site.xml
deleted file mode 100755
index c03bda5..0000000
--- a/submarine-server/server-core/src/main/resources/submarine-site.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
- 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.
--->
-
-<configuration>
-
- <property>
- <name>submarine.cluster.addr</name>
- <value></value>
- <description>submarine cluster address list, e.g. ip1:port1;ip2:port2;ip3:port3</description>
- </property>
-
- <property>
- <name>submarine.server.addr</name>
- <value>0.0.0.0</value>
- <description>Server address</description>
- </property>
-
- <property>
- <name>submarine.server.port</name>
- <value>8080</value>
- <description>Server port.</description>
- </property>
-
- <property>
- <name>submarine.server.ssl</name>
- <value>false</value>
- <description>Should SSL be used by the submarine server?</description>
- </property>
-
- <property>
- <name>submarine.server.ssl.port</name>
- <value>8443</value>
- <description>Server ssl port. (used when ssl property is set to true)</description>
- </property>
-
- <property>
- <name>submarine.server.ssl.client.auth</name>
- <value>false</value>
- <description>Should client authentication be used for SSL connections?</description>
- </property>
-
- <property>
- <name>submarine.server.ssl.keystore.path</name>
- <value>keystore</value>
- <description>Path to keystore relative to submarine configuration directory</description>
- </property>
-
- <property>
- <name>submarine.server.ssl.keystore.type</name>
- <value>JKS</value>
- <description>The format of the given keystore (e.g. JKS or PKCS12)</description>
- </property>
-
- <property>
- <name>submarine.server.ssl.keystore.password</name>
- <value>change me</value>
- <description>Keystore password. Can be obfuscated by the Jetty Password tool</description>
- </property>
-
- <!--
- <property>
- <name>submarine.server.ssl.key.manager.password</name>
- <value>change me</value>
- <description>Key Manager password. Defaults to keystore password. Can be obfuscated.</description>
- </property>
- -->
-
- <property>
- <name>submarine.server.ssl.truststore.path</name>
- <value>truststore</value>
- <description>Path to truststore relative to submarine configuration directory. Defaults to the keystore path</description>
- </property>
-
- <property>
- <name>submarine.server.ssl.truststore.type</name>
- <value>JKS</value>
- <description>The format of the given truststore (e.g. JKS or PKCS12). Defaults to the same type as the keystore type</description>
- </property>
-
- <!--
- <property>
- <name>submarine.server.ssl.truststore.password</name>
- <value>change me</value>
- <description>Truststore password. Can be obfuscated by the Jetty Password tool. Defaults to the keystore password</description>
- </property>
- -->
-
- <property>
- <name>workbench.web.war</name>
- <value>submarine-workbench/workbench-web/target/submarine-workbench-web.war</value>
- <description>Submarine workbench web war file path.</description>
- </property>
-
- <property>
- <name>jdbc.driverClassName</name>
- <value>com.mysql.jdbc.Driver</value>
- </property>
- <property>
- <name>jdbc.url</name>
- <value>jdbc:mysql://127.0.0.1:3306/submarine?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true</value>
- </property>
- <property>
- <name>jdbc.username</name>
- <value>submarine</value>
- </property>
- <property>
- <name>jdbc.password</name>
- <value>password</value>
- </property>
-
- <property>
- <name>metastore.jdbc.url</name>
- <value>jdbc:mysql://127.0.0.1:3306/metastore?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false</value>
- </property>
- <property>
- <name>metastore.jdbc.username</name>
- <value>metastore</value>
- </property>
- <property>
- <name>metastore.jdbc.password</name>
- <value>password</value>
- </property>
-
- <property>
- <name>submarine.runtime.class</name>
- <value>org.apache.submarine.server.submitter.yarn.YarnRuntimeFactory</value>
- <description>RuntimeFactory for Submarine jobs</description>
- </property>
-
- <property>
- <name>environment.conda.min.version</name>
- <value>4.0.1</value>
- </property>
- <property>
- <name>environment.conda.max.version</name>
- <value>4.10.10</value>
- </property>
-</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@submarine.apache.org
For additional commands, e-mail: dev-help@submarine.apache.org