Merge remote-tracking branch 'refs/remotes/apache/trunk' into trunk

.gitignore

@@ -0,0 +1,40 @@
+bin/
+build/
+applications/*/build
+framework/*/build
+hot-deploy/*/build
+specialpurpose/*/build
+runtime/git-rebase/*
+runtime/SvnInfo.ftl
+runtime/GitInfo.ftl
+runtime/test-list-build.xml
+runtime/logs/access_log.*
+runtime/logs/*.log*
+runtime/logs/*.html*
+runtime/logs/test-results/*
+runtime/logs/birt
+runtime/data/derby/*
+runtime/data/utilcache.*
+runtime/catalina/work/*
+runtime/tempfiles/*
+runtime/indexes/products/
+!runtime/tempfiles/README
+applications/content/index/
+changelog
+.classpath
+.project
+.settings
+.gradle/
+.groovy
+.pc
+.DS_Store
+desktop.ini
+.idea
+*.iml
+*.ipr
+*.iws
+*~
+*#
+.*.swp
+.*.swo
+*.patch

.hgignore

@@ -0,0 +1,9 @@
+syntax: regexp
+^(framework|applications|specialpurpose)/[^/]+/build/.*$
+^ofbiz\.jar$
+^runtime/data/derby/.*$
+^runtime/logs/.*(log|html)(|.\d+)$
+^runtime/logs/access_log.\d\d\d\d-\d\d-\d\d$
+^runtime/(catalina/work|logs/test-results)/.*$
+^runtime/data.zip$
+^runtime/test-list-build.xml$

.xmlcatalog.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- This is the catalog of OFBiz XML schemas for Eclipse. Just import it and this will avoid Eclipse to go to the web for checking the xml files against their schema. 
+     More at https://cwiki.apache.org/confluence/display/OFBIZ/Eclipse+Tips#EclipseTips-xmlCatalog
+-->
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <nextCatalog catalog="platform:/resource/ofbiz/framework/base/dtd/base-catalog.xml"/>
+  <nextCatalog catalog="platform:/resource/ofbiz/framework/datafile/dtd/datafiles-catalog.xml"/>
+  <nextCatalog catalog="platform:/resource/ofbiz/framework/entity/dtd/entity-catalog.xml"/>
+  <nextCatalog catalog="platform:/resource/ofbiz/framework/minilang/dtd/minilang-catalog.xml"/>
+  <nextCatalog catalog="platform:/resource/ofbiz/framework/service/dtd/service-catalog.xml"/>
+  <nextCatalog catalog="platform:/resource/ofbiz/framework/testtools/dtd/testtools-catalog.xml"/>
+  <nextCatalog catalog="platform:/resource/ofbiz/framework/webapp/dtd/webapp-catalog.xml"/>
+  <nextCatalog catalog="platform:/resource/ofbiz/framework/widget/dtd/widget-catalog.xml"/>
+</catalog>