Permalink
Browse files

Roughly merges trunk HEAD in order to later merge in jackrabbit201205…

…01 branch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/jackrabbit20100709@1553090 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
2 parents 02b127b + 6f8ec57 commit 4a3ccd6bf88425038ff5bbcf3433823a5d21101a @JacquesLeRoux JacquesLeRoux committed Dec 23, 2013
Showing 6,331 changed files with 704,764 additions and 474,933 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
View
@@ -5,11 +5,5 @@ syntax: regexp
^runtime/logs/.*(log|html)(|.\d+)$
^runtime/logs/access_log.\d\d\d\d-\d\d-\d\d$
^runtime/(catalina/work|logs/test-results)/.*$
-^debian/(EncryptPassword.class|files)$
-^debian/stamps/.*$
-^debian/ofbiz(|-(framework|applications|specialpurpose))/.*
-^debian/ofbiz(|-(framework|applications|specialpurpose))\.debhelper\.log$
-^debian/ofbiz(|-(framework|applications|specialpurpose))\.(pre|post)(inst|rm)\.debhelper$
-^debian/ofbiz(|-(framework|applications|specialpurpose))\.substvars$
^runtime/data.zip$
^runtime/test-list-build.xml$
View
@@ -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>
View
@@ -1,70 +0,0 @@
-This file contains the PGP keys of various developers.
-
-Users: pgp < KEYS
- gpg --import KEYS
-Developers:
- pgp -kxa <your name> and append it to this file.
- (pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
- (gpg --list-sigs <your name> && gpg --armor --export <your name>) >> this file.
-
----------------------------------
-pub 4096R/847AF9E0 2010-04-05
-uid Jacopo Cappellato (CODE SIGNING KEY) <jacopoc@apache.org>
-sig 3 847AF9E0 2010-04-05 Jacopo Cappellato (CODE SIGNING KEY) <jacopoc@apache.org>
-sig DFEAC4B9 2010-04-06 David N. Welton <davidw@dedasys.com>
-sub 4096R/384F8B0B 2010-04-05
-sig 847AF9E0 2010-04-05 Jacopo Cappellato (CODE SIGNING KEY) <jacopoc@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG/MacGPG2 v2.0.14 (Darwin)
-
-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
-=6iBe
------END PGP PUBLIC KEY BLOCK-----
Oops, something went wrong.

0 comments on commit 4a3ccd6

Please sign in to comment.