Merge pull request #2506 from yahoo/arnej/remove-extra-gitignore

Arnej/remove extra gitignore

20 files changed, 21 insertions, 87 deletions

diff --git a/container-search/.gitignore b/container-search/.gitignore
index e4687268e83..7f4ebc3a7c6 100644
--- a/container-search/.gitignore
+++ b/container-search/.gitignore
@@ -1,54 +1,31 @@
-prelude.iml
-accessLog.log
+.classpath
+.project
+.settings
 /.cache
+/.classpath
 /.emacs.desktop
+/.nbintdb
+/.project
+/.settings
 /.version
-/libexec
-/testLogs
-/build
 /QueryAccessLog*
-/tmp
-/.classpath
-/.project
-/.nbintdb
+/accessLog.log
+/build
+/bundles
+/libexec
 /nbproject
-/prelude.iws
+/pom.xml.build
 /prelude.iml
 /prelude.ipr
-/bundles
-/testLogFileG.txt
-/testlogsG
-/.settings
-/test_yapache_access_log
-/target
+/prelude.iws
 /staging
-/accessLog.log
+/target
 /temp
-
-target
-
-staging
-
-temp
-
-tmp
-
-testlogsG
-
-.classpath
-
-.project
-
-QueryAccessLog.*
-
-test_yapache_access_log
-
-testLogFileG.txt
-
-.settings
-
-bundles
-null.log
-
+/testLogFileG.txt
+/testLogs
+/test_yapache_access_log
+/testlogsG
 /testng.out.log
-/pom.xml.build
+/tmp
+null.log
+tmp
diff --git a/container-search/src/main/java/com/yahoo/.gitignore b/container-search/src/main/java/com/yahoo/.gitignore
deleted file mode 100644
index 3fcbf90a554..00000000000
--- a/container-search/src/main/java/com/yahoo/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/
-
diff --git a/container-search/src/main/java/com/yahoo/component/chain/dependencies/.gitignore b/container-search/src/main/java/com/yahoo/component/chain/dependencies/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/container-search/src/main/java/com/yahoo/component/chain/dependencies/.gitignore
+++ /dev/null
diff --git a/container-search/src/main/java/com/yahoo/component/provider/.gitignore b/container-search/src/main/java/com/yahoo/component/provider/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/container-search/src/main/java/com/yahoo/component/provider/.gitignore
+++ /dev/null
diff --git a/container-search/src/main/java/com/yahoo/config/.gitignore b/container-search/src/main/java/com/yahoo/config/.gitignore
deleted file mode 100644
index 28c283f2219..00000000000
--- a/container-search/src/main/java/com/yahoo/config/.gitignore
+++ /dev/null
@@ -1,34 +0,0 @@
-/QueryProfilesConfig.java
-/QrBinaryCacheRegionConfig.java
-/ClusterConfig.java
-/QrSearchersConfig.java
-/PhysicalmappingConfig.java
-/QrMonitorConfig.java
-/BundlesConfig.java
-/SummaryConfig.java
-/RankProfilesConfig.java
-/FieldInfoConfig.java
-/QrStartConfig.java
-/StringConfig.java
-/QrFileserverConfig.java
-/QrBinaryCacheConfig.java
-/SemanticRulesConfig.java
-/FederationConfig.java
-/QrConfig.java
-/IndexInfoConfig.java
-/QueryplannerConfig.java
-/AttributesConfig.java
-/QrLoggingConfig.java
-/ProviderConfig.java
-/IntConfig.java
-/SearchChainsConfig.java
-/PageTemplatesConfig.java
-/HandlersConfig.java
-/QrTemplatesConfig.java
-/TilingSearcherConfig.java
-/TimingSearcherConfig.java
-/RewritesConfig.java
-/UnmarshallingConfig.java
-/SpecialtokensConfig.java
-/QrQuotetableConfig.java
-/ComponentsConfig.java
diff --git a/container-search/src/main/java/com/yahoo/container/config/webapp/.gitignore b/container-search/src/main/java/com/yahoo/container/config/webapp/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/container-search/src/main/java/com/yahoo/container/config/webapp/.gitignore
+++ /dev/null
diff --git a/container-search/src/main/java/com/yahoo/container/handler/config/.gitignore b/container-search/src/main/java/com/yahoo/container/handler/config/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/container-search/src/main/java/com/yahoo/container/handler/config/.gitignore
+++ /dev/null
diff --git a/container-search/src/main/java/com/yahoo/container/handler/observability/.gitignore b/container-search/src/main/java/com/yahoo/container/handler/observability/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/container-search/src/main/java/com/yahoo/container/handler/observability/.gitignore
+++ /dev/null
diff --git a/container-search/src/main/java/com/yahoo/container/http/.gitignore b/container-search/src/main/java/com/yahoo/container/http/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/container-search/src/main/java/com/yahoo/container/http/.gitignore
+++ /dev/null
diff --git a/container-search/src/main/java/com/yahoo/container/jrt/.gitignore b/container-search/src/main/java/com/yahoo/container/jrt/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/container-search/src/main/java/com/yahoo/container/jrt/.gitignore
+++ /dev/null
diff --git a/container-search/src/main/java/com/yahoo/container/logging/.gitignore b/container-search/src/main/java/com/yahoo/container/logging/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/container-search/src/main/java/com/yahoo/container/logging/.gitignore
+++ /dev/null
diff --git a/container-search/src/main/java/com/yahoo/container/osgi/.gitignore b/container-search/src/main/java/com/yahoo/container/osgi/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/container-search/src/main/java/com/yahoo/container/osgi/.gitignore
+++ /dev/null
diff --git a/container-search/src/main/java/com/yahoo/container/protect/.gitignore b/container-search/src/main/java/com/yahoo/container/protect/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/container-search/src/main/java/com/yahoo/container/protect/.gitignore
+++ /dev/null
diff --git a/container-search/src/main/java/com/yahoo/prelude/grouping/legacy/.gitignore b/container-search/src/main/java/com/yahoo/prelude/grouping/legacy/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/container-search/src/main/java/com/yahoo/prelude/grouping/legacy/.gitignore
+++ /dev/null
diff --git a/container-search/src/main/java/com/yahoo/search/app/.gitignore b/container-search/src/main/java/com/yahoo/search/app/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/container-search/src/main/java/com/yahoo/search/app/.gitignore
+++ /dev/null
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/parser/.gitignore b/container-search/src/main/java/com/yahoo/search/query/textserialize/parser/.gitignore
deleted file mode 100644
index add88bd6807..00000000000
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/parser/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/TokenMgrError.java
-/Token.java
-/SimpleCharStream.java
-/ParserTokenManager.java
-/ParserConstants.java
-/ParseException.java
-/Parser.java
diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/parser/.gitignore b/container-search/src/main/java/com/yahoo/search/querytransform/parser/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/container-search/src/main/java/com/yahoo/search/querytransform/parser/.gitignore
+++ /dev/null
diff --git a/container-search/src/main/java/com/yahoo/search/template/.gitignore b/container-search/src/main/java/com/yahoo/search/template/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/container-search/src/main/java/com/yahoo/search/template/.gitignore
+++ /dev/null
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/.gitignore b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/.gitignore
+++ /dev/null
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/test/.gitignore b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/test/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/test/.gitignore
+++ /dev/null