You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2019/06/07 18:48:32 UTC
[trafficcontrol] branch master updated: Now ignoring
editor/IDE-specific configuration files (#3643)
This is an automated email from the ASF dual-hosted git repository.
mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 8cf9f92 Now ignoring editor/IDE-specific configuration files (#3643)
8cf9f92 is described below
commit 8cf9f921426e9ef0c241c01e72b0a76affc9e8f9
Author: ocket8888 <oc...@gmail.com>
AuthorDate: Fri Jun 7 12:48:26 2019 -0600
Now ignoring editor/IDE-specific configuration files (#3643)
This also removes some of the pre-existing editor/IDE-specific configuration files from the repositiory
---
.gitignore | 20 ++++++++++++++-----
traffic_router/.gitignore | 19 ++++++++----------
traffic_router/connector/.classpath | 39 -------------------------------------
traffic_router/core/.classpath | 36 ----------------------------------
traffic_router/core/.project | 29 ---------------------------
traffic_router/shared/.gitignore | 2 ++
6 files changed, 25 insertions(+), 120 deletions(-)
diff --git a/.gitignore b/.gitignore
index ab47069..b9fd26f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,4 @@
-.project
-.*.swp
.DS_Store
-*.bak
-*.iml
-.idea/
cpanfile.snapshot
rpm/build.number
rpmbuild/
@@ -30,3 +25,18 @@ bin/docker-compose
/.m2
# local storage for cdn-in-a-box Carton packages
local.tar.gz
+# Editor/IDE configuration files
+*.sublime-project
+*.sublime-workspace
+.vscode/
+*.pydevproject
+.idea/
+.project
+.*.swp
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
+*.elc
+.projectile
+*.bak
+*.iml
diff --git a/traffic_router/.gitignore b/traffic_router/.gitignore
index 448a380..6d9746b 100644
--- a/traffic_router/.gitignore
+++ b/traffic_router/.gitignore
@@ -1,20 +1,17 @@
/target/
-/.settings/
-/core/target
-/core/.settings
/api/target
-/api/.settings
-/rpm/target
-/rpm/.settings
-/connector/target
-/connector/.settings
/configuration/target
+/connector/target
+/core/target
+/geolocation/target
+/rpm/target
+/shared/target
/core/src/test/resources/var/auto-zones
/core/src/test/db/cr-config.json
/core/src/test/db/health.json
/core/src/test/db
/core/src/test/conf/traffic_monitor.properties
/core/src/test/conf/traffic_ops.properties
-/geolocation/target
-/shared/target
-
+/core/src/test/var
+.classpath
+.settings
diff --git a/traffic_router/connector/.classpath b/traffic_router/connector/.classpath
deleted file mode 100644
index 1b128d7..0000000
--- a/traffic_router/connector/.classpath
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed 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.
- -->
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="TOMCAT_BIN/bootstrap.jar"/>
- <classpathentry kind="var" path="TOMCAT_BIN/commons-daemon.jar"/>
- <classpathentry kind="var" path="TOMCAT_BIN/tomcat-juli.jar"/>
- <classpathentry kind="var" path="TOMCAT_JARS/annotations-api.jar"/>
- <classpathentry kind="var" path="TOMCAT_JARS/catalina-ant.jar"/>
- <classpathentry kind="var" path="TOMCAT_JARS/catalina-ha.jar"/>
- <classpathentry kind="var" path="TOMCAT_JARS/catalina-tribes.jar"/>
- <classpathentry kind="var" path="TOMCAT_JARS/catalina.jar"/>
- <classpathentry kind="var" path="TOMCAT_JARS/ecj-4.2.2.jar"/>
- <classpathentry kind="var" path="TOMCAT_JARS/el-api.jar"/>
- <classpathentry kind="var" path="TOMCAT_JARS/jasper-el.jar"/>
- <classpathentry kind="var" path="TOMCAT_JARS/jasper.jar"/>
- <classpathentry kind="var" path="TOMCAT_JARS/jsp-api.jar"/>
- <classpathentry kind="var" path="TOMCAT_JARS/servlet-api.jar"/>
- <classpathentry kind="var" path="TOMCAT_JARS/tomcat-coyote.jar"/>
- <classpathentry kind="var" path="TOMCAT_JARS/tomcat-dbcp.jar"/>
- <classpathentry kind="var" path="TOMCAT_JARS/tomcat-i18n-es.jar"/>
- <classpathentry kind="var" path="TOMCAT_JARS/tomcat-i18n-fr.jar"/>
- <classpathentry kind="var" path="TOMCAT_JARS/tomcat-i18n-ja.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/traffic_router/core/.classpath b/traffic_router/core/.classpath
deleted file mode 100644
index 43faee8..0000000
--- a/traffic_router/core/.classpath
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/traffic_router/core/.project b/traffic_router/core/.project
deleted file mode 100644
index c5adfca..0000000
--- a/traffic_router/core/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>traffic_router_core</name>
- <comment>Traffic Router Core</comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- </natures>
-</projectDescription>
diff --git a/traffic_router/shared/.gitignore b/traffic_router/shared/.gitignore
new file mode 100644
index 0000000..54466f5
--- /dev/null
+++ b/traffic_router/shared/.gitignore
@@ -0,0 +1,2 @@
+/target
+