Menu
▾
▴
exist-commits — Receive notifications about CVS commits.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
(57) |
Apr
(103) |
May
(164) |
Jun
(139) |
Jul
(173) |
Aug
(196) |
Sep
(221) |
Oct
(333) |
Nov
(214) |
Dec
(88) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(163) |
Feb
(165) |
Mar
(98) |
Apr
(93) |
May
(199) |
Jun
(118) |
Jul
(200) |
Aug
(212) |
Sep
(185) |
Oct
(297) |
Nov
(437) |
Dec
(272) |
| 2006 |
Jan
(542) |
Feb
(329) |
Mar
(267) |
Apr
(332) |
May
(267) |
Jun
(130) |
Jul
(161) |
Aug
(348) |
Sep
(166) |
Oct
(305) |
Nov
(173) |
Dec
(173) |
| 2007 |
Jan
(199) |
Feb
(118) |
Mar
(133) |
Apr
(200) |
May
(208) |
Jun
(146) |
Jul
(198) |
Aug
(146) |
Sep
(187) |
Oct
(182) |
Nov
(181) |
Dec
(83) |
| 2008 |
Jan
(252) |
Feb
(124) |
Mar
(124) |
Apr
(101) |
May
(143) |
Jun
(122) |
Jul
(129) |
Aug
(60) |
Sep
(80) |
Oct
(89) |
Nov
(54) |
Dec
(112) |
| 2009 |
Jan
(88) |
Feb
(145) |
Mar
(105) |
Apr
(164) |
May
(123) |
Jun
(154) |
Jul
(374) |
Aug
(341) |
Sep
(219) |
Oct
(137) |
Nov
(373) |
Dec
(240) |
| 2010 |
Jan
(197) |
Feb
(270) |
Mar
(253) |
Apr
(150) |
May
(102) |
Jun
(51) |
Jul
(300) |
Aug
(512) |
Sep
(254) |
Oct
(258) |
Nov
(288) |
Dec
(143) |
| 2011 |
Jan
(238) |
Feb
(179) |
Mar
(253) |
Apr
(332) |
May
(248) |
Jun
(255) |
Jul
(216) |
Aug
(282) |
Sep
(146) |
Oct
(77) |
Nov
(86) |
Dec
(69) |
| 2012 |
Jan
(172) |
Feb
(234) |
Mar
(229) |
Apr
(101) |
May
(212) |
Jun
(267) |
Jul
(129) |
Aug
(210) |
Sep
(239) |
Oct
(271) |
Nov
(368) |
Dec
(220) |
| 2013 |
Jan
(179) |
Feb
(155) |
Mar
(59) |
Apr
(47) |
May
(99) |
Jun
(158) |
Jul
(185) |
Aug
(16) |
Sep
(16) |
Oct
(7) |
Nov
(20) |
Dec
(12) |
| 2014 |
Jan
(21) |
Feb
(17) |
Mar
(18) |
Apr
(13) |
May
(27) |
Jun
(15) |
Jul
(19) |
Aug
(22) |
Sep
(30) |
Oct
(16) |
Nov
(19) |
Dec
(16) |
| 2015 |
Jan
(14) |
Feb
(24) |
Mar
(33) |
Apr
(41) |
May
(14) |
Jun
(80) |
Jul
(53) |
Aug
(8) |
Sep
(7) |
Oct
(15) |
Nov
(13) |
Dec
(2) |
| 2016 |
Jan
(22) |
Feb
(12) |
Mar
(30) |
Apr
(6) |
May
(33) |
Jun
(16) |
Jul
(8) |
Aug
(20) |
Sep
(12) |
Oct
(18) |
Nov
(12) |
Dec
(11) |
| 2017 |
Jan
(24) |
Feb
(26) |
Mar
(47) |
Apr
(23) |
May
(19) |
Jun
(14) |
Jul
(28) |
Aug
(30) |
Sep
(17) |
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
(1) |
Feb
(73) |
Mar
(90) |
Apr
(42) |
May
(116) |
Jun
(90) |
Jul
(127) |
Aug
(103) |
Sep
(56) |
Oct
(42) |
Nov
(95) |
Dec
(58) |
| 2020 |
Jan
(102) |
Feb
(31) |
Mar
(93) |
Apr
(60) |
May
(57) |
Jun
(45) |
Jul
(29) |
Aug
(32) |
Sep
(44) |
Oct
(86) |
Nov
(51) |
Dec
(71) |
| 2021 |
Jan
(44) |
Feb
(25) |
Mar
(78) |
Apr
(130) |
May
(64) |
Jun
(74) |
Jul
(21) |
Aug
(64) |
Sep
(40) |
Oct
(43) |
Nov
(21) |
Dec
(99) |
| 2022 |
Jan
(154) |
Feb
(64) |
Mar
(45) |
Apr
(95) |
May
(62) |
Jun
(48) |
Jul
(73) |
Aug
(37) |
Sep
(71) |
Oct
(27) |
Nov
(40) |
Dec
(65) |
| 2023 |
Jan
(89) |
Feb
(130) |
Mar
(124) |
Apr
(50) |
May
(93) |
Jun
(46) |
Jul
(45) |
Aug
(68) |
Sep
(62) |
Oct
(71) |
Nov
(108) |
Dec
(82) |
| 2024 |
Jan
(53) |
Feb
(76) |
Mar
(64) |
Apr
(75) |
May
(36) |
Jun
(54) |
Jul
(98) |
Aug
(137) |
Sep
(58) |
Oct
(177) |
Nov
(84) |
Dec
(52) |
| 2025 |
Jan
(70) |
Feb
(53) |
Mar
(72) |
Apr
(47) |
May
(88) |
Jun
(49) |
Jul
(86) |
Aug
(51) |
Sep
(65) |
Oct
(91) |
Nov
(18) |
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
1
(13) |
2
(6) |
3
(1) |
4
(4) |
5
(1) |
6
(11) |
7
(1) |
|
8
(4) |
9
(6) |
10
(3) |
11
(7) |
12
(8) |
13
(2) |
14
(1) |
|
15
(5) |
16
(29) |
17
(14) |
18
(12) |
19
(7) |
20
(4) |
21
(2) |
|
22
(5) |
23
(18) |
24
(5) |
25
(5) |
26
(23) |
27
(17) |
28
(7) |
|
29
(5) |
30
(15) |
31
(7) |
|
|
|
|
|
From: <del...@us...> - 2011-05-31 17:06:29
|
Revision: 14597
http://exist.svn.sourceforge.net/exist/?rev=14597&view=rev
Author: deliriumsky
Date: 2011-05-31 17:06:23 +0000 (Tue, 31 May 2011)
Log Message:
-----------
[bugfix] Dont forget to free brokers
Modified Paths:
--------------
branches/adam/eXist-acl/src/org/exist/xmlrpc/RpcConnection.java
Modified: branches/adam/eXist-acl/src/org/exist/xmlrpc/RpcConnection.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/xmlrpc/RpcConnection.java 2011-05-31 17:05:14 UTC (rev 14596)
+++ branches/adam/eXist-acl/src/org/exist/xmlrpc/RpcConnection.java 2011-05-31 17:06:23 UTC (rev 14597)
@@ -3411,27 +3411,53 @@
}
}
+ private interface BrokerOperation {
+ public void withBroker(DBBroker broker) throws EXistException, URISyntaxException, PermissionDeniedException;
+ }
+
+ private void executeWithBroker(BrokerOperation brokerOperation) throws EXistException, URISyntaxException, PermissionDeniedException {
+ DBBroker broker = null;
+ try {
+ broker = factory.getBrokerPool().get(user);
+ brokerOperation.withBroker(broker);
+ } finally {
+ if(broker != null) {
+ factory.getBrokerPool().release(broker);
+ }
+ }
+ }
+
@Override
public boolean setPermissions(final String resource, final String owner, final String ownerGroup) throws EXistException, PermissionDeniedException, URISyntaxException {
- DBBroker broker = factory.getBrokerPool().get(user);
- PermissionFactory.updatePermissions(broker, XmldbURI.xmldbUriFor(resource), new PermissionModifier(){
+ executeWithBroker(new BrokerOperation() {
@Override
- public void modify(Permission permission) throws PermissionDeniedException {
- permission.setOwner(owner);
- permission.setGroup(ownerGroup);
+ public void withBroker(final DBBroker broker) throws EXistException, URISyntaxException, PermissionDeniedException {
+ PermissionFactory.updatePermissions(broker, XmldbURI.xmldbUriFor(resource), new PermissionModifier(){
+ @Override
+ public void modify(Permission permission) throws PermissionDeniedException {
+ permission.setOwner(owner);
+ permission.setGroup(ownerGroup);
+ }
+ });
}
});
-
+
return true;
}
+
+
@Override
public boolean setPermissions(final String resource, final int permissions) throws EXistException, PermissionDeniedException, URISyntaxException {
- DBBroker broker = factory.getBrokerPool().get(user);
- PermissionFactory.updatePermissions(broker, XmldbURI.xmldbUriFor(resource), new PermissionModifier(){
+ executeWithBroker(new BrokerOperation() {
@Override
- public void modify(Permission permission) throws PermissionDeniedException {
- permission.setMode(permissions);
+ public void withBroker(final DBBroker broker) throws EXistException, URISyntaxException, PermissionDeniedException {
+ PermissionFactory.updatePermissions(broker, XmldbURI.xmldbUriFor(resource), new PermissionModifier(){
+ @Override
+ public void modify(Permission permission) throws PermissionDeniedException {
+ permission.setMode(permissions);
+ }
+ });
}
});
@@ -3440,17 +3466,21 @@
@Override
public boolean setPermissions(final String resource, final String permissions) throws EXistException, PermissionDeniedException, URISyntaxException {
- DBBroker broker = factory.getBrokerPool().get(user);
- PermissionFactory.updatePermissions(broker, XmldbURI.xmldbUriFor(resource), new PermissionModifier(){
+ executeWithBroker(new BrokerOperation() {
@Override
- public void modify(Permission permission) throws PermissionDeniedException {
- try {
- permission.setMode(permissions);
- } catch(SyntaxException se) {
- throw new PermissionDeniedException("Unrecognised mode syntax: " + se.getMessage(), se);
- }
+ public void withBroker(final DBBroker broker) throws EXistException, URISyntaxException, PermissionDeniedException {
+ PermissionFactory.updatePermissions(broker, XmldbURI.xmldbUriFor(resource), new PermissionModifier(){
+ @Override
+ public void modify(Permission permission) throws PermissionDeniedException {
+ try {
+ permission.setMode(permissions);
+ } catch(SyntaxException se) {
+ throw new PermissionDeniedException("Unrecognised mode syntax: " + se.getMessage(), se);
+ }
+ }
+ });
}
- });
+ });
return true;
}
@@ -3469,19 +3499,22 @@
*/
@Override
public boolean setPermissions(final String resource, final String owner, final String ownerGroup, final String permissions) throws EXistException, PermissionDeniedException, URISyntaxException {
-
- DBBroker broker = factory.getBrokerPool().get(user);
- PermissionFactory.updatePermissions(broker, XmldbURI.xmldbUriFor(resource), new PermissionModifier(){
+ executeWithBroker(new BrokerOperation() {
@Override
- public void modify(Permission permission) throws PermissionDeniedException {
- permission.setOwner(owner);
- permission.setGroup(ownerGroup);
- try {
- permission.setMode(permissions);
- } catch(SyntaxException se) {
- throw new PermissionDeniedException("Unrecognised mode syntax: " + se.getMessage(), se);
- }
- }
+ public void withBroker(final DBBroker broker) throws EXistException, URISyntaxException, PermissionDeniedException {
+ PermissionFactory.updatePermissions(broker, XmldbURI.xmldbUriFor(resource), new PermissionModifier(){
+ @Override
+ public void modify(Permission permission) throws PermissionDeniedException {
+ permission.setOwner(owner);
+ permission.setGroup(ownerGroup);
+ try {
+ permission.setMode(permissions);
+ } catch(SyntaxException se) {
+ throw new PermissionDeniedException("Unrecognised mode syntax: " + se.getMessage(), se);
+ }
+ }
+ });
+ }
});
return true;
@@ -3501,14 +3534,18 @@
*/
@Override
public boolean setPermissions(final String resource, final String owner, final String ownerGroup, final int permissions) throws EXistException, PermissionDeniedException, URISyntaxException {
- DBBroker broker = factory.getBrokerPool().get(user);
- PermissionFactory.updatePermissions(broker, XmldbURI.xmldbUriFor(resource), new PermissionModifier(){
+ executeWithBroker(new BrokerOperation() {
@Override
- public void modify(Permission permission) throws PermissionDeniedException {
- permission.setOwner(owner);
- permission.setGroup(ownerGroup);
- permission.setMode(permissions);
+ public void withBroker(final DBBroker broker) throws EXistException, URISyntaxException, PermissionDeniedException {
+ PermissionFactory.updatePermissions(broker, XmldbURI.xmldbUriFor(resource), new PermissionModifier(){
+ @Override
+ public void modify(Permission permission) throws PermissionDeniedException {
+ permission.setOwner(owner);
+ permission.setGroup(ownerGroup);
+ permission.setMode(permissions);
+ }
+ });
}
});
@@ -3517,23 +3554,27 @@
@Override
public boolean setPermissions(final String resource, final String owner, final String group, final int mode, final List<ACEAider> aces) throws EXistException, PermissionDeniedException, URISyntaxException {
- DBBroker broker = factory.getBrokerPool().get(user);
- PermissionFactory.updatePermissions(broker, XmldbURI.xmldbUriFor(resource), new PermissionModifier(){
+ executeWithBroker(new BrokerOperation() {
@Override
- public void modify(Permission permission) throws PermissionDeniedException {
- permission.setOwner(owner);
- permission.setGroup(group);
- permission.setMode(mode);
+ public void withBroker(final DBBroker broker) throws EXistException, URISyntaxException, PermissionDeniedException {
+ PermissionFactory.updatePermissions(broker, XmldbURI.xmldbUriFor(resource), new PermissionModifier(){
+ @Override
+ public void modify(Permission permission) throws PermissionDeniedException {
+ permission.setOwner(owner);
+ permission.setGroup(group);
+ permission.setMode(mode);
- if(permission instanceof ACLPermission) {
- ACLPermission aclPermission = ((ACLPermission)permission);
- aclPermission.clear();
- for(ACEAider ace : aces) {
- aclPermission.addACE(ace.getAccessType(), ace.getTarget(), ace.getWho(), ace.getMode());
+ if(permission instanceof ACLPermission) {
+ ACLPermission aclPermission = ((ACLPermission)permission);
+ aclPermission.clear();
+ for(ACEAider ace : aces) {
+ aclPermission.addACE(ace.getAccessType(), ace.getTarget(), ace.getWho(), ace.getMode());
+ }
+ }
}
- }
+ });
}
- });
+ });
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <del...@us...> - 2011-05-31 17:05:23
|
Revision: 14596
http://exist.svn.sourceforge.net/exist/?rev=14596&view=rev
Author: deliriumsky
Date: 2011-05-31 17:05:14 +0000 (Tue, 31 May 2011)
Log Message:
-----------
[ignore] comment
Modified Paths:
--------------
branches/adam/eXist-acl/src/org/exist/security/PermissionFactory.java
Modified: branches/adam/eXist-acl/src/org/exist/security/PermissionFactory.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/security/PermissionFactory.java 2011-05-31 17:04:34 UTC (rev 14595)
+++ branches/adam/eXist-acl/src/org/exist/security/PermissionFactory.java 2011-05-31 17:05:14 UTC (rev 14596)
@@ -66,6 +66,7 @@
}
public static Permission getPermission(int ownerId, int groupId) {
+ //TODO consider loading Permission.DEFAULT_PERM from conf.xml instead
return new SimpleACLPermission(sm, ownerId, groupId, Permission.DEFAULT_PERM);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <del...@us...> - 2011-05-31 17:04:45
|
Revision: 14595
http://exist.svn.sourceforge.net/exist/?rev=14595&view=rev
Author: deliriumsky
Date: 2011-05-31 17:04:34 +0000 (Tue, 31 May 2011)
Log Message:
-----------
[bugfix] Updated tests as Collections now have stricter default permissions 0755
Modified Paths:
--------------
branches/adam/eXist-acl/test/src/org/exist/security/XMLDBSecurityTest.java
Modified: branches/adam/eXist-acl/test/src/org/exist/security/XMLDBSecurityTest.java
===================================================================
--- branches/adam/eXist-acl/test/src/org/exist/security/XMLDBSecurityTest.java 2011-05-31 14:07:59 UTC (rev 14594)
+++ branches/adam/eXist-acl/test/src/org/exist/security/XMLDBSecurityTest.java 2011-05-31 17:04:34 UTC (rev 14595)
@@ -123,14 +123,22 @@
assertEquals("<testMe/>", resource.getContent().toString());
}
- @Test
- public void groupRemoveCollection() throws XMLDBException {
+ @Test(expected=XMLDBException.class)
+ public void groupRemoveCollection_canNotWriteParent() throws XMLDBException {
Collection root = DatabaseManager.getCollection(baseUri + "/db", "test2", "test2");
CollectionManagementService cms = (CollectionManagementService)
root.getService("CollectionManagementService", "1.0");
cms.removeCollection("securityTest1");
}
+ @Test
+ public void groupRemoveCollection_canWriteParent() throws XMLDBException {
+ Collection root = DatabaseManager.getCollection(baseUri + "/db", "admin", "");
+ CollectionManagementService cms = (CollectionManagementService)
+ root.getService("CollectionManagementService", "1.0");
+ cms.removeCollection("securityTest1");
+ }
+
@Test(expected=XMLDBException.class)
public void groupChmodCollection_asNotOwnerAndNotDBA() throws XMLDBException {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2011-05-31 14:08:09
|
Revision: 14594
http://exist.svn.sourceforge.net/exist/?rev=14594&view=rev
Author: jenspetersen
Date: 2011-05-31 14:07:59 +0000 (Tue, 31 May 2011)
Log Message:
-----------
[tamboti-betterform] Formatting.
Modified Paths:
--------------
branches/betterform/tamboti/modules/edit/body/00-compact-contents.xml
branches/betterform/tamboti/modules/edit/body/00-compact-standalone.xml
branches/betterform/tamboti/modules/edit/body/01-title.xml
branches/betterform/tamboti/modules/edit/body/02-name.xml
branches/betterform/tamboti/modules/edit/body/03-origin.xml
branches/betterform/tamboti/modules/edit/body/04-part.xml
branches/betterform/tamboti/modules/edit/body/05-physical-description.xml
branches/betterform/tamboti/modules/edit/body/06-target-audience.xml
branches/betterform/tamboti/modules/edit/body/07-language.xml
branches/betterform/tamboti/modules/edit/body/08-type.xml
branches/betterform/tamboti/modules/edit/body/09-genre.xml
branches/betterform/tamboti/modules/edit/body/10-subject.xml
branches/betterform/tamboti/modules/edit/body/11-classification.xml
branches/betterform/tamboti/modules/edit/body/12-abstract.xml
branches/betterform/tamboti/modules/edit/body/13-table-of-contents.xml
branches/betterform/tamboti/modules/edit/body/14-note.xml
branches/betterform/tamboti/modules/edit/body/15-related.xml
branches/betterform/tamboti/modules/edit/body/16-identifier.xml
branches/betterform/tamboti/modules/edit/body/17-record-info.xml
branches/betterform/tamboti/modules/edit/body/18-access-condition.xml
branches/betterform/tamboti/modules/edit/body/19-location.xml
branches/betterform/tamboti/modules/edit/body/20-extension.xml
branches/betterform/tamboti/modules/edit/body/subforms/compact-b/anthology-xlink.xml
branches/betterform/tamboti/modules/edit/body/subforms/compact-b/anthology.xml
branches/betterform/tamboti/modules/edit/body/subforms/compact-b/periodical.xml
branches/betterform/tamboti/modules/edit/body/subforms/compact-b/review.xml
branches/betterform/tamboti/modules/edit/body/subforms/compact-b/series.xml
branches/betterform/tamboti/modules/edit/body/subforms/compact-b/suebs-tibetan.xml
branches/betterform/tamboti/modules/edit/code-tables/date-encoding-short-codes.xml
branches/betterform/tamboti/modules/edit/code-tables/document-type-codes.xml
branches/betterform/tamboti/modules/edit/code-tables/name-type-codes.xml
branches/betterform/tamboti/modules/edit/code-tables/script-codes.xml
branches/betterform/tamboti/modules/edit/code-tables/title-type-codes.xml
branches/betterform/tamboti/modules/edit/code-tables/transliteration-codes.xml
branches/betterform/tamboti/modules/edit/codes-for-tab.xq
branches/betterform/tamboti/modules/edit/edit.css
branches/betterform/tamboti/modules/edit/insert-templates.xml
branches/betterform/tamboti/modules/edit/instances/monograph-latin.xml
branches/betterform/tamboti/modules/edit/instances/monograph-transliteration.xml
branches/betterform/tamboti/modules/edit/new-instance.xml
branches/betterform/tamboti/modules/edit/tab-data.xml
branches/betterform/tamboti/themes/default/css/biblio.css
Added Paths:
-----------
branches/betterform/tamboti/modules/edit/code-tables/hint-codes.xml
branches/betterform/tamboti/modules/edit/code-tables/name-type-compact-codes.xml
branches/betterform/tamboti/modules/edit/full-3.4-instance.xml
Modified: branches/betterform/tamboti/modules/edit/body/00-compact-contents.xml
===================================================================
--- branches/betterform/tamboti/modules/edit/body/00-compact-contents.xml 2011-05-31 14:03:18 UTC (rev 14593)
+++ branches/betterform/tamboti/modules/edit/body/00-compact-contents.xml 2011-05-31 14:07:59 UTC (rev 14594)
@@ -1,33 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
<div xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xf="http://www.w3.org/2002/xforms" class="compact contents" tab-id="compact-c">
<div class="block-form">
<xf:group appearance="full" class="fieldset level-1" id="fieldset-subject">
- <div class="join">
- <span class="legend">Subjects</span>
- <span class="join-button">
- <xf:trigger>
- <xf:label>+</xf:label>
- <xf:action ev:event="DOMActivate">
- <xf:insert nodeset="mods:subject" at="index('subject-repeat')" position="after" origin="instance('compact-template')/mods:subject"/>
- </xf:action>
- </xf:trigger>
- </span>
- <span class="xforms-hint">
- <span class="xforms-hint-icon"/>
- <div class="xforms-hint-value">
- <p> A subject is a term or a phrase that represents the primary topic(s) on which a work is focused.
+ <div class="join">
+ <span class="legend">Subjects</span>
+ <span class="join-button">
+ <xf:trigger>
+ <xf:label>+</xf:label>
+ <xf:action ev:event="DOMActivate">
+ <xf:insert nodeset="mods:subject" at="index('subject-repeat')" position="after" origin="instance('compact-template')/mods:subject"/>
+ </xf:action>
+ </xf:trigger>
+ </span>
+ <span class="xforms-hint">
+ <span class="xforms-hint-icon"/>
+ <div class="xforms-hint-value">
+ <p> A subject is a term or a phrase that represents the primary topic(s) on which a work is focused.
Use at least one subject field in each record.
Enter as many specific terms as necessary to capture the subject content.
Be consistent in the formatting of subject terms. </p>
- <p> Values for subject indicate what content is found within or represented by the work, and typically answer such questions as who,
+ <p> Values for subject indicate what content is found within or represented by the work, and typically answer such questions as who,
what, where, and when. </p>
- <p> While it is allowed to place multiple values in a single Topic string, it is the preferred practice to split up subject terms
+ <p> While it is allowed to place multiple values in a single Topic string, it is the preferred practice to split up subject terms
into separate subfields, each of which answer the question of who, what, where, and when in relation to the resource being
catalogued. </p>
- <p> A Subject is here basically composed of a Topic, a Place reference and a Time reference.
+ <p> A Subject is here basically composed of a Topic, a Place reference and a Time reference.
All these fields are optional, that is, one can have a Topic without any Place or Time reference, and one can have a Place reference without a Topic or a Time reference.
To have a Time reference all on its own would be a little unusual, but if period labels are used, this might still be
acceptable.</p>
- <p>Topics can be divided into different kinds: "plain" Topics, Name topics and Work topics. "Plain" topics are references to
+ <p>Topics can be divided into different kinds: "plain" Topics, Name topics and Work topics. "Plain" topics are references to
abstract or concrete entities that are not persons or organisations or works created by these.
Topics of this kind are "beauty" or "bicycle", "democracy" or "doors".
No distinction is made between abstract or concrete topics.
@@ -35,392 +36,410 @@
These are treated like the names of authors and editors.
If a work of literature or art, or any other creation, serves as topic, it is treated as a title.
These three subtypes address different aspects of the "what" of a subject. </p>
- <p> The "where" of a subject can be expressed in a number of ways. "Place" simply contains the name of the place. </p>
- <p> "Time", the answer to "when," can be encoded in a number of different ways.
+ <p> The "where" of a subject can be expressed in a number of ways. "Place" simply contains the name of the place. </p>
+ <p> "Time", the answer to "when," can be encoded in a number of different ways.
The recommendation is to use the w3cdtf encoding. According to this encoding, dates are formatted in the following way: Year: YYYY
(e.g. 1997); Year and month: YYYY-MM (e.g. 1997-07); Complete date: YYYY-MM-DD (e.g. 1997-07-16). </p>
- <p> Date ranges are indicated using "start" and "end" in Point. If a date range is open to one side, leave that side blank. If the
+ <p> Date ranges are indicated using "start" and "end" in Point. If a date range is open to one side, leave that side blank. If the
date is completely unknown, leave the Date field blank. </p>
- <p> In Time one can also use period designations, such as "the Middle Ages" and "Industrialisation," with the dangers of differing construals that this implies.
+ <p> In Time one can also use period designations, such as "the Middle Ages" and "Industrialisation," with the dangers of differing construals that this implies.
If you enter a time designation which uses a designaitn of this type, choose "text" in type.</p>
- <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
- </div>
- </span>
- </div>
+ <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
+ </div>
+ </span>
+ </div>
<!--subject repeat begins-->
- <xf:repeat nodeset="instance('save-data')/mods:subject" id="subject-repeat">
+ <xf:repeat nodeset="instance('save-data')/mods:subject" id="subject-repeat">
<!--subject/topic begins-->
- <xf:group appearance="full" class="fieldset level-2" id="fieldset-topic" ref=".[mods:topic]">
- <div class="join">
- <span class="legend">Topic</span>
- <span class="join-button">
- <xf:trigger>
- <xf:label>+</xf:label>
- <xf:action ev:event="DOMActivate">
- <xf:insert nodeset="mods:topic" at="index('topic-repeat')" position="after" origin="instance('compact-template')/mods:subject/mods:topic"/>
- </xf:action>
- </xf:trigger>
- </span>
- <span class="xforms-hint">
- <span class="xforms-hint-icon"/>
- <div class="xforms-hint-value">
- <p> Use Topic to indicate any primary subjects that do not fit into the Place, Time, Works as Topics, or Persons and Institutions as Topics subfields.
+ <xf:group appearance="full" class="fieldset level-2" id="fieldset-topic" ref=".[mods:topic]">
+ <div class="join">
+ <span class="legend">Topic</span>
+ <span class="join-button">
+ <xf:trigger>
+ <xf:label>+</xf:label>
+ <xf:action ev:event="DOMActivate">
+ <xf:insert nodeset="mods:topic" at="index('topic-repeat')" position="after" origin="instance('compact-template')/mods:subject/mods:topic"/>
+ </xf:action>
+ </xf:trigger>
+ </span>
+ <span class="xforms-hint">
+ <span class="xforms-hint-icon"/>
+ <div class="xforms-hint-value">
+ <p> Use Topic to indicate any primary subjects that do not fit into the Place, Time, Works as Topics, or Persons and Institutions as Topics subfields.
In general, abstract nouns should be used.
Add as many Topic fields as you need in order to analyse your topic.
The relation between the different fields is not specified, but one may start with more abstract terms and move to more specific terms, within the same Subject.</p>
- <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
- </div>
- </span>
+ <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
</div>
+ </span>
+ </div>
<!--subject/topic repeat begins-->
- <xf:repeat nodeset="./mods:topic" id="topic-repeat">
+ <xf:repeat nodeset="./mods:topic" id="topic-repeat">
<!--subject/topic input begins-->
- <xf:group appearance="full" ref=".">
- <xf:input ref="." class="text_50">
- <xf:label>Topic</xf:label>
- </xf:input>
- </xf:group>
+ <xf:group appearance="full" ref="." class="hide-label">
+ <xf:input ref="." class="text_50">
+ <xf:label>Topic</xf:label>
+ </xf:input>
+ </xf:group>
<!--subject/topic input ends-->
- </xf:repeat>
+ </xf:repeat>
<!--subject/topic repeat ends-->
-
- </xf:group>
+ </xf:group>
<!--subject/topic ends-->
<!--subject/geographic begins-->
- <xf:group appearance="full" class="fieldset level-2" id="fieldset-geographic" ref=".[mods:geographic]">
- <div class="join">
- <span class="legend">Place</span>
- <span class="join-button">
- <xf:trigger>
- <xf:label>+</xf:label>
- <xf:action ev:event="DOMActivate">
- <xf:insert nodeset="mods:geographic" at="index('geographic-repeat')" position="after" origin="instance('new-instance')/mods:geographic"/>
- </xf:action>
- </xf:trigger>
- </span>
- <span class="xforms-hint">
- <span class="xforms-hint-icon"/>
- <div class="xforms-hint-value">
- <p>Use here standard names for geographical places.</p>
+ <xf:group appearance="full" class="fieldset level-2" id="fieldset-geographic" ref=".[mods:geographic]">
+ <div class="join">
+ <span class="legend">Place</span>
+ <span class="join-button">
+ <xf:trigger>
+ <xf:label>+</xf:label>
+ <xf:action ev:event="DOMActivate">
+ <xf:insert nodeset="mods:geographic" at="index('geographic-repeat')" position="after" origin="instance('new-instance')/mods:geographic"/>
+ </xf:action>
+ </xf:trigger>
+ </span>
+ <span class="xforms-hint">
+ <span class="xforms-hint-icon"/>
+ <div class="xforms-hint-value">
+ <p>Use here standard names for geographical places.</p>
Add as many Place fields as you need.
<p>The relation between the different fields is not specified, but one may start with more abstract terms and move to more specific terms, within the same Subject.</p>
- <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
- </div>
- </span>
+ <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
</div>
+ </span>
+ </div>
<!--subject/geographic repeat begins-->
- <xf:repeat nodeset="./mods:geographic" id="geographic-repeat">
+ <xf:repeat nodeset="./mods:geographic" id="geographic-repeat">
<!--subject/geographic input begins-->
- <xf:group appearance="full" ref=".">
- <xf:input ref="." class="text_50">
- <xf:label>Geographic</xf:label>
- </xf:input>
- </xf:group>
+ <xf:group appearance="full" ref="." class="hide-label">
+ <xf:input ref="." class="text_50">
+ <xf:label>Geographic</xf:label>
+ </xf:input>
+ </xf:group>
<!--subject/geographic input ends-->
- </xf:repeat>
+ </xf:repeat>
<!--subject/geographic repeat ends-->
-
- </xf:group>
+ </xf:group>
<!--subject/geographic ends-->
<!--subject/temporal begins-->
- <xf:group appearance="full" class="fieldset level-2" id="fieldset-temporal" ref=".[mods:temporal]">
- <div class="join">
- <span class="legend">Time</span>
- <span class="join-button">
- <xf:trigger>
- <xf:label>+</xf:label>
- <xf:action ev:event="DOMActivate">
- <xf:insert nodeset="mods:temporal" at="index('temporal-repeat')" position="after" origin="instance('compact-template')/mods:subject/mods:temporal"/>
- </xf:action>
- </xf:trigger>
- </span>
- <span class="xforms-hint">
- <span class="xforms-hint-icon"/>
- <div class="xforms-hint-value">
- <p> Use Time for chronological subject terms or temporal coverage.
+ <xf:group appearance="full" class="fieldset level-2" id="fieldset-temporal" ref=".[mods:temporal]">
+ <div class="join">
+ <span class="legend">Time</span>
+ <span class="join-button">
+ <xf:trigger>
+ <xf:label>+</xf:label>
+ <xf:action ev:event="DOMActivate">
+ <xf:insert nodeset="mods:temporal" at="index('temporal-repeat')" position="after" origin="instance('compact-template')/mods:subject/mods:temporal"/>
+ </xf:action>
+ </xf:trigger>
+ </span>
+ <span class="xforms-hint">
+ <span class="xforms-hint-icon"/>
+ <div class="xforms-hint-value">
+ <p> Use Time for chronological subject terms or temporal coverage.
Time may be expressed as a subject term (e.g. "Middle Ages") or as a structured date (e.g. "2001-09-11"). In the first case, choose "text" in Type; otherwise choose "YYY-MM-DD" and enter the time you wish to refer to as precisely as possible.</p>
- <p> Point is used to note whether the date noted is a start point or an end point when using a structured date.
+ <p> Point is used to note whether the date noted is a start point or an end point when using a structured date.
If no point is specified, date is assumed to be a single date. </p>
- <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
- </div>
- </span>
+ <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
</div>
+ </span>
+ </div>
<!--subject/temporal repeat begins-->
- <xf:repeat nodeset="./mods:temporal" id="temporal-repeat">
+ <xf:repeat nodeset="./mods:temporal" id="temporal-repeat">
<!--subject/temporal input begins-->
- <xf:group appearance="full" ref=".[@encoding]">
- <xf:select1 ref="./@encoding">
- <xf:label>Encoding</xf:label>
- <xf:itemset nodeset="instance('code-tables')/code-table[code-table-name='date-encoding-short-code']/items/item">
- <xf:label ref="label"/>
- <xf:value ref="value"/>
- </xf:itemset>
- </xf:select1>
- </xf:group>
- <xf:group appearance="full" ref=".[@point]">
- <xf:select1 ref="./@point">
- <xf:label>Point</xf:label>
- <xf:itemset nodeset="instance('code-tables')/code-table[code-table-name='date-point-code']/items/item">
- <xf:label ref="label"/>
- <xf:value ref="value"/>
- </xf:itemset>
- </xf:select1>
- </xf:group>
- <xf:group appearance="full" ref=".">
- <xf:input ref="." class="text_50">
- <xf:label>Date</xf:label>
- </xf:input>
- </xf:group>
+ <xf:group appearance="full" ref=".[@encoding]">
+ <xf:select1 ref="./@encoding">
+ <xf:label>Encoding</xf:label>
+ <xf:itemset nodeset="instance('code-tables')/code-table[code-table-name='date-encoding-short-code']/items/item">
+ <xf:label ref="label"/>
+ <xf:value ref="value"/>
+ </xf:itemset>
+ </xf:select1>
+ </xf:group>
+ <xf:group appearance="full" ref=".[@point]">
+ <xf:select1 ref="./@point">
+ <xf:label>Point</xf:label>
+ <xf:itemset nodeset="instance('code-tables')/code-table[code-table-name='date-point-code']/items/item">
+ <xf:label ref="label"/>
+ <xf:value ref="value"/>
+ </xf:itemset>
+ </xf:select1>
+ </xf:group>
+ <xf:group appearance="full" ref="." class="hide-label">
+ <xf:input ref="." class="text_50">
+ <xf:label>Date</xf:label>
+ </xf:input>
+ </xf:group>
<!--subject/temporal input ends-->
- </xf:repeat>
+ </xf:repeat>
<!--subject/temporal repeat ends-->
-
- </xf:group>
+ </xf:group>
<!--subject/temporal ends-->
<!--subject/titleInfo begins-->
- <xf:group appearance="full" class="fieldset level-2" id="fieldset-subject-titleInfo">
+ <xf:group appearance="full" class="fieldset level-2" id="fieldset-subject-titleInfo">
<!--subject/titleInfo repeat begins-->
- <div class="join">
- <span class="legend">Works as Topic</span>
- <span class="join-button">
- <xf:trigger>
- <xf:label>+</xf:label>
- <xf:action ev:event="DOMActivate">
- <xf:insert nodeset="mods:titleInfo" at="index('subject-titleinfo-repeat')" position="after" origin="instance('compact-template')/mods:subject/mods:titleInfo"/>
- </xf:action>
- </xf:trigger>
- </span>
+ <div class="join">
+ <span class="legend">Works as Topic</span>
+ <span class="join-button">
+ <xf:trigger>
+ <xf:label>+</xf:label>
+ <xf:action ev:event="DOMActivate">
+ <xf:insert nodeset="mods:titleInfo" at="index('subject-titleinfo-repeat')" position="after" origin="instance('compact-template')/mods:subject/mods:titleInfo"/>
+ </xf:action>
+ </xf:trigger>
+ </span>
+ <span class="xforms-hint">
+ <span class="xforms-hint-icon"/>
+ <div class="xforms-hint-value">
+ <p> Enter here the title of the book or the work of art that serves as topic for the resource you are cataloguing.
+ If the title divides into a main title and a subtitle, enter each part in its separate field. If the subtitle divides into several parts, separate the parts with a semicolon. </p>
+ <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
+ </div>
+ </span>
+ </div>
+ <xf:repeat nodeset="./mods:titleInfo" id="subject-titleinfo-repeat">
+ <!--titleInfo input begins-->
+ <xf:group appearance="full" ref=".[string-length(@type) = 0]">
+ <xf:group appearance="full">
+ <xf:input ref="./mods:nonSort" class="text_10">
+ <xf:label>Non Sort</xf:label>
+ </xf:input>
+ </xf:group>
+ <xf:group appearance="full">
+ <xf:input ref="./mods:title" class="text_150">
+ <xf:label>Title</xf:label>
+ </xf:input>
+ </xf:group>
+ <xf:group appearance="full">
+ <xf:input ref="./mods:subTitle" class="text_150">
+ <xf:label>Subtitle</xf:label>
+ </xf:input>
+ </xf:group>
+ </xf:group>
+ <!--<xf:group appearance="full" ref=".[@type='translated' and not(@lang)]">
+ <xf:group appearance="full">
+ <xf:input ref="./mods:nonSort" class="text_10">
+ <xf:label>Transliterated Non Sort</xf:label>
+ </xf:input>
+ </xf:group>
+ <xf:group appearance="full">
+ <xf:input ref="./mods:title" class="text_150">
+ <xf:label>Transliterated Title </xf:label>
+ </xf:input>
+ </xf:group>
+ <xf:group appearance="full">
+ <xf:input ref="./mods:subTitle" class="text_150">
+ <xf:label>Transliterated Subtitle </xf:label>
+ </xf:input>
+ </xf:group>
+ </xf:group>-->
+ <!--<xf:group appearance="full" ref=".[@type='translated' and (@lang)]">
+ <xf:group appearance="full">
+ <xf:input ref="./mods:nonSort" class="text_10">
+ <xf:label>Translated Non Sort</xf:label>
+ </xf:input>
+ </xf:group>
+ <xf:group appearance="full">
+ <xf:input ref="./mods:title" class="text_150">
+ <xf:label>Translated Title</xf:label>
+ </xf:input>
+ </xf:group>
+ <xf:group appearance="full">
+ <xf:input ref="./mods:subTitle" class="text_150">
+ <xf:label>Translated Subtitle</xf:label>
+ </xf:input>
+ </xf:group>
+ </xf:group>-->
+ </xf:repeat>
+ <!--title repeat ends-->
+ </xf:group>
+ <!--subject/titleInfo ends-->
+ <!--subject/name begins-->
+ <xf:group appearance="full" class="fieldset level-2" id="fieldset-subject-name">
+ <div class="join extra-wide">
+ <span class="legend">Persons and Institutions as Topics</span>
+ <span class="join-button wide">
+ <xf:trigger>
+ <xf:label>+</xf:label>
+ <xf:action ev:event="DOMActivate">
+ <xf:insert nodeset="mods:name" at="index('subject-name-repeat')" position="after" origin="instance('compact-template')/mods:subject/mods:name[1]"/>
+ </xf:action>
+ </xf:trigger>
+ </span>
+ <span class="xforms-hint">
+ <span class="xforms-hint-icon"/>
+ <div class="xforms-hint-value">
+ <p> In Persons and Institutions as Topics, catalogue the names of each person or institution that serves as topic of the
+ resource you are calaloguing. </p>
+ <p>Add as many Persons and Institutions as Topics as is necessary. Click on "P+" to add a personal name and on "I+" to add the name of an institution.</p>
+ <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
+ </div>
+ </span>
+ </div>
+ <!--name repeat begins-->
+ <xf:repeat nodeset="./mods:name" id="subject-name-repeat">
+ <!--name input begins-->
+ <!--<xf:group appearance="full" class="hide-label">
+ <xf:select1 ref="./@type">
+ <xf:label>Type of Name</xf:label>
+ <xf:itemset nodeset="instance('code-tables')/code-table[code-table-name='name-type-compact-code']/items/item">
+ <xf:label ref="label"/>
+ <xf:value ref="value"/>
+ </xf:itemset>
+ </xf:select1>
+ </xf:group>-->
+ <!--name input ends-->
+ <!--namePart begins-->
+ <xf:group appearance="full" class="fieldset level-3" id="fieldset-subject-namePart">
+ <xf:group appearance="full" class="hide-label">
+ <xf:select1 ref="./@type">
+ <xf:label>Type of Name</xf:label>
+ <xf:itemset nodeset="instance('code-tables')/code-table[code-table-name='name-type-compact-code']/items/item">
+ <xf:label ref="label"/>
+ <xf:value ref="value"/>
+ </xf:itemset>
+ </xf:select1>
+ </xf:group>
+ <!--<div class="join">
+ <span class="legend">Person as Topic</span>
<span class="xforms-hint">
<span class="xforms-hint-icon"/>
<div class="xforms-hint-value">
- <p> Enter here the title of the book or the work of art that serves as topic for the resource you are cataloguing.
- If the title divides into a main title and a subtitle, enter each part in its separate field. If the subtitle divides into several parts, separate the parts with a semicolon. </p>
+ <p> Analyse each name into separate name parts, e.g. Given Name and Family Name.</p>
+ <p> If this is not possible, choose "(none selected)" and enter the whole name in the field in question.</p>
+ <p> If a given or family name consists of several parts, enter all parts of the same type in the same field.</p>
<p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
</div>
</span>
- </div>
- <xf:repeat class="fieldset level-2" nodeset="./mods:titleInfo" id="subject-titleinfo-repeat">
- <div class="join">
- <span class="legend">Work as Topic</span>
- <span class="xforms-hint">
- <span class="xforms-hint-icon"/>
- <div class="xforms-hint-value">
- <p> Enter here the title of the book or the work of art that serves as topic for the resource you are cataloguing.
- If the title divides into a main title and a subtitle, enter each part in its separate field. If the subtitle divides into several parts, separate the parts with a semicolon. </p>
- <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
- </div>
- </span>
- </div>
- <!--titleInfo input begins-->
+ </div>-->
+ <!--namePart repeat begins-->
+ <xf:repeat nodeset="./mods:namePart" id="subject-namePart-repeat">
+ <xf:group appearance="full">
<xf:group appearance="full">
- <xf:input ref="./mods:nonSort" class="text_10">
- <xf:label>Non Sort</xf:label>
- </xf:input>
+ <xf:select1 ref="./@type" class="right">
+ <xf:label>Type</xf:label>
+ <xf:itemset nodeset="instance('code-tables')/code-table[code-table-name='name-part-type-compact-code']/items/item">
+ <xf:label ref="label"/>
+ <xf:value ref="value"/>
+ </xf:itemset>
+ </xf:select1>
</xf:group>
<xf:group appearance="full">
- <xf:input ref="./mods:title" class="text_150">
- <xf:label>Title</xf:label>
+ <xf:input ref="." class="text_100 hide-label">
+ <xf:label>Name Part</xf:label>
</xf:input>
</xf:group>
+ </xf:group>
+ <!--<xf:group appearance="full" ref=".[@script='Latn']">
<xf:group appearance="full">
- <xf:input ref="./mods:subTitle" class="text_150">
- <xf:label>Subtitle</xf:label>
+ <xf:select1 ref="./@type" class="right">
+ <xf:label> Type of Transliterated Name Part </xf:label>
+ <xf:itemset nodeset="instance('code-tables')/code-table[code-table-name='name-part-type-compact-code']/items/item">
+ <xf:label ref="label"/>
+ <xf:value ref="value"/>
+ </xf:itemset>
+ </xf:select1>
+ </xf:group>
+ <xf:group appearance="full">
+ <xf:input ref="." class="text_100">
+ <xf:label>Transliterated Name Part</xf:label>
</xf:input>
</xf:group>
-
+ </xf:group>-->
+ <!--namePart input ends-->
</xf:repeat>
-
- <!--title repeat ends-->
- </xf:group>
- <!--subject/titleInfo ends-->
- <!--subject/name begins-->
- <xf:group appearance="full" class="fieldet level-2" id="fieldset-subject-name">
- <div class="join extra-wide">
- <span class="legend">Persons and Institutions as Topics</span>
- <span class="join-button wide">
- <xf:trigger>
- <xf:label>P+</xf:label>
- <xf:action ev:event="DOMActivate">
- <xf:insert nodeset="mods:name" at="index('subject-name-person-repeat')" position="after" origin="instance('compact-template')/mods:subject/mods:name[1]"/>
- </xf:action>
- </xf:trigger>
- <xf:trigger>
- <xf:label>I+</xf:label>
- <xf:action ev:event="DOMActivate">
- <xf:insert nodeset="mods:name" at="index('subject-name-institution-repeat')" position="after" origin="instance('compact-template')/mods:subject/mods:name[2]"/>
- </xf:action>
- </xf:trigger>
- </span>
- <span class="xforms-hint">
- <span class="xforms-hint-icon"/>
- <div class="xforms-hint-value">
- <p> In Persons and Institutions as Topics, catalogue the names of each person or institution that serves as topic of the
- resource you are calaloguing. </p>
- <p>Add as many Persons and Institutions as Topics as is necessary. Click on "P+" to add a personal name and on "I+" to add the name of an institution.</p>
- <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
- </div>
- </span>
- </div>
- <!--name repeat begins-->
- <xf:repeat nodeset="./mods:name" id="subject-name-person-repeat">
- <!--name input begins-->
- <!--name input ends-->
- <!--namePart begins-->
- <xf:group appearance="full" class="fieldset level-2" id="fieldset-subject-namePart-personal" ref=".[@type = 'personal']">
- <div class="join">
- <span class="legend">Person as Topic</span>
- <span class="xforms-hint">
- <span class="xforms-hint-icon"/>
- <div class="xforms-hint-value">
- <p> Analyse each name into separate name parts, e.g. Given Name and Family Name.</p>
- <p> If this is not possible, choose "(none selected)" and enter the whole name in the field in question.</p>
- <p> If a given or family name consists of several parts, enter all parts of the same type in the same field.</p>
- <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
- </div>
- </span>
- </div>
- <!--namePart repeat begins-->
- <xf:repeat nodeset="./mods:namePart" id="subject-namePart-repeat" class="display-none">
- <xf:select1 ref="./@type" class="right">
- <xf:label>Type of Name Part</xf:label>
- <xf:itemset nodeset="instance('code-tables')/code-table[code-table-name='name-part-type-compact-code']/items/item">
- <xf:label ref="label"/>
- <xf:value ref="value"/>
- </xf:itemset>
- </xf:select1>
- <xf:input ref="." class="text_100">
- <xf:label>Name Part</xf:label>
- </xf:input>
- <!--namePart input ends-->
- </xf:repeat>
- <!--namePart repeat ends-->
- </xf:group>
- </xf:repeat>
- <xf:repeat nodeset="./mods:name" id="subject-name-institution-repeat">
- <xf:group appearance="full" class="fieldset level-2" id="fieldset-subject-namePart-corporate" ref=".[@type = 'corporate']">
- <div class="join">
- <span class="legend">Institution as Topic</span>
- <span class="xforms-hint">
- <span class="xforms-hint-icon"/>
- <div class="xforms-hint-value">
- <p> Enter the standard name of the institution.</p>
- <p> If the name can be divided, write the more general name first and the more specific name last.</p>
- <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
- </div>
- </span>
- </div>
- <!--namePart repeat begins-->
- <xf:repeat nodeset="./mods:namePart" id="subject-namePart-repeat" class="display-none">
- <xf:select1 ref="./@type" class="right">
- <xf:label>Type of Name Part</xf:label>
- <xf:itemset nodeset="instance('code-tables')/code-table[code-table-name='name-part-type-compact-code']/items/item">
- <xf:label ref="label"/>
- <xf:value ref="value"/>
- </xf:itemset>
- </xf:select1>
- <xf:input ref="." class="text_100">
- <xf:label>Name Part</xf:label>
- </xf:input>
- <!--namePart input ends-->
- </xf:repeat>
- <!--namePart repeat ends-->
-
- </xf:group>
- <!--namePart ends-->
- <!--role begins-->
- </xf:repeat>
+ <!--namePart repeat ends-->
+ </xf:group>
+ </xf:repeat>
<!--name repeat ends-->
-
- </xf:group>
+ </xf:group>
<!--subject/name ends-->
<!--subject delete begins-->
- </xf:repeat>
+ </xf:repeat>
<!--subject repeat ends-->
</xf:group>
<!--subject ends-->
- <xf:group appearance="full" class="fieldset level-2" id="fieldset-note">
- <div class="join">
- <span class="legend">
- <span class="legend">Notes</span>
- </span>
- <span class="join-button wide">
- <xf:trigger>
- <xf:label>+</xf:label>
- <xf:action ev:event="DOMActivate">
- <xf:insert nodeset="mods:note" at="index('note-repeat')" position="after" origin="instance('compact-template')/mods:note"/>
- </xf:action>
- </xf:trigger>
- </span>
- <span class="xforms-hint">
- <span class="xforms-hint-icon"/>
- <div class="xforms-hint-value">
- <p> General information relating to a resource. </p>
- <p> Note should be used only for information that cannot be encoded in another, more specific, ways. </p>
- <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
- </div>
- </span>
- </div>
+ <xf:group appearance="full" class="fieldset level-2" id="fieldset-note">
+ <div class="join">
+ <span class="legend">
+ <span class="legend">Notes</span>
+ </span>
+ <span class="join-button wide">
+ <xf:trigger>
+ <xf:label>+</xf:label>
+ <xf:action ev:event="DOMActivate">
+ <xf:insert nodeset="mods:note" at="index('note-repeat')" position="after" origin="instance('compact-template')/mods:note"/>
+ </xf:action>
+ </xf:trigger>
+ </span>
+ <span class="xforms-hint">
+ <span class="xforms-hint-icon"/>
+ <div class="xforms-hint-value">
+ <p> General information relating to a resource. </p>
+ <p> Note should be used only for information that cannot be encoded in another, more specific, ways. </p>
+ <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
+ </div>
+ </span>
+ </div>
<!--note repeat begins-->
- <xf:repeat nodeset="./mods:note" id="note-repeat">
- <xf:group appearance="full" ref=".[count(../mods:note) > 1]">
- <br/>
- </xf:group>
- <xf:group appearance="full">
- <xf:select1 ref="./@type" selection="open" class="type">
- <xf:label>Type</xf:label>
- <xf:hint>
- <p>Hint</p>
- </xf:hint>
- <xf:itemset nodeset="instance('code-tables')/code-table[code-table-name='note-type-code']/items/item">
- <xf:label ref="label"/>
- <xf:value ref="value"/>
- </xf:itemset>
- </xf:select1>
- </xf:group>
- <xf:group appearance="full">
- <xf:textarea ref="." class="textarea" mediatype="dojo">
- <xf:label>Note</xf:label>
- </xf:textarea>
- </xf:group>
- </xf:repeat>
+ <xf:repeat nodeset="./mods:note" id="note-repeat">
+ <xf:group appearance="full" ref=".[count(../mods:note) > 1]">
+ <br/>
+ </xf:group>
+ <xf:group appearance="full">
+ <xf:select1 ref="./@type" selection="open" class="margin-plus-2-25">
+ <xf:label>Type</xf:label>
+ <xf:hint>
+ <p>Hint</p>
+ </xf:hint>
+ <xf:itemset nodeset="instance('code-tables')/code-table[code-table-name='note-type-code']/items/item">
+ <xf:label ref="label"/>
+ <xf:value ref="value"/>
+ </xf:itemset>
+ </xf:select1>
+ </xf:group>
+ <xf:group appearance="full" class="hide-label margin-plus-2-25">
+ <xf:textarea ref="." class="textarea">
+ <xf:label>Note</xf:label>
+ </xf:textarea>
+ </xf:group>
+ </xf:repeat>
<!--note repeat ends-->
-
</xf:group>
<!--note ends-->
- <xf:group appearance="full" class="fieldset level-2" id="fieldset-abstract">
- <div class="join">
- <span class="legend">
- <span class="legend">Abstracts</span>
- </span>
- <span class="join-button wide">
- <xf:trigger>
- <xf:label>+</xf:label>
- <xf:action ev:event="DOMActivate">
- <xf:insert nodeset="mods:abstract" at="index('abstract-repeat')" position="after" origin="instance('compact-template')/mods:abstract"/>
- </xf:action>
- </xf:trigger>
- </span>
- <span class="xforms-hint">
- <span class="xforms-hint-icon"/>
- <div class="xforms-hint-value">
- <p> Abstract is used to record a succinct summary of some aspect of the content of the resource. </p>
- <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
- </div>
- </span>
- </div>
+ <xf:group appearance="full" class="fieldset level-2" id="fieldset-abstract">
+ <div class="join">
+ <span class="legend">
+ <span class="legend">Abstracts</span>
+ </span>
+ <span class="join-button wide">
+ <xf:trigger>
+ <xf:label>+</xf:label>
+ <xf:action ev:event="DOMActivate">
+ <xf:insert nodeset="mods:abstract" at="index('abstract-repeat')" position="after" origin="instance('compact-template')/mods:abstract"/>
+ </xf:action>
+ </xf:trigger>
+ </span>
+ <span class="xforms-hint">
+ <span class="xforms-hint-icon"/>
+ <div class="xforms-hint-value">
+ <p> Abstract is used to record a succinct summary of some aspect of the content of the resource. </p>
+ <p> More input options can be accessed by clicking the Subjects tab on Context Description Forms.</p>
+ </div>
+ </span>
+ </div>
<!--abstract repeat begins-->
- <xf:repeat nodeset="./mods:abstract" id="abstract-repeat">
- <xf:group appearance="full" ref=".[count(../mods:abstract) > 1]">
- <br/>
- </xf:group>
- <xf:group appearance="full">
- <xf:textarea ref="." class="textarea" mediatype="dojo">
- <xf:label>Abstract</xf:label>
- </xf:textarea>
- </xf:group>
- </xf:repeat>
+ <xf:repeat nodeset="./mods:abstract" id="abstract-repeat">
+ <xf:group appearance="full" ref=".[count(../mods:abstract) > 1]">
+ <br/>
+ </xf:group>
+ <xf:group appearance="full">
+ <xf:textarea ref="." class="textarea hide-label margin-plus-2-25">
+ <xf:label>Abstract</xf:label>
+ </xf:textarea>
+ </xf:group>
+ </xf:repeat>
<!--abstract repeat ends-->
-
</xf:group>
<!--abstract ends-->
</div>
Modified: branches/betterform/tamboti/modules/edit/body/00-compact-standalone.xml
===================================================================
--- branches/betterform/tamboti/modules/edit/body/00-compact-standalone.xml 2011-05-31 14:03:18 UTC (rev 14593)
+++ branches/b...
[truncated message content] |
|
From: <jen...@us...> - 2011-05-31 14:03:29
|
Revision: 14593
http://exist.svn.sourceforge.net/exist/?rev=14593&view=rev
Author: jenspetersen
Date: 2011-05-31 14:03:18 +0000 (Tue, 31 May 2011)
Log Message:
-----------
[tamboti-betterform] Deleting unused file.
Removed Paths:
-------------
branches/betterform/tamboti/modules/edit/tamboti.css
Deleted: branches/betterform/tamboti/modules/edit/tamboti.css
===================================================================
--- branches/betterform/tamboti/modules/edit/tamboti.css 2011-05-31 12:51:44 UTC (rev 14592)
+++ branches/betterform/tamboti/modules/edit/tamboti.css 2011-05-31 14:03:18 UTC (rev 14593)
@@ -1,8 +0,0 @@
-<css>
-@namespace xf url(http://www.w3.org/2002/xforms);
-
-#page-head {
- height: 9em;
- }
-
-</css>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <flo...@us...> - 2011-05-31 12:51:51
|
Revision: 14592
http://exist.svn.sourceforge.net/exist/?rev=14592&view=rev
Author: florentgeorges
Date: 2011-05-31 12:51:44 +0000 (Tue, 31 May 2011)
Log Message:
-----------
Upgraded the EXPath HTTP Client Java library to the first official release.
Added Paths:
-----------
trunk/eXist/extensions/expath/lib/expath-http-client-java-0.1.0.jar
Removed Paths:
-------------
trunk/eXist/extensions/expath/lib/expath-http-client-java-20100109.jar
Added: trunk/eXist/extensions/expath/lib/expath-http-client-java-0.1.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/eXist/extensions/expath/lib/expath-http-client-java-0.1.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/eXist/extensions/expath/lib/expath-http-client-java-20100109.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <del...@us...> - 2011-05-31 09:48:24
|
Revision: 14591
http://exist.svn.sourceforge.net/exist/?rev=14591&view=rev
Author: deliriumsky
Date: 2011-05-31 09:48:14 +0000 (Tue, 31 May 2011)
Log Message:
-----------
Merged trunk in
Modified Paths:
--------------
branches/adam/eXist-acl/build/scripts/static-docs.xml
branches/adam/eXist-acl/extensions/expath/src/org/expath/httpclient/model/exist/EXistResult.java
branches/adam/eXist-acl/src/org/exist/config/Configurator.java
branches/adam/eXist-acl/src/org/exist/http/RESTServer.java
branches/adam/eXist-acl/src/org/exist/memtree/ElementImpl.java
branches/adam/eXist-acl/src/org/exist/storage/NativeBroker.java
branches/adam/eXist-acl/src/org/exist/storage/ProcessMonitor.java
branches/adam/eXist-acl/src/org/exist/xqj/Marshaller.java
branches/adam/eXist-acl/src/org/exist/xquery/parser/XQuery.g
branches/adam/eXist-acl/src/org/exist/xquery/parser/XQueryParser.java
branches/adam/eXist-acl/src/org/exist/xquery/update/Modification.java
branches/adam/eXist-acl/webapp/download.xml
branches/adam/eXist-acl/webapp/functions/controller.xql
branches/adam/eXist-acl/webapp/quickstart.xml
branches/adam/eXist-acl/webapp/repo/controller.xql
branches/adam/eXist-acl/webapp/sidebar.xml
branches/adam/eXist-acl/webapp/testing/controller.xql
branches/adam/eXist-acl/webapp/urlrewrite/style.xql
branches/adam/eXist-acl/webapp/xforms/controller.xql
branches/adam/eXist-acl/webapp/xforms/examples.xml
branches/adam/eXist-acl/webapp/xforms/shakespeare.xml
branches/adam/eXist-acl/webapp/xforms/xforms.xml
branches/adam/eXist-acl/webapp/xforms/xsltforms/xsltforms.js
branches/adam/eXist-acl/webapp/xforms/xsltforms/xsltforms.xsl
branches/adam/eXist-acl/webapp/xquery/biblio.xml
branches/adam/eXist-acl/webapp/xquery/controller.xql
Added Paths:
-----------
branches/adam/eXist-acl/webapp/resources/existsolutions.png
Removed Paths:
-------------
branches/adam/eXist-acl/webapp/repo/sidebar.xml
branches/adam/eXist-acl/webapp/testing/sidebar.xml
branches/adam/eXist-acl/webapp/xforms/sidebar.xml
Property Changed:
----------------
branches/adam/eXist-acl/
branches/adam/eXist-acl/extensions/modules/src/org/exist/xquery/modules/jfreechart/JFreeCharting.java
branches/adam/eXist-acl/lib/optional/axis-schema-1.3.jar
branches/adam/eXist-acl/lib/optional/jaxrpc-1.1.jar
branches/adam/eXist-acl/lib/optional/saaj-1.2.jar
branches/adam/eXist-acl/lib/user/activation-1.1.1.jar
branches/adam/eXist-acl/nbbuild.xml
branches/adam/eXist-acl/src/org/exist/dom/
branches/adam/eXist-acl/src/org/exist/indexing/
branches/adam/eXist-acl/src/org/exist/numbering/
branches/adam/eXist-acl/src/org/exist/storage/
branches/adam/eXist-acl/src/org/exist/storage/ConsistencyCheckTask.java
branches/adam/eXist-acl/src/org/exist/storage/DBBroker.java
branches/adam/eXist-acl/src/org/exist/storage/NativeBroker.java
branches/adam/eXist-acl/src/org/exist/storage/StorageAddress.java
branches/adam/eXist-acl/src/org/exist/storage/btree/
branches/adam/eXist-acl/src/org/exist/storage/dom/
branches/adam/eXist-acl/src/org/exist/storage/index/
branches/adam/eXist-acl/src/org/exist/storage/report/
branches/adam/eXist-acl/src/org/exist/storage/txn/
branches/adam/eXist-acl/src/org/exist/xquery/LocationStep.java
branches/adam/eXist-acl/src/org/exist/xquery/pragmas/Optimize.java
branches/adam/eXist-acl/test/src/org/exist/dom/BasicNodeSetTest.java
branches/adam/eXist-acl/test/src/org/exist/fulltext/FTIndexTest.java
branches/adam/eXist-acl/test/src/org/exist/xquery/OptimizerTest.java
branches/adam/eXist-acl/tools/Solaris/
Property changes on: branches/adam/eXist-acl
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/jmfg/res64-eXist:12887-13224
/trunk/eXist:14123-14501
/trunk/eXist/nbproject:8007-14504
+ /branches/jmfg/res64-eXist:12887-13224
/trunk/eXist:14123-14590
/trunk/eXist/nbproject:8007-14504
Modified: branches/adam/eXist-acl/build/scripts/static-docs.xml
===================================================================
--- branches/adam/eXist-acl/build/scripts/static-docs.xml 2011-05-30 21:35:25 UTC (rev 14590)
+++ branches/adam/eXist-acl/build/scripts/static-docs.xml 2011-05-31 09:48:14 UTC (rev 14591)
@@ -144,7 +144,6 @@
<get src="${url}/building.xml" dest="${build.docs.html}/building.html"/>
<get src="${url}/client.xml" dest="${build.docs.html}/client.html"/>
<get src="${url}/cluster.xml" dest="${build.docs.html}/cluster.html"/>
- <get src="${url}/configuration.xml" dest="${build.docs.html}/configuration.html"/>
<get src="${url}/config-cache.xml" dest="${build.docs.html}/config-cache.html"/>
<get src="${url}/config-compression.xml" dest="${build.docs.html}/config-compression.html"/>
<get src="${url}/config-context.xml" dest="${build.docs.html}/config-context.html"/>
@@ -157,16 +156,17 @@
<get src="${url}/config-versioning.xml" dest="${build.docs.html}/config-versioning.html"/>
<get src="${url}/config-xqdoc.xml" dest="${build.docs.html}/config-xqdoc.html"/>
<get src="${url}/config-xslt.xml" dest="${build.docs.html}/config-xslt.html"/>
+ <get src="${url}/configuration.xml" dest="${build.docs.html}/configuration.html"/>
<get src="${url}/credits.xml" dest="${build.docs.html}/credits.html"/>
<get src="${url}/debugger.xml" dest="${build.docs.html}/debugger.html"/>
<get src="${url}/deployment.xml" dest="${build.docs.html}/deployment.html"/>
+ <get src="${url}/devguide.xml" dest="${build.docs.html}/devguide.html"/>
<get src="${url}/devguide_codereview.xml" dest="${build.docs.html}/devguide_codereview.html"/>
<get src="${url}/devguide_indexes.xml" dest="${build.docs.html}/devguide_indexes.html"/>
<get src="${url}/devguide_log4j.xml" dest="${build.docs.html}/devguide_log4j.html"/>
<get src="${url}/devguide_manifesto.xml" dest="${build.docs.html}/devguide_manifesto.html"/>
<get src="${url}/devguide_rest.xml" dest="${build.docs.html}/devguide_rest.html"/>
<get src="${url}/devguide_soap.xml" dest="${build.docs.html}/devguide_soap.html"/>
- <get src="${url}/devguide.xml" dest="${build.docs.html}/devguide.html"/>
<get src="${url}/devguide_xmldb.xml" dest="${build.docs.html}/devguide_xmldb.html"/>
<get src="${url}/devguide_xmlrpc.xml" dest="${build.docs.html}/devguide_xmlrpc.html"/>
<get src="${url}/devguide_xquery.xml" dest="${build.docs.html}/devguide_xquery.html"/>
@@ -178,10 +178,10 @@
<get src="${url}/extensions.xml" dest="${build.docs.html}/extensions.html"/>
<get src="${url}/facts.xml" dest="${build.docs.html}/facts.html"/>
<get src="${url}/ftlegacy.xml" dest="${build.docs.html}/ftlegacy.html"/>
- <get src="${url}/function_modules.xml" dest="${build.docs.html}/function_modules.xml.html"/>
+ <get src="${url}/function_modules.xml" dest="${build.docs.html}/function_modules.html"/>
<get src="${url}/header.xml" dest="${build.docs.html}/header.html"/>
+ <get src="${url}/index.xml" dest="${build.docs.html}/index.html"/>
<get src="${url}/indexing.xml" dest="${build.docs.html}/indexing.html"/>
- <get src="${url}/index.xml" dest="${build.docs.html}/index.html"/>
<get src="${url}/installing-exist-on-amazon-ec2.xml" dest="${build.docs.html}/installing-exist-on-amazon-ec2.html"/>
<get src="${url}/jmx.xml" dest="${build.docs.html}/jmx.html"/>
<get src="${url}/journal.xml" dest="${build.docs.html}/journal.html"/>
@@ -198,12 +198,13 @@
<get src="${url}/security.xml" dest="${build.docs.html}/security.html"/>
<get src="${url}/sidebar.xml" dest="${build.docs.html}/sidebar.html"/>
<get src="${url}/template.xml" dest="${build.docs.html}/template.html"/>
+ <mkdir dir="${build.docs.html}/testing"/>
+ <get src="${url}/testing/testing.xml" dest="${build.docs.html}/testing/testing.html"/>
<get src="${url}/triggers.xml" dest="${build.docs.html}/triggers.html"/>
<get src="${url}/tuning.xml" dest="${build.docs.html}/tuning.html"/>
<get src="${url}/ubuntu-server.xml" dest="${build.docs.html}/ubuntu-server.html"/>
<get src="${url}/update_ext.xml" dest="${build.docs.html}/update_ext.html"/>
<get src="${url}/upgrading.xml" dest="${build.docs.html}/upgrading.html"/>
- <get src="${url}/urlrewrite.xml" dest="${build.docs.html}/urlrewrite.html"/>
<get src="${url}/validation.xml" dest="${build.docs.html}/validation.html"/>
<get src="${url}/versioning.xml" dest="${build.docs.html}/versioning.html"/>
<get src="${url}/webdav.xml" dest="${build.docs.html}/webdav.html"/>
@@ -212,23 +213,23 @@
<get src="${url}/xacml-intro.xml" dest="${build.docs.html}/xacml-intro.html"/>
<get src="${url}/xacml-usage.xml" dest="${build.docs.html}/xacml-usage.html"/>
<get src="${url}/xacml.xml" dest="${build.docs.html}/xacml.html"/>
+ <mkdir dir="${build.docs.html}/xforms"/>
+ <get src="${url}/xforms/examples.xml" dest="${build.docs.html}/xforms/examples.html"/>
+ <get src="${url}/xforms/hello.xml" dest="${build.docs.html}/xforms/hello.html"/>
+ <get src="${url}/xforms/hello2.xml" dest="${build.docs.html}/xforms/hello2.html"/>
+ <get src="${url}/xforms/shakespeare.xml" dest="${build.docs.html}/xforms/shakespeare.html"/>
+ <!--get src="${url}/xforms/tasks/sidebar.xml" dest="${build.docs.html}/xforms/tasks/sidebar.html"/-->
+ <!--get src="${url}/xforms/tasks/todo-list.xml" dest="${build.docs.html}/xforms/tasks/todo-list.html"/>
+ <get src="${url}/xforms/tasks/todo-projects.xml" dest="${build.docs.html}/xforms/tasks/todo-projects.html"/-->
+ <get src="${url}/xforms/xforms.xml" dest="${build.docs.html}/xforms/xforms.html"/>
<get src="${url}/xinclude.xml" dest="${build.docs.html}/xinclude.html"/>
<get src="${url}/xmlprague06.xml" dest="${build.docs.html}/xmlprague06.html"/>
- <get src="${url}/xquery.xml" dest="${build.docs.html}/xquery.html"/>
-
-
- <mkdir dir="${build.docs.html}/xforms"/>
- <get src="${url}/xforms/xforms.xml" dest="${build.docs.html}/xforms/xforms.html"/>
+
<mkdir dir="${build.docs.html}/xproc"/>
<!--get src='${url}/xproc/xproc.xml' dest='${build.docs.html}/xproc/xproc.html'/-->
- <!--mkdir dir="${build.docs.html}/gsoc"/>
- <mkdir dir="${build.docs.html}/gsoc/2008"/>
- <get src='${url}/gsoc/2008/summer.xml' dest='${build.docs.html}/gsoc/2008/summer.html'/-->
<mkdir dir="${build.docs.html}/repo"/>
<get src="${url}/repo/repo.xml" dest="${build.docs.html}/repo/repo.html"/>
-
- <mkdir dir="${build.docs.html}/testing"/>
- <get src="${url}/testing/testing.xml" dest="${build.docs.html}/testing/testing.html"/>
+
</target>
</project>
Modified: branches/adam/eXist-acl/extensions/expath/src/org/expath/httpclient/model/exist/EXistResult.java
===================================================================
--- branches/adam/eXist-acl/extensions/expath/src/org/expath/httpclient/model/exist/EXistResult.java 2011-05-30 21:35:25 UTC (rev 14590)
+++ branches/adam/eXist-acl/extensions/expath/src/org/expath/httpclient/model/exist/EXistResult.java 2011-05-31 09:48:14 UTC (rev 14591)
@@ -71,13 +71,8 @@
@Override
public void add(Source src) throws HttpClientException {
-
try {
- //TODO badly formed HTML needs tidying into XHTML - would be better
- //to have seperate methods for HTML and XML retrieval in EXPath.
-
- //NodeValue nodeValue = ModuleUtils.sourceToXML(context, src);
- NodeValue nodeValue = ModuleUtils.htmlToXHtml(context, "", src, null, null);
+ NodeValue nodeValue = ModuleUtils.sourceToXML(context, src);
result.add(nodeValue);
} catch(SAXException saxe) {
throw new HttpClientException("Unable to add Source to result:" + saxe.getMessage(), saxe);
@@ -101,4 +96,4 @@
public Sequence getResult() {
return result;
}
-}
\ No newline at end of file
+}
Property changes on: branches/adam/eXist-acl/extensions/modules/src/org/exist/xquery/modules/jfreechart/JFreeCharting.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/eXist/extensions/modules/src/org/exist/xquery/modules/jfreechart/JFreeCharting.java:14123-14501
/trunk/eXist/nbproject/extensions/modules/src/org/exist/xquery/modules/jfreechart/JFreeCharting.java:8007-14504
+ /trunk/eXist/extensions/modules/src/org/exist/xquery/modules/jfreechart/JFreeCharting.java:14123-14590
/trunk/eXist/nbproject/extensions/modules/src/org/exist/xquery/modules/jfreechart/JFreeCharting.java:8007-14504
Property changes on: branches/adam/eXist-acl/lib/optional/axis-schema-1.3.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/eXist/lib/optional/axis-schema-1.3.jar:14123-14501
/trunk/eXist/nbproject/lib/optional/axis-schema-1.3.jar:8007-14504
+ /trunk/eXist/lib/optional/axis-schema-1.3.jar:14123-14590
/trunk/eXist/nbproject/lib/optional/axis-schema-1.3.jar:8007-14504
Property changes on: branches/adam/eXist-acl/lib/optional/jaxrpc-1.1.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/eXist/lib/optional/jaxrpc-1.1.jar:14123-14501
/trunk/eXist/nbproject/lib/optional/jaxrpc-1.1.jar:8007-14504
+ /trunk/eXist/lib/optional/jaxrpc-1.1.jar:14123-14590
/trunk/eXist/nbproject/lib/optional/jaxrpc-1.1.jar:8007-14504
Property changes on: branches/adam/eXist-acl/lib/optional/saaj-1.2.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/eXist/lib/optional/saaj-1.2.jar:14123-14501
/trunk/eXist/nbproject/lib/optional/saaj-1.2.jar:8007-14504
+ /trunk/eXist/lib/optional/saaj-1.2.jar:14123-14590
/trunk/eXist/nbproject/lib/optional/saaj-1.2.jar:8007-14504
Property changes on: branches/adam/eXist-acl/lib/user/activation-1.1.1.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/eXist/lib/user/activation-1.1.1.jar:14123-14501
/trunk/eXist/nbproject/lib/user/activation-1.1.1.jar:8007-14504
+ /trunk/eXist/lib/user/activation-1.1.1.jar:14123-14590
/trunk/eXist/nbproject/lib/user/activation-1.1.1.jar:8007-14504
Property changes on: branches/adam/eXist-acl/nbbuild.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/jmfg/res64-eXist/nbbuild.xml:12887-13224
/trunk/eXist/nbbuild.xml:14123-14504
/trunk/eXist/nbproject/nbbuild.xml:8007-14504
+ /branches/jmfg/res64-eXist/nbbuild.xml:12887-13224
/trunk/eXist/nbbuild.xml:14123-14590
/trunk/eXist/nbproject/nbbuild.xml:8007-14504
Modified: branches/adam/eXist-acl/src/org/exist/config/Configurator.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/config/Configurator.java 2011-05-30 21:35:25 UTC (rev 14590)
+++ branches/adam/eXist-acl/src/org/exist/config/Configurator.java 2011-05-31 09:48:14 UTC (rev 14591)
@@ -1136,4 +1136,4 @@
public static Configuration getConfigurtion(BrokerPool db, XmldbURI uri) {
return hotConfigs.get(Configurator.getFullURI(db, uri));
}
-}
\ No newline at end of file
+}
Property changes on: branches/adam/eXist-acl/src/org/exist/dom
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/jmfg/res64-eXist/src/org/exist/dom:12887-13224
/branches/wolfgang/src/org/exist/dom:10658-11213
/stable/eXist-1.4.x/src/org/exist/dom:11626
/trunk/eXist/nbproject/src/org/exist/dom:8007-14504
/trunk/eXist/src/org/exist/dom:14123-14501
+ /branches/jmfg/res64-eXist/src/org/exist/dom:12887-13224
/branches/wolfgang/src/org/exist/dom:10658-11213
/stable/eXist-1.4.x/src/org/exist/dom:11626
/trunk/eXist/nbproject/src/org/exist/dom:8007-14504
/trunk/eXist/src/org/exist/dom:14123-14590
Modified: branches/adam/eXist-acl/src/org/exist/http/RESTServer.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/http/RESTServer.java 2011-05-30 21:35:25 UTC (rev 14590)
+++ branches/adam/eXist-acl/src/org/exist/http/RESTServer.java 2011-05-31 09:48:14 UTC (rev 14591)
@@ -42,7 +42,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.XMLConstants;
-import javax.xml.namespace.QName;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
@@ -63,6 +62,7 @@
import org.exist.dom.DocumentImpl;
import org.exist.dom.DocumentMetadata;
import org.exist.dom.MutableDocumentSet;
+import org.exist.dom.QName;
import org.exist.dom.XMLUtil;
import org.exist.http.servlets.HttpRequestWrapper;
import org.exist.http.servlets.HttpResponseWrapper;
@@ -98,6 +98,7 @@
import org.exist.xqj.Marshaller;
import org.exist.xquery.CompiledXQuery;
import org.exist.xquery.Constants;
+import org.exist.xquery.NameTest;
import org.exist.xquery.XPathException;
import org.exist.xquery.XQuery;
import org.exist.xquery.XQueryContext;
@@ -107,6 +108,9 @@
import org.exist.xquery.value.AnyURIValue;
import org.exist.xquery.value.DateTimeValue;
import org.exist.xquery.value.Sequence;
+import org.exist.xquery.value.SequenceIterator;
+import org.exist.xquery.value.Type;
+import org.exist.xquery.value.ValueSequence;
import org.exist.xupdate.Modification;
import org.exist.xupdate.XUpdateProcessor;
import org.w3c.dom.Document;
@@ -264,7 +268,7 @@
}
String _var = request.getParameter("_variables");
List /*<Namespace>*/ namespaces = null;
- NodeImpl variables = null;
+ ElementImpl variables = null;
try {
if (_var != null)
{
@@ -663,7 +667,7 @@
int howmany = 10;
int start = 1;
boolean typed = false;
- Node variables = null;
+ ElementImpl variables = null;
boolean enclose = true;
boolean cache = false;
@SuppressWarnings("unused")
@@ -676,7 +680,7 @@
try {
String content = getRequestContent(request);
NamespaceExtractor nsExtractor = new NamespaceExtractor();
- Element root = parseXML(content, nsExtractor);
+ ElementImpl root = parseXML(content, nsExtractor);
String rootNS = root.getNamespaceURI();
if (rootNS != null && rootNS.equals(Namespaces.EXIST_NS)) {
@@ -752,7 +756,7 @@
query = buf.toString();
} else if (child.getLocalName().equals("variables")) {
- variables = child;
+ variables = (ElementImpl) child;
} else if (child.getLocalName().equals("properties")) {
Node node = child.getFirstChild();
@@ -1160,7 +1164,7 @@
* @throws XPathException
*/
protected void search(DBBroker broker, String query, String path,
- List<Namespace> namespaces, Node variables, int howmany, int start, boolean typed,
+ List<Namespace> namespaces, ElementImpl variables, int howmany, int start, boolean typed,
Properties outputProperties, boolean wrap, boolean cache, HttpServletRequest request,
HttpServletResponse response) throws BadRequestException,
PermissionDeniedException, XPathException {
@@ -1256,7 +1260,7 @@
* @param response
* @throws XPathException
*/
- private HttpRequestWrapper declareVariables(XQueryContext context, Node variables,
+ private HttpRequestWrapper declareVariables(XQueryContext context, ElementImpl variables,
HttpServletRequest request, HttpServletResponse response)
throws XPathException {
@@ -1276,65 +1280,60 @@
return reqw;
}
- private void declareExternalAndXQJVariables(XQueryContext context, Node variables) throws XPathException {
+ private void declareExternalAndXQJVariables(XQueryContext context, ElementImpl variables) throws XPathException {
- NodeList childs = variables.getChildNodes();
+ ValueSequence varSeq = new ValueSequence();
+ variables.selectChildren(new NameTest(Type.ELEMENT, new QName("variable", Namespaces.EXIST_NS)), varSeq);
+ for (SequenceIterator i = varSeq.iterate(); i.hasNext(); ) {
+ ElementImpl variable = (ElementImpl) i.nextItem();
+ // get the QName of the variable
+ ElementImpl qname = (ElementImpl) variable.getFirstChild(new NameTest(Type.ELEMENT, new QName("qname", Namespaces.EXIST_NS)));
+ String localname = null, prefix = null, uri = null;
+ NodeImpl child = (NodeImpl) qname.getFirstChild();
+ while (child != null) {
+ if (child.getLocalName().equals("localname")) {
+ localname = child.getStringValue();
- for (int i = 0; i < childs.getLength(); i++) {
- Node child = childs.item(i);// <variable> element
+ } else if (child.getLocalName().equals("namespace")) {
+ uri = child.getStringValue();
- // get the QName of the variable
- Node qname = child.getFirstChild();
- NodeList l = qname.getChildNodes();
- String localname = null, prefix = null, uri = null;
-
- for (int j = 0; j < l.getLength(); j++) {
- Node c = l.item(j);
- if (c.getLocalName().equals("localname")) {
- if ((c.getFirstChild()) != null)
- localname = c.getFirstChild().getNodeValue();
+ } else if (child.getLocalName().equals("prefix")) {
+ prefix = child.getStringValue();
+
+ }
+ child = (NodeImpl) child.getNextSibling();
+ }
- } else if (c.getLocalName().equals("namespace")) {
- if (c.getFirstChild() != null)
- uri = c.getFirstChild().getNodeValue();
+ if (uri != null && prefix != null)
+ context.declareNamespace(prefix, uri);
- } else if (c.getLocalName().equals("prefix")) {
- if (c.getFirstChild() != null)
- prefix = c.getFirstChild().getNodeValue();
- }
- }
+ if (localname == null)
+ continue;
- if (uri != null && prefix != null)
- context.declareNamespace(prefix, uri);
+ QName q;
+ if(prefix != null && localname != null) {
+ q = new QName(localname, uri, prefix);
- if (localname == null)
- continue;
+ } else {
+ q = new QName(localname, uri, XMLConstants.DEFAULT_NS_PREFIX);
+ }
- QName q;
- if(prefix != null && localname != null) {
- q = new QName(uri, localname, prefix);
-
- } else {
- q = new QName(uri, localname, XMLConstants.DEFAULT_NS_PREFIX);
- }
+ // get serialized sequence
+ NodeImpl value = variable.getFirstChild(new NameTest(Type.ELEMENT, Marshaller.ROOT_ELEMENT_QNAME));
+ Sequence sequence;
+ try {
+ sequence = value == null ? Sequence.EMPTY_SEQUENCE : Marshaller.demarshall(value);
- // get serialized sequence
- NodeImpl seq = (NodeImpl) qname.getNextSibling();
- Sequence sequence;
- try {
- sequence = Marshaller.demarshall(seq);
-
- } catch (XMLStreamException xe) {
- throw new XPathException(xe.toString());
- }
+ } catch (XMLStreamException xe) {
+ throw new XPathException(xe.toString());
+ }
- // now declare variable
- if(prefix != null) {
- context.declareVariable(q.getPrefix() + ":" + q.getLocalPart(), sequence);
- } else {
- context.declareVariable(q.getLocalPart(), sequence);
- }
-
+ // now declare variable
+ if(prefix != null) {
+ context.declareVariable(q.getPrefix() + ":" + q.getLocalName(), sequence);
+ } else {
+ context.declareVariable(q.getLocalName(), sequence);
+ }
}
}
Property changes on: branches/adam/eXist-acl/src/org/exist/indexing
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wolfgang/src/org/exist/indexing:10658-11213
/trunk/eXist/nbproject/src/org/exist/indexing:8007-14504
/trunk/eXist/src/org/exist/indexing:14123-14501
+ /branches/wolfgang/src/org/exist/indexing:10658-11213
/trunk/eXist/nbproject/src/org/exist/indexing:8007-14504
/trunk/eXist/src/org/exist/indexing:14123-14590
Modified: branches/adam/eXist-acl/src/org/exist/memtree/ElementImpl.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/memtree/ElementImpl.java 2011-05-30 21:35:25 UTC (rev 14590)
+++ branches/adam/eXist-acl/src/org/exist/memtree/ElementImpl.java 2011-05-31 09:48:14 UTC (rev 14591)
@@ -39,6 +39,7 @@
import org.exist.xquery.XPathException;
import org.exist.xquery.value.Sequence;
import org.exist.xquery.value.Type;
+import org.exist.xquery.value.ValueSequence;
import java.util.HashMap;
import java.util.HashSet;
@@ -302,6 +303,12 @@
}
}
+ public NodeImpl getFirstChild(NodeTest test) throws XPathException {
+ ValueSequence seq = new ValueSequence();
+ selectChildren(test, seq);
+ return seq.isEmpty() ? null : seq.get(0);
+ }
+
@Override
public void selectDescendants( boolean includeSelf, NodeTest test, Sequence result )
throws XPathException {
Property changes on: branches/adam/eXist-acl/src/org/exist/numbering
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wolfgang/src/org/exist/numbering:10658-11213
/trunk/eXist/nbproject/src/org/exist/numbering:8007-14504
/trunk/eXist/src/org/exist/numbering:14123-14501
+ /branches/wolfgang/src/org/exist/numbering:10658-11213
/trunk/eXist/nbproject/src/org/exist/numbering:8007-14504
/trunk/eXist/src/org/exist/numbering:14123-14590
Property changes on: branches/adam/eXist-acl/src/org/exist/storage
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/jmfg/res64-eXist/src/org/exist/storage:12887-13224
/branches/wolfgang/src/org/exist/storage/structural:10694-11213
/trunk/eXist/nbproject/src/org/exist/storage:8007-14504
/trunk/eXist/src/org/exist/storage:14123-14424
/trunk/eXist/src/org/exist/storage/structural:10658-10832*,10875-11212
+ /branches/jmfg/res64-eXist/src/org/exist/storage:12887-13224
/branches/wolfgang/src/org/exist/storage/structural:10694-11213
/trunk/eXist/nbproject/src/org/exist/storage:8007-14504
/trunk/eXist/src/org/exist/storage:14123-14590
/trunk/eXist/src/org/exist/storage/structural:10658-10832*,10875-11212
Property changes on: branches/adam/eXist-acl/src/org/exist/storage/ConsistencyCheckTask.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/adam/t2/src/org/exist/storage/ConsistencyCheckTask.java:8802-9013
/branches/eXist-stable-1.2/src/org/exist/storage/ConsistencyCheckTask.java:9415,10309
/stable/eXist-1.4.x/src/org/exist/storage/ConsistencyCheckTask.java:10999
/trunk/eXist/nbproject/src/org/exist/storage/ConsistencyCheckTask.java:8007-14504
/trunk/eXist/src/org/exist/storage/ConsistencyCheckTask.java:14123-14424
+ /branches/adam/t2/src/org/exist/storage/ConsistencyCheckTask.java:8802-9013
/branches/eXist-stable-1.2/src/org/exist/storage/ConsistencyCheckTask.java:9415,10309
/stable/eXist-1.4.x/src/org/exist/storage/ConsistencyCheckTask.java:10999
/trunk/eXist/nbproject/src/org/exist/storage/ConsistencyCheckTask.java:8007-14504
/trunk/eXist/src/org/exist/storage/ConsistencyCheckTask.java:14123-14590
Property changes on: branches/adam/eXist-acl/src/org/exist/storage/DBBroker.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wolfgang/src/org/exist/storage/DBBroker.java:10658-11213
/branches/wolfgang/src/org/exist/storage/structural/DBBroker.java:10694-11213
/trunk/eXist/nbproject/src/org/exist/storage/DBBroker.java:8007-14504
/trunk/eXist/src/org/exist/storage/DBBroker.java:14123-14424
/trunk/eXist/src/org/exist/storage/structural/DBBroker.java:10875-11212
+ /branches/wolfgang/src/org/exist/storage/DBBroker.java:10658-11213
/branches/wolfgang/src/org/exist/storage/structural/DBBroker.java:10694-11213
/trunk/eXist/nbproject/src/org/exist/storage/DBBroker.java:8007-14504
/trunk/eXist/src/org/exist/storage/DBBroker.java:14123-14590
/trunk/eXist/src/org/exist/storage/structural/DBBroker.java:10875-11212
Modified: branches/adam/eXist-acl/src/org/exist/storage/NativeBroker.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/storage/NativeBroker.java 2011-05-30 21:35:25 UTC (rev 14590)
+++ branches/adam/eXist-acl/src/org/exist/storage/NativeBroker.java 2011-05-31 09:48:14 UTC (rev 14591)
@@ -634,10 +634,11 @@
LOG.debug("Creating root collection '" + XmldbURI.ROOT_COLLECTION_URI + "'");
current = new Collection(this, XmldbURI.ROOT_COLLECTION_URI);
- Permission perm = current.getPermissions();
- perm.setMode(0777);
- perm.setOwner(getSubject());
- perm.setGroup(getSubject().getPrimaryGroup());
+ //Note - permissions are now automaticlaly taken care of at Collection object instantiation time
+ //Permission perm = current.getPermissions();
+ //perm.setMode(0777);
+ //perm.setOwner(getSubject());
+ //perm.setGroup(getSubject().getPrimaryGroup());
current.setId(getNextCollectionId(transaction));
current.setCreationTime(System.currentTimeMillis());
@@ -670,7 +671,8 @@
}
sub = new Collection(this, path);
-
+
+ //Note - permissions are now automaticlaly taken care of at Collection object instantiation time
//Permission perm = current.getPermissions();
//perm.setMode(0777);
//perm.setOwner(getSubject());
Property changes on: branches/adam/eXist-acl/src/org/exist/storage/NativeBroker.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/jmfg/res64-eXist/src/org/exist/storage/NativeBroker.java:12887-13224
/branches/wolfgang/src/org/exist/storage/NativeBroker.java:10658-11213
/stable/eXist-1.4.x/src/org/exist/storage/NativeBroker.java:11893
/trunk/eXist/nbproject/src/org/exist/storage/NativeBroker.java:8007-14504
/trunk/eXist/src/org/exist/storage/NativeBroker.java:14123-14424
+ /branches/jmfg/res64-eXist/src/org/exist/storage/NativeBroker.java:12887-13224
/branches/wolfgang/src/org/exist/storage/NativeBroker.java:10658-11213
/stable/eXist-1.4.x/src/org/exist/storage/NativeBroker.java:11893
/trunk/eXist/nbproject/src/org/exist/storage/NativeBroker.java:8007-14504
/trunk/eXist/src/org/exist/storage/NativeBroker.java:14123-14590
Modified: branches/adam/eXist-acl/src/org/exist/storage/ProcessMonitor.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/storage/ProcessMonitor.java 2011-05-30 21:35:25 UTC (rev 14590)
+++ branches/adam/eXist-acl/src/org/exist/storage/ProcessMonitor.java 2011-05-31 09:48:14 UTC (rev 14591)
@@ -155,6 +155,12 @@
}
}
+ /**
+ * Linked HashMap that has a fixed size
+ *
+ * Oldest items are removed when new items are added
+ * if the max size is exceeded
+ */
public class FixedSizeLinkedHashMap<K,V> extends LinkedHashMap<K,V> {
private final int maxSize;
Property changes on: branches/adam/eXist-acl/src/org/exist/storage/StorageAddress.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wolfgang/src/org/exist/storage/StorageAddress.java:10658-11213
/trunk/eXist/nbproject/src/org/exist/storage/StorageAddress.java:8007-14504
/trunk/eXist/src/org/exist/storage/StorageAddress.java:14123-14424
+ /branches/wolfgang/src/org/exist/storage/StorageAddress.java:10658-11213
/trunk/eXist/nbproject/src/org/exist/storage/StorageAddress.java:8007-14504
/trunk/eXist/src/org/exist/storage/StorageAddress.java:14123-14590
Property changes on: branches/adam/eXist-acl/src/org/exist/storage/btree
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wolfgang/src/org/exist/storage/btree:10658-11213
/stable/eXist-1.4.x/src/org/exist/storage/btree:13335
/trunk/eXist/nbproject/src/org/exist/storage/btree:8007-14504
/trunk/eXist/src/org/exist/storage/btree:14123-14424
+ /branches/wolfgang/src/org/exist/storage/btree:10658-11213
/stable/eXist-1.4.x/src/org/exist/storage/btree:13335
/trunk/eXist/nbproject/src/org/exist/storage/btree:8007-14504
/trunk/eXist/src/org/exist/storage/btree:14123-14590
Property changes on: branches/adam/eXist-acl/src/org/exist/storage/dom
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/jmfg/res64-eXist/src/org/exist/storage/dom:12887-13224
/branches/wolfgang/src/org/exist/storage/dom:10658-11213
/trunk/eXist/nbproject/src/org/exist/storage/dom:8007-14504
/trunk/eXist/src/org/exist/storage/dom:14123-14424
+ /branches/jmfg/res64-eXist/src/org/exist/storage/dom:12887-13224
/branches/wolfgang/src/org/exist/storage/dom:10658-11213
/trunk/eXist/nbproject/src/org/exist/storage/dom:8007-14504
/trunk/eXist/src/org/exist/storage/dom:14123-14590
Property changes on: branches/adam/eXist-acl/src/org/exist/storage/index
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wolfgang/src/org/exist/storage/index:10658-11213
/branches/wolfgang/src/org/exist/storage/structural/index:10694-11213
/trunk/eXist/nbproject/src/org/exist/storage/index:8007-14504
/trunk/eXist/src/org/exist/storage/index:14123-14424
/trunk/eXist/src/org/exist/storage/structural/index:10875-11212
+ /branches/wolfgang/src/org/exist/storage/index:10658-11213
/branches/wolfgang/src/org/exist/storage/structural/index:10694-11213
/trunk/eXist/nbproject/src/org/exist/storage/index:8007-14504
/trunk/eXist/src/org/exist/storage/index:14123-14590
/trunk/eXist/src/org/exist/storage/structural/index:10875-11212
Property changes on: branches/adam/eXist-acl/src/org/exist/storage/report
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wolfgang/src/org/exist/storage/report:10658-11213
/trunk/eXist/nbproject/src/org/exist/storage/report:8007-14504
/trunk/eXist/src/org/exist/storage/report:14123-14424
+ /branches/wolfgang/src/org/exist/storage/report:10658-11213
/trunk/eXist/nbproject/src/org/exist/storage/report:8007-14504
/trunk/eXist/src/org/exist/storage/report:14123-14590
Property changes on: branches/adam/eXist-acl/src/org/exist/storage/txn
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wolfgang/src/org/exist/storage/structural/txn:10694-11213
/branches/wolfgang/src/org/exist/storage/txn:10658-11213
/trunk/eXist/nbproject/src/org/exist/storage/txn:8007-14504
/trunk/eXist/src/org/exist/storage/structural/txn:10875-11212
/trunk/eXist/src/org/exist/storage/txn:14123-14424
+ /branches/wolfgang/src/org/exist/storage/structural/txn:10694-11213
/branches/wolfgang/src/org/exist/storage/txn:10658-11213
/trunk/eXist/nbproject/src/org/exist/storage/txn:8007-14504
/trunk/eXist/src/org/exist/storage/structural/txn:10875-11212
/trunk/eXist/src/org/exist/storage/txn:14123-14590
Modified: branches/adam/eXist-acl/src/org/exist/xqj/Marshaller.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/xqj/Marshaller.java 2011-05-30 21:35:25 UTC (rev 14590)
+++ branches/adam/eXist-acl/src/org/exist/xqj/Marshaller.java 2011-05-31 09:48:14 UTC (rev 14591)
@@ -61,6 +61,7 @@
public final static String NAMESPACE = "http://exist-db.org/xquery/types/serialized";
public final static String PREFIX = "sx";
+
private final static Properties OUTPUT_PROPERTIES = new Properties();
private final static String VALUE_ELEMENT = "value";
@@ -69,10 +70,12 @@
private final static String SEQ_ELEMENT = "sequence";
private final static String SEQ_ELEMENT_QNAME = PREFIX + ":sequence";
-
+
private final static String ATTR_TYPE = "type";
private final static String ATTR_ITEM_TYPE = "item-type";
+ public final static QName ROOT_ELEMENT_QNAME = new QName(SEQ_ELEMENT, NAMESPACE, PREFIX);
+
/**
* Marshall a sequence in an xml based string representation
* @param broker
Property changes on: branches/adam/eXist-acl/src/org/exist/xquery/LocationStep.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/adam/eXist-xq3/src/org/exist/xquery/LocationStep.java:13010-13060
/branches/wolfgang/src/org/exist/xquery/LocationStep.java:10658-11213
/trunk/eXist/nbproject/src/org/exist/xquery/LocationStep.java:8007-14504
/trunk/eXist/src/org/exist/xquery/LocationStep.java:14123-14501
+ /branches/adam/eXist-xq3/src/org/exist/xquery/LocationStep.java:13010-13060
/branches/wolfgang/src/org/exist/xquery/LocationStep.java:10658-11213
/trunk/eXist/nbproject/src/org/exist/xquery/LocationStep.java:8007-14504
/trunk/eXist/src/org/exist/xquery/LocationStep.java:14123-14590
Modified: branches/adam/eXist-acl/src/org/exist/xquery/parser/XQuery.g
===================================================================
--- branches/adam/eXist-acl/src/org/exist/xquery/parser/XQuery.g 2011-05-30 21:35:25 UTC (rev 14590)
+++ branches/adam/eXist-acl/src/org/exist/xquery/parser/XQuery.g 2011-05-31 09:48:14 UTC (rev 14591)
@@ -1250,11 +1250,6 @@
}
:
( LT qName ~( GT | SLASH ) ) => elementWithAttributes | elementWithoutAttributes
- exception catch [RecognitionException e]
- {
- lexer.wsExplicit = false;
- throw new XPathException("err:XPST0003: Parse error: element name containing whitespace: " + e.getMessage() + " at line: " + e.getLine() + " column: " + e.getColumn());
- }
;
elementWithoutAttributes throws XPathException
@@ -1294,6 +1289,11 @@
)
)
{ #elementWithoutAttributes.copyLexInfo(#q); }
+ exception catch [RecognitionException e]
+ {
+ lexer.wsExplicit = false;
+ throw new XPathException(#q, "err:XPST0003: No closing end tag found for element constructor: " + name);
+ }
;
// === XML ===
@@ -1321,10 +1321,10 @@
content:mixedElementContent END_TAG_START! name=qn:qName! GT!
{
if (elementStack.isEmpty())
- throw new XPathException(#qn, "found closing tag without opening tag: " + name);
+ throw new XPathException(#qn, "err:XPST0003: Found closing tag without opening tag: " + name);
String prev= (String) elementStack.pop();
if (!prev.equals(name))
- throw new XPathException(#qn, "found closing tag: " + name + "; expected: " + prev);
+ throw new XPathException(#qn, "err:XPST0003: Found closing tag: " + name + "; expected: " + prev);
#elementWithAttributes= #(#[ELEMENT, name], #attrs);
if (!elementStack.isEmpty()) {
lexer.inElementContent= true;
@@ -1333,6 +1333,11 @@
)
)
{ #elementWithAttributes.copyLexInfo(#q); }
+ exception catch [RecognitionException e]
+ {
+ lexer.wsExplicit = false;
+ throw new XPathException(#q, "err:XPST0003: Static error: no closing end tag found for element constructor: " + name);
+ }
;
attributeList throws XPathException
Modified: branches/adam/eXist-acl/src/org/exist/xquery/parser/XQueryParser.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/xquery/parser/XQueryParser.java 2011-05-30 21:35:25 UTC (rev 14590)
+++ branches/adam/eXist-acl/src/org/exist/xquery/parser/XQueryParser.java 2011-05-31 09:48:14 UTC (rev 14591)
@@ -8972,52 +8972,40 @@
//lexer.wsExplicit = true;
- try { // for error handling
- boolean synPredMatched392 = false;
- if (((LA(1)==LT))) {
- int _m392 = mark();
- synPredMatched392 = true;
- inputState.guessing++;
- try {
- {
- match(LT);
- qName();
- {
- match(_tokenSet_14);
- }
- }
+ boolean synPredMatched392 = false;
+ if (((LA(1)==LT))) {
+ int _m392 = mark();
+ synPredMatched392 = true;
+ inputState.guessing++;
+ try {
+ {
+ match(LT);
+ qName();
+ {
+ match(_tokenSet_14);
}
- catch (RecognitionException pe) {
- synPredMatched392 = false;
}
- rewind(_m392);
-inputState.guessing--;
}
- if ( synPredMatched392 ) {
- elementWithAttributes();
- astFactory.addASTChild(currentAST, returnAST);
- elementConstructor_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+ catch (RecognitionException pe) {
+ synPredMatched392 = false;
}
- else if ((LA(1)==LT)) {
- elementWithoutAttributes();
- astFactory.addASTChild(currentAST, returnAST);
- elementConstructor_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
- }
- else {
- throw new NoViableAltException(LT(1), getFilename());
- }
-
+ rewind(_m392);
+inputState.guessing--;
}
- catch (RecognitionException e) {
- if (inputState.guessing==0) {
-
- lexer.wsExplicit = false;
- throw new XPathException("err:XPST0003: Parse error: element name containing whitespace: " + e.getMessage() + " at line: " + e.getLine() + " column: " + e.getColumn());
-
- } else {
- throw e;
- }
+ if ( synPredMatched392 ) {
+ elementWithAttributes();
+ astFactory.addASTChild(currentAST, returnAST);
+ elementConstructor_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
}
+ else if ((LA(1)==LT)) {
+ elementWithoutAttributes();
+ astFactory.addASTChild(currentAST, returnAST);
+ elementConstructor_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+ }
+ else {
+ throw new NoViableAltException(LT(1), getFilename());
+ }
+
returnAST = elementConstructor_AST;
}
@@ -9895,84 +9883,96 @@
org.exist.xquery.parser.XQueryAST qn_AST = null;
String name= null;
- match(LT);
- name=qName();
- q_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
- astFactory.addASTChild(currentAST, returnAST);
- attributeList();
- attrs_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
- astFactory.addASTChild(currentAST, returnAST);
- {
- switch ( LA(1)) {
- case SLASH:
- {
+ try { // for error handling
+ match(LT);
+ name=qName();
+ q_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
+ astFactory.addASTChild(currentAST, returnAST);
+ attributeList();
+ attrs_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
+ astFactory.addASTChild(currentAST, returnAST);
{
- match(SLASH);
- match(GT);
- if ( inputState.guessing==0 ) {
- elementWithAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
-
- if (!elementStack.isEmpty())
+ switch ( LA(1)) {
+ case SLASH:
+ {
+ {
+ match(SLASH);
+ match(GT);
+ if ( inputState.guessing==0 ) {
+ elementWithAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+
+ if (!elementStack.isEmpty())
+ lexer.inElementContent= true;
+ elementWithAttributes_AST= (org.exist.xquery.parser.XQueryAST)astFactory.make( (new ASTArray(2)).add((org.exist.xquery.parser.XQueryAST)astFactory.create(ELEMENT,name)).add(attrs_AST));
+
+ currentAST.root = elementWithAttributes_AST;
+ currentAST.child = elementWithAttributes_AST!=null &&elementWithAttributes_AST.getFirstChild()!=null ?
+ elementWithAttributes_AST.getFirstChild() : elementWithAttributes_AST;
+ currentAST.advanceChildToEnd();
+ }
+ }
+ break;
+ }
+ case GT:
+ {
+ {
+ match(GT);
+ if ( inputState.guessing==0 ) {
+
+ elementStack.push(name);
lexer.inElementContent= true;
- elementWithAttributes_AST= (org.exist.xquery.parser.XQueryAST)astFactory.make( (new ASTArray(2)).add((org.exist.xquery.parser.XQueryAST)astFactory.create(ELEMENT,name)).add(attrs_AST));
-
- currentAST.root = elementWithAttributes_AST;
- currentAST.child = elementWithAttributes_AST!=null &&elementWithAttributes_AST.getFirstChild()!=null ?
- elementWithAttributes_AST.getFirstChild() : elementWithAttributes_AST;
- currentAST.advanceChildToEnd();
+
+ }
+ mixedElementContent();
+ content_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
+ astFactory.addASTChild(currentAST, returnAST);
+ match(END_TAG_START);
+ name=qName();
+ qn_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
+ match(GT);
+ if ( inputState.guessing==0 ) {
+ elementWithAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+
+ if (elementStack.isEmpty())
+ throw new XPathException(qn_AST, "err:XPST0003: Found closing tag without opening tag: " + name);
+ String prev= (String) elementStack.pop();
+ if (!prev.equals(name))
+ throw new XPathException(qn_AST, "err:XPST0003: Found closing tag: " + name + "; expected: " + prev);
+ elementWithAttributes_AST= (org.exist.xquery.parser.XQueryAST)astFactory.make( (new ASTArray(2)).add((org.exist.xquery.parser.XQueryAST)astFactory.create(ELEMENT,name)).add(attrs_AST));
+ if (!elementStack.isEmpty()) {
+ lexer.inElementContent= true;
+ }
+
+ currentAST.root = elementWithAttributes_AST;
+ currentAST.child = elementWithAttributes_AST!=null &&elementWithAttributes_AST.getFirstChild()!=null ?
+ elementWithAttributes_AST.getFirstChild() : elementWithAttributes_AST;
+ currentAST.advanceChildToEnd();
+ }
+ }
+ break;
}
- }
- break;
- }
- case GT:
- {
+ default:
{
- match(GT);
- if ( inputState.guessing==0 ) {
-
- elementStack.push(name);
- lexer.inElementContent= true;
-
+ throw new NoViableAltException(LT(1), getFilename());
}
- mixedElementContent();
- content_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
- astFactory.addASTChild(currentAST, returnAST);
- match(END_TAG_START);
- name=qName();
- qn_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
- match(GT);
+ }
+ }
if ( inputState.guessing==0 ) {
elementWithAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+ elementWithAttributes_AST.copyLexInfo(q_AST);
+ }
+ elementWithAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+ }
+ catch (RecognitionException e) {
+ if (inputState.guessing==0) {
- if (elementStack.isEmpty())
- throw new XPathException(qn_AST, "found closing tag without opening tag: " + name);
- String prev= (String) elementStack.pop();
- if (!prev.equals(name))
- throw new XPathException(qn_AST, "found closing tag: " + name + "; expected: " + prev);
- elementWithAttributes_AST= (org.exist.xquery.parser.XQueryAST)astFactory.make( (new ASTArray(2)).add((org.exist.xquery.parser.XQueryAST)astFactory.create(ELEMENT,name)).add(attrs_AST));
- if (!elementStack.isEmpty()) {
- lexer.inElementContent= true;
- }
-
- currentAST.root = elementWithAttributes_AST;
- currentAST.child = elementWithAttributes_AST!=null &&elementWithAttributes_AST.getFirstChild()!=null ?
- elementWithAttributes_AST.getFirstChild() : elementWithAttributes_AST;
- currentAST.advanceChildToEnd();
+ lexer.wsExplicit = false;
+ throw new XPathException(q_AST, "err:XPST0003: Static error: no closing end tag found for element constructor: " + name);
+
+ } else {
+ throw e;
}
- }
- break;
}
- default:
- {
- throw new NoViableAltException(LT(1), getFilename());
- }
- }
- }
- if ( inputState.guessing==0 ) {
- elementWithAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
- elementWithAttributes_AST.copyLexInfo(q_AST);
- }
- elementWithAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
returnAST = elementWithAttributes_AST;
}
@@ -9986,86 +9986,98 @@
org.exist.xquery.parser.XQueryAST qn_AST = null;
String name= null;
- org.exist.xquery.parser.XQueryAST tmp396_AST = null;
- tmp396_AST = (org.exist.xquery.parser.XQueryAST)astFactory.create(LT(1));
- astFactory.addASTChild(currentAST, tmp396_AST);
- match(LT);
- name=qName();
- q_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
- astFactory.addASTChild(currentAST, returnAST);
- {
- switch ( LA(1)) {
- case SLASH:
- {
+ try { // for error handling
+ org.exist.xquery.parser.XQueryAST tmp396_AST = null;
+ tmp396_AST = (org.exist.xquery.parser.XQueryAST)astFactory.create(LT(1));
+ astFactory.addASTChild(currentAST, tmp396_AST);
+ match(LT);
+ name=qName();
+ q_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
+ astFactory.addASTChild(currentAST, returnAST);
{
- match(SLASH);
- match(GT);
- if ( inputState.guessing==0 ) {
- elementWithoutAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
-
- lexer.wsExplicit= false;
- if (!elementStack.isEmpty())
+ switch ( LA(1)) {
+ case SLASH:
+ {
+ {
+ match(SLASH);
+ match(GT);
+ if ( inputState.guessing==0 ) {
+ elementWithoutAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+
+ lexer.wsExplicit= false;
+ if (!elementStack.isEmpty())
+ lexer.inElementContent= true;
+ elementWithoutAttributes_AST= (org.exist.xquery.parser.XQueryAST)astFactory.create(ELEMENT,name);
+
+ currentAST.root = elementWithoutAttributes_AST;
+ currentAST.child = elementWithoutAttributes_AST!=null &&elementWithoutAttributes_AST.getFirstChild()!=null ?
+ elementWithoutAttributes_AST.getFirstChild() : elementWithoutAttributes_AST;
+ currentAST.advanceChildToEnd();
+ }
+ }
+ break;
+ }
+ case GT:
+ {
+ {
+ match(GT);
+ if ( inputState.guessing==0 ) {
+
+ elementStack.push(name);
lexer.inElementContent= true;
- elementWithoutAttributes_AST= (org.exist.xquery.parser.XQueryAST)astFactory.create(ELEMENT,name);
-
- currentAST.root = elementWithoutAttributes_AST;
- currentAST.child = elementWithoutAttributes_AST!=null &&elementWithoutAttributes_AST.getFirstChild()!=null ?
- elementWithoutAttributes_AST.getFirstChild() : elementWithoutAttributes_AST;
- currentAST.advanceChildToEnd();
+
+ }
+ mixedElementContent();
+ content_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
+ astFactory.addASTChild(currentAST, returnAST);
+ match(END_TAG_START);
+ name=qName();
+ qn_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
+ match(GT);
+ if ( inputState.guessing==0 ) {
+ elementWithoutAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+
+ if (elementStack.isEmpty())
+ throw new XPathException(qn_AST, "found additional closing tag: " + name);
+ String prev= (String) elementStack.pop();
+ if (!prev.equals(name))
+ throw new XPathException(qn_AST, "found closing tag: " + name + "; expected: " + prev);
+ elementWithoutAttributes_AST= (org.exist.xquery.parser.XQueryAST)astFactory.make( (new ASTArray(2)).add((org.exist.xquery.parser.XQueryAST)astFactory.create(ELEMENT,name)).add(content_AST));
+ if (!elementStack.isEmpty()) {
+ lexer.inElementContent= true;
+ //lexer.wsExplicit= false;
+ }
+
+ currentAST.root = elementWithoutAttributes_AST;
+ currentAST.child = elementWithoutAttributes_AST!=null &&elementWithoutAttributes_AST.getFirstChild()!=null ?
+ elementWithoutAttributes_AST.getFirstChild() : elementWithoutAttributes_AST;
+ currentAST.advanceChildToEnd();
+ }
+ }
+ break;
}
- }
- break;
- }
- case GT:
- {
+ default:
{
- match(GT);
- if ( inputState.guessing==0 ) {
-
- elementStack.push(name);
- lexer.inElementContent= true;
-
+ throw new NoViableAltException(LT(1), getFilename());
}
- mixedElementContent();
- content_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
- astFactory.addASTChild(currentAST, returnAST);
- match(END_TAG_START);
- name=qName();
- qn_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
- match(GT);
+ }
+ }
if ( inputState.guessing==0 ) {
elementWithoutAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+ elementWithoutAttributes_AST.copyLexInfo(q_AST);
+ }
+ elementWithoutAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+ }
+ catch (RecognitionException e) {
+ if (inputState.guessing==0) {
- if (elementStack.isEmpty())
- throw new XPathException(qn_AST, "found additional closing tag: " + name);
- String prev= (String) elementStack.pop();
- if (!prev.equals(name))
- throw new XPathException(qn_AST, "found closing tag: " + name + "; expected: " + prev);
- elementWithoutAttributes_AST= (org.exist.xquery.parser.XQueryAST)astFactory.make( (new ASTArray(2)).add((org.exist.xquery.parser.XQueryAST)astFactory.create(ELEMENT,name)).add(content_AST));
- if (!elementStack.isEmpty()) {
- lexer.inElementContent= true;
- //lexer.wsExplicit= false;
- }
-
- currentAST.root = elementWithoutAttributes_AST;
- currentAST.child = elementWithoutAttributes_AST!=null &&elementWithoutAttributes_AST.getFirstChild()!=null ?
- elementWithoutAttributes_AST.getFirstChild() : elementWithoutAttributes_AST;
- currentAST.advanceChildToEnd();
+ lexer.wsExplicit = false;
+ throw new XPathException(q_AST, "err:XPST0003: No closing end tag found for element constructor: " + name);
+
+ } else {
+ throw e;
}
- }
- break;
}
- default:
- {
- throw new NoViableAltException(LT(1), getFilename());
- }
- }
- }
- if ( inputState.guessing==0 ) {
- elementWithoutAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
- elementWithoutAttributes_AST.copyLexInfo(q_AST);
- }
- elementWithoutAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
returnAST = elementWithoutAttributes_AST;
}
Property changes on: branches/adam/eXist-acl/src/org/exist/xquery/pragmas/Optimize.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/adam/eXist-xq3/src/org/exist/xquery/pragmas/Optimize.java:13010-13060
/branches/wolfgang/src/org/exist/xquery/pragmas/Optimize.java:10658-11213
/stable/eXist-1.4.x/src/org/exist/xquery/pragmas/Optimize.java:13410
/trunk/eXist/nbproject/src/org/exist/xquery/pragmas/Optimize.java:8007-14504
/trunk/eXist/src/org/exist/xquery/pragmas/Optimize.java:14123-14501
+ /branches/adam/eXist-xq3/src/org/exist/xquery/pragmas/Optimize.java:13010-13060
/branches/wolfgang/src/org/exist/xquery/pragmas/Optimize.java:10658-11213
/stable/eXist-1.4.x/src/org/exist/xquery/pragmas/Optimize.java:13410
/trunk/eXist/nbproject/src/org/exist/xquery/pragmas/Optimize.java:8007-14504
/trunk/eXist/src/org/exist/xquery/pragmas/Optimize.java:14123-14590
Modified: branches/adam/eXist-acl/src/org/exist/xquery/update/Modification.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/xquery/update/Modification.java 2011-05-30 21:35:25 UTC (rev 14590)
+++ branches/adam/eXist-acl/src/org/exist/xquery/update/Modification.java 2011-05-31 09:48:14 UTC (rev 14591)
@@ -31,11 +31,13 @@
import org.exist.dom.DocumentImpl;
import org.exist.dom.DocumentSet;
import org.exist.dom.MutableDocumentSet;
+import org.exist.dom.NodeImpl;
import org.exist.dom.NodeIndexListener;
import org.exist.dom.NodeProxy;
import org.exist.dom.StoredNode;
import org.exist.memtree.DocumentBuilderReceiver;
import org.exist.memtree.MemTreeBuilder;
+import org.exist.numbering.NodeId;
import org.exist.security.PermissionDeniedException;
import org.exist.storage.DBBroker;
import org.exist.storage.StorageAddress;
@@ -59,6 +61,7 @@
import org.exist.xquery.value.Type;
import org.exist.xquery.value.ValueSequence;
import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
@@ -178,6 +181,14 @@
Sequence out = new ValueSequence();
for (SequenceIterator i = inSeq.iterate(); i.hasNext(); ) {
Item item = i.nextItem();
+ if (item.getType() == Type.DOCUMENT) {
+ if (((NodeValue)item).getImplementationType() == NodeValue.PERSISTENT_NODE) {
+ StoredNode root = (StoredNode) ((NodeProxy)item).getDocument().getDocumentElement();
+ item = new NodeProxy(root.getDocument(), root.getNodeId(), root.getInternalAddress());
+ } else {
+ item = (Item)((NodeValue) item).getOwnerDocument().getDocumentElement();
+ }
+ }
if (Type.subTypeOf(item.getType(), Type.NODE)) {
if (((NodeValue)item).getImplementationType() == NodeValue.PERSISTENT_NODE) {
int last = builder.getDocument().getLastNode();
Property changes on: branches/adam/eXist-acl/test/src/org/exist/dom/BasicNodeSetTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wolfgang/test/src/org/exist/dom/BasicNodeSetTest.java:10658-11213
/trunk/eXist/nbproject/test/src/org/exist/dom/BasicNodeSetTest.java:8007-14504
/trunk/eXist/test/src/org/exist/dom/BasicNodeSetTest.java:14123-14501
+ /branches/wolfgang/test/src/org/exist/dom/BasicNodeSetTest.java:10658-11213
/trunk/eXist/nbproject/test/src/org/exist/dom/BasicNodeSetTest.java:8007-14504
/trunk/eXist/test/src/org/exist/dom/BasicNodeSetTest.java:14123-14590
Property changes on: branches/adam/eXist-acl/test/src/org/exist/fulltext/FTIndexTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wolfgang/test/src/org/exist/fulltext/FTIndexTest.java:10658-11213
/trunk/eXist/nbproject/test/src/org/exist/fulltext/FTIndexTest.java:8007-14504
/trunk/eXist/test/src/org/exist/fulltext/FTIndexTest.java:14123-14501
+ /branches/wolfgang/test/src/org/exist/fulltext/FTIndexTest.java:10658-11213
/trunk/eXist/nbproject/test/src/org/exist/fulltext/FTIndexTest.java:8007-14504
/trunk/eXist/test/src/org/exist/fulltext/FTIndexTest.java:14123-14590
Property changes on: branches/adam/eXist-acl/test/src/org/exist/xquery/OptimizerTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wolfgang/test/src/org/exist/xquery/OptimizerTest.java:10658-11213
/trunk/eXist/nbproject/test/src/org/exist/xquery/OptimizerTest.java:8007-14504
/trunk/eXist/test/src/org/exist/xquery/OptimizerTest.java:14123-14501
+ /branches/wolfgang/test/src/org/exist/xquery/OptimizerTest.java:10658-11213
/trunk/eXist/nbproject/test/src/org/exist/xquery/OptimizerTest.java:8007-14504
/trunk/eXist/test/src/org/exist/xquery/OptimizerTest.java:14123-14590
Property changes on: branches/adam/eXist-acl/tools/Solaris
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/eXist/nbproject/tools/Solaris:8007-14504
/trunk/eXist/tools/Solaris:14123-14501
+ /trunk/eXist/nbproject/tools/Solaris:8007-14504
/trunk/eXist/tools/Solaris:14123-14590
Modified: branches/adam/eXist-acl/webapp/download.xml
===================================================================
--- branches/adam/eXist-acl/webapp/download.xml 2011-05-30 21:35:25 UTC (rev 14590)
+++ branches/adam/eXist-acl/webapp/download.xml 2011-05-31 09:48:14 UTC (rev 14591)
@@ -46,9 +46,9 @@
<emphasis>consulting</emphasis>, <emphasis>training</emphasis> or
<emphasis>first-hand support</emphasis> on a flexible basis. If interested,
please send an email to <ulink url="mailto:in...@ex..."
- >in...@ex...</ulink> and we will coordinate the requests. We are also
- ...
[truncated message content] |
|
From: <flo...@us...> - 2011-05-30 21:35:31
|
Revision: 14590
http://exist.svn.sourceforge.net/exist/?rev=14590&view=rev
Author: florentgeorges
Date: 2011-05-30 21:35:25 +0000 (Mon, 30 May 2011)
Log Message:
-----------
No need to tidy HTML, the EXPath Java library takes care of preparing the Source object with the appropriate parser.
Modified Paths:
--------------
trunk/eXist/extensions/expath/src/org/expath/httpclient/model/exist/EXistResult.java
Modified: trunk/eXist/extensions/expath/src/org/expath/httpclient/model/exist/EXistResult.java
===================================================================
--- trunk/eXist/extensions/expath/src/org/expath/httpclient/model/exist/EXistResult.java 2011-05-30 20:52:17 UTC (rev 14589)
+++ trunk/eXist/extensions/expath/src/org/expath/httpclient/model/exist/EXistResult.java 2011-05-30 21:35:25 UTC (rev 14590)
@@ -71,13 +71,8 @@
@Override
public void add(Source src) throws HttpClientException {
-
try {
- //TODO badly formed HTML needs tidying into XHTML - would be better
- //to have seperate methods for HTML and XML retrieval in EXPath.
-
- //NodeValue nodeValue = ModuleUtils.sourceToXML(context, src);
- NodeValue nodeValue = ModuleUtils.htmlToXHtml(context, "", src, null, null);
+ NodeValue nodeValue = ModuleUtils.sourceToXML(context, src);
result.add(nodeValue);
} catch(SAXException saxe) {
throw new HttpClientException("Unable to add Source to result:" + saxe.getMessage(), saxe);
@@ -101,4 +96,4 @@
public Sequence getResult() {
return result;
}
-}
\ No newline at end of file
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <del...@us...> - 2011-05-30 20:52:23
|
Revision: 14589
http://exist.svn.sourceforge.net/exist/?rev=14589&view=rev
Author: deliriumsky
Date: 2011-05-30 20:52:17 +0000 (Mon, 30 May 2011)
Log Message:
-----------
Updated
Property Changed:
----------------
branches/adam/eXist-acl/
Property changes on: branches/adam/eXist-acl
___________________________________________________________________
Modified: svn:ignore
- *.pack.gz
client.properties
junit*.properties
test
*.bak
exist.jar
key.store
*.tmp
TEST-org.exist.*.xml
start.jar
build
server.xml
mime-types.xml
exist-modules.jar
.settings
descriptor.xml
exist-optional.jar
examples.jar
.exist_query_history
exist-fluent.jar
.exist_history
dist
conf.xml
+ build
dist
private
.exist_history
.exist_query_history
Modified: svn:mergeinfo
- /branches/jmfg/res64-eXist:12887-13224
/trunk/eXist:14123-14501
+ /branches/jmfg/res64-eXist:12887-13224
/trunk/eXist:14123-14501
/trunk/eXist/nbproject:8007-14504
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ix...@us...> - 2011-05-30 20:52:03
|
Revision: 14588
http://exist.svn.sourceforge.net/exist/?rev=14588&view=rev
Author: ixitar
Date: 2011-05-30 20:51:57 +0000 (Mon, 30 May 2011)
Log Message:
-----------
[documentation] Adding information to the documentation style guide.
Modified Paths:
--------------
apps/docs/data/authors.xml
apps/docs/data/style.xml
Modified: apps/docs/data/authors.xml
===================================================================
--- apps/docs/data/authors.xml 2011-05-30 20:40:31 UTC (rev 14587)
+++ apps/docs/data/authors.xml 2011-05-30 20:51:57 UTC (rev 14588)
@@ -4,7 +4,7 @@
<info>
<title>Authors</title>
<authorgroup>
- <editor xml:id="ED.Loren.Cahlander">
+ <editor xml:id="ED.loren.cahlander">
<personname>
<honorific>Mr.</honorific>
<firstname>Loren</firstname>
@@ -17,7 +17,7 @@
<simpara/>
</personblurb>
</editor>
- <author xml:id="Loren.Cahlander">
+ <author xml:id="loren.cahlander">
<personname>
<honorific>Mr.</honorific>
<firstname>Loren</firstname>
Modified: apps/docs/data/style.xml
===================================================================
--- apps/docs/data/style.xml 2011-05-30 20:40:31 UTC (rev 14587)
+++ apps/docs/data/style.xml 2011-05-30 20:51:57 UTC (rev 14588)
@@ -1,26 +1,171 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?oxygen RNGSchema="http://www.oxygenxml.com/docbook/xml/5.0/rng/dbsvg.rng" type="xml"?>
+<?oxygen SCHSchema="../resources/schemas/docbook.xsd" type="xml"?>
<section xmlns="http://docbook.org/ns/docbook" xml:id="style">
- <title>Section Title</title>
- <para>An inline SVG graphic: <inlinemediaobject>
- <imageobject>
- <imagedata>
- <svg:svg xmlns:svg="http://www.w3.org/2000/svg" width="3cm" height="3cm" viewBox="0 0 400 400">
- <svg:g style="fill-opacity:0.7; stroke:black; stroke-width:0.1cm;">
- <svg:circle cx="6cm" cy="2cm" r="100" style="fill:red;" transform="translate(0,50)"/>
- <svg:circle cx="6cm" cy="2cm" r="100" style="fill:blue;" transform="translate(70,150)"/>
- <svg:circle cx="6cm" cy="2cm" r="100" style="fill:green;" transform="translate(-70,150)"/>
- </svg:g>
- </svg:svg>
- </imagedata>
- </imageobject>
- </inlinemediaobject>
- </para>
+ <info>
+ <revhistory>
+ <revision>
+ <date/>
+ <author xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/docs/author.xq?p=loren.cahlander"/>
+ <revdescription/>
+ </revision>
+ </revhistory>
+ <keywordset>
+ <keyword>style</keyword>
+ <keyword>formatting</keyword>
+ </keywordset>
+ </info>
+ <title>eXist DocBook Style Guide</title>
+ <para/>
+ <section>
+ <title>Revision History and Keywords</title>
+ <para>Each section of documentation requires a revision history indicating what changes were
+ made, when and by whom. This information is supplied by the <emphasis role="bold"><revhistory></emphasis> tag under the <emphasis role="bold"><info></emphasis>
+ tag. Since a contributor is likely to contribute to more than one section of
+ documentation over time, then it is advisable that the authors be maintianed in a
+ separate file and to utilize a reference to an entry into that file.</para>
+ <programlisting language="xml"><![CDATA[<info>
+ <revhistory>
+ <revision>
+ <date/>
+ <author xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="authors.xml?p=john.doe"/>
+ <revdescription/>
+ </revision>
+ </revhistory>
+ <keywordset>
+ <keyword></keyword>
+ </keywordset>
+</info>]]></programlisting>
+ <para>The sections will have keywords embedded into the info section. That will allow the
+ search engine to organize the sections by keyword as well a being maintained in a book
+ format.</para>
+ </section>
+ <section>
+ <title>Note</title>
+ <para>
+ <note>
+ <simpara>
+ Hello world
+ </simpara>
+ </note>
+ <programlisting language="xml"><![CDATA[<note>
+ <simpara>
+ Hello world
+ </simpara>
+</note>]]></programlisting>
+ </para>
+ </section>
+ <section>
+ <title>Warning</title>
+ <para>
+ <warning>
+ <simpara>
+ Hello world
+ </simpara>
+ </warning>
+ <programlisting language="xml"><![CDATA[<warning>
+ <simpara>
+ Hello world
+ </simpara>
+</warning>]]></programlisting>
+ </para>
+ </section>
+ <section>
+ <title>Program Listing</title>
+ <para>
+ <programlisting language="XQuery"><![CDATA[for $address in //address
+return
+ (: Move lname and fname into a new name element :)
+ update replace $address with
+ <address>
+ <name>
+ <family>{$address/lname/text()}</family>
+ <given>{$address/fname/text()}</given>
+ </name>
+ {$address/city, $address/email}
+ </address>]]></programlisting>
+ <programlisting><![CDATA[<programlisting language="XQuery"><![CDATA[
+for $address in //address
+return
+ (: Move lname and fname into a new name element :)
+ update replace $address with
+ <address>
+ <name>
+ <family>{$address/lname/text()}</family>
+ <given>{$address/fname/text()}</given>
+ </name>
+ {$address/city, $address/email}
+ </address>
+]]]]><![CDATA[></programlisting>]]></programlisting>
+ </para>
+ </section>
+ <section>
+ <title>Images</title>
+ <para>All images should use the DocBook <emphasis role="bold"><figure></emphasis>
+ element.</para>
+ <para>Images for each document should be stored in a “images” sub-directory or
+ sub-collection in the collection that contains each document.</para>
+ <para>Use  <emphasis role="bold"><mediaobjects></emphasis> not inlinemediaobjects to
+ store large images that should be centered on the page.</para>
+ <para>Use inlinemediaobject to in-line versions are for when you want a small imageliterally
+ in a line of text (e.g., if you want to put an icon in running text.It would be the same
+ as above, just replace example with figure. By using figure for the imagesand example
+ for the programlistings, we can do things like wrap thefigure in a box so it's not
+ mistaken for running text.</para>
+ <para>This is needed so that the output processors can put a box around the figures and
+ centered them.</para>
+ <section>
+ <title>Scalar Vector Graphics (SVG)</title>
+ <para/>
+ <figure>
+ <info>
+ <title/>
+ </info>
+ <mediaobject>
+ <info>
+ <revhistory>
+ <revision>
+ <date/>
+ <author>
+ <personname>
+ <firstname/>
+ <surname/>
+ </personname>
+ <email/>
+ </author>
+ <revdescription/>
+ </revision>
+ </revhistory>
+ </info>
+ <imageobject>
+ <imagedata>
+ <svg:svg xmlns:svg="http://www.w3.org/2000/svg" width="3cm" height="3cm" viewBox="0 0 400 400">
+ <svg:g style="fill-opacity:0.7; stroke:black; stroke-width:0.1cm;">
+ <svg:circle cx="6cm" cy="2cm" r="100" style="fill:red;" transform="translate(0,50)"/>
+ <svg:circle cx="6cm" cy="2cm" r="100" style="fill:blue;" transform="translate(70,150)"/>
+ <svg:circle cx="6cm" cy="2cm" r="100" style="fill:green;" transform="translate(-70,150)"/>
+ </svg:g>
+ </svg:svg>
+ </imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para/>
+ <programlisting language="xml"><![CDATA[<figure>
+ <info>
+ <title></title>
+ </info>
<mediaobject>
<info>
<revhistory>
<revision>
<date/>
+ <author>
+ <personname>
+ <firstname></firstname>
+ <surname></surname>
+ </personname>
+ <email></email>
+ </author>
<revdescription/>
</revision>
</revhistory>
@@ -37,4 +182,7 @@
</imagedata>
</imageobject>
</mediaobject>
+</figure>]]></programlisting>
+ </section>
+ </section>
</section>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <del...@us...> - 2011-05-30 20:40:37
|
Revision: 14587
http://exist.svn.sourceforge.net/exist/?rev=14587&view=rev
Author: deliriumsky
Date: 2011-05-30 20:40:31 +0000 (Mon, 30 May 2011)
Log Message:
-----------
Set nbproject to use aspectj task
Modified Paths:
--------------
branches/adam/eXist-acl/nbproject/build-impl.xml
branches/adam/eXist-acl/nbproject/project.properties
Modified: branches/adam/eXist-acl/nbproject/build-impl.xml
===================================================================
--- branches/adam/eXist-acl/nbproject/build-impl.xml 2011-05-30 20:32:33 UTC (rev 14586)
+++ branches/adam/eXist-acl/nbproject/build-impl.xml 2011-05-30 20:40:31 UTC (rev 14587)
@@ -674,10 +674,32 @@
<fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
</copy>
</target>
- <target name="-post-compile">
+ <target name="-post-compile" depends="aspectj">
<!-- Empty placeholder for easier customization. -->
<!-- You can override this target in the ../build.xml file. -->
</target>
+
+ <taskdef classpath="tools/aspectj/lib/aspectjtools-1.6.11.jar"
+ resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties"/>
+
+<!-- Add an AspectJ build target -->
+<target name="aspectj">
+ <echo level="info">--- aspectj (start) ---</echo>
+ <iajc
+ destdir="${build.classes.dir}"
+ source="${javac.source}"
+ target="${javac.target}"
+ classpath="${javac.classpath}:${j2ee.platform.classpath}"
+ deprecation="${javac.deprecation}"
+ encoding="${source.encoding}"
+ debug="${javac.debug}" showWeaveInfo="true">
+ <inpath>
+ <pathelement location="${build.classes.dir}" />
+ </inpath>
+ </iajc>
+</target>
+
+
<target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
<target name="-pre-compile-single">
<!-- Empty placeholder for easier customization. -->
Modified: branches/adam/eXist-acl/nbproject/project.properties
===================================================================
--- branches/adam/eXist-acl/nbproject/project.properties 2011-05-30 20:32:33 UTC (rev 14586)
+++ branches/adam/eXist-acl/nbproject/project.properties 2011-05-30 20:40:31 UTC (rev 14587)
@@ -1,3 +1,6 @@
+file.reference.aspectjrt-1.6.11.jar=tools/aspectj/lib/aspectjrt-1.6.11.jar
+file.reference.aspectjtools-1.6.11.jar=tools/aspectj/lib/aspectjtools-1.6.11.jar
+file.reference.aspectjweaver-1.6.11.jar=tools/aspectj/lib/aspectjweaver-1.6.11.jar
file.reference.cglib-nodep-2.2.jar=lib/test/cglib-nodep-2.2.jar
file.reference.commons-net-2.2.jar=lib/optional/commons-net-2.2.jar
file.reference.mina-core-2.0.2.jar=extensions/debuggee/lib/mina-core-2.0.2.jar
@@ -259,7 +262,10 @@
${file.reference.objenesis-1.2.jar}:\
${file.reference.easymock-2.5.2.jar}:\
${file.reference.easymockclassextension-2.5.2.jar}:\
- ${file.reference.commons-net-2.2.jar}
+ ${file.reference.commons-net-2.2.jar}:\
+ ${file.reference.aspectjrt-1.6.11.jar}:\
+ ${file.reference.aspectjtools-1.6.11.jar}:\
+ ${file.reference.aspectjweaver-1.6.11.jar}
file.reference.samples-src=samples/src
build.classes.dir=${build.dir}/classes
eXist-1.32.dir=${file.reference.samples-src}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <del...@us...> - 2011-05-30 20:32:40
|
Revision: 14586
http://exist.svn.sourceforge.net/exist/?rev=14586&view=rev
Author: deliriumsky
Date: 2011-05-30 20:32:33 +0000 (Mon, 30 May 2011)
Log Message:
-----------
[bugfix] Ensure correct number of bytes are skipped when reading document metadata with new permissions system
Modified Paths:
--------------
branches/adam/eXist-acl/src/org/exist/dom/DocumentImpl.java
branches/adam/eXist-acl/src/org/exist/dom/DocumentTypeImpl.java
Modified: branches/adam/eXist-acl/src/org/exist/dom/DocumentImpl.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/dom/DocumentImpl.java 2011-05-30 19:45:38 UTC (rev 14585)
+++ branches/adam/eXist-acl/src/org/exist/dom/DocumentImpl.java 2011-05-30 20:32:33 UTC (rev 14586)
@@ -39,7 +39,6 @@
import org.exist.storage.lock.Lock;
import org.exist.storage.lock.MultiReadReentrantLock;
import org.exist.storage.txn.Txn;
-import org.exist.util.SyntaxException;
import org.exist.xmldb.XmldbURI;
import org.exist.xquery.Constants;
import org.exist.xquery.DescendantSelector;
@@ -64,6 +63,7 @@
import java.io.EOFException;
import java.io.IOException;
import java.util.Iterator;
+import org.exist.security.ACLPermission;
import org.exist.security.Subject;
/**
@@ -547,10 +547,20 @@
try {
istream.skip(1); //docId
istream.readUTF(); //fileURI.toString()
- istream.skip(2 + 2); //uid, gid
- istream.skip(children * 2);
+
+ //istream.skip(2 + 2); //uid, gid, mode, children count
+ istream.skip(1); //unix style permission uses a single long
+ if(permissions instanceof ACLPermission) {
+ int aceCount = istream.read();
+ istream.skip(aceCount);
+ }
+
+ istream.skip(1); //children size
+ istream.skip(children * 2); //actual children
+
metadata = new DocumentMetadata();
metadata.read(pool, istream);
+
} catch (IOException e) {
LOG.error("IO error while reading document metadata for " + fileURI, e);
//TODO : raise exception ?
Modified: branches/adam/eXist-acl/src/org/exist/dom/DocumentTypeImpl.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/dom/DocumentTypeImpl.java 2011-05-30 19:45:38 UTC (rev 14585)
+++ branches/adam/eXist-acl/src/org/exist/dom/DocumentTypeImpl.java 2011-05-30 20:32:33 UTC (rev 14586)
@@ -18,10 +18,8 @@
package org.exist.dom;
-import java.io.DataOutput;
import java.io.IOException;
-import org.exist.storage.io.VariableByteArrayInput;
import org.exist.storage.io.VariableByteInput;
import org.exist.storage.io.VariableByteOutputStream;
@@ -59,6 +57,7 @@
this.name = null;
}
+ @Override
public String getName() {
return name;
}
@@ -68,6 +67,7 @@
return false;
}
+ @Override
public String getPublicId() {
return publicId;
}
@@ -76,6 +76,7 @@
this.publicId = publicId;
}
+ @Override
public String getSystemId() {
return systemId;
}
@@ -84,24 +85,21 @@
this.systemId = systemId;
}
+ @Override
public NamedNodeMap getEntities() {
return null;
}
+ @Override
public NamedNodeMap getNotations() {
return null;
}
+ @Override
public String getInternalSubset() {
return null;
}
- protected void write(DataOutput ostream) throws IOException {
- ostream.writeUTF(name);
- ostream.writeUTF(systemId != null ? systemId : "");
- ostream.writeUTF(publicId != null ? publicId : "");
- }
-
protected void write(VariableByteOutputStream ostream) throws IOException {
ostream.writeUTF(name);
ostream.writeUTF(systemId != null ? systemId : "");
@@ -111,13 +109,23 @@
protected void read(VariableByteInput istream) throws IOException {
name = istream.readUTF();
systemId = istream.readUTF();
- if (systemId.length() == 0)
+ if(systemId.length() == 0) {
systemId = null;
+ }
publicId = istream.readUTF();
- if (publicId.length() == 0)
+ if(publicId.length() == 0) {
publicId = null;
+ }
}
+ /*
+ protected void write(DataOutput ostream) throws IOException {
+ ostream.writeUTF(name);
+ ostream.writeUTF(systemId != null ? systemId : "");
+ ostream.writeUTF(publicId != null ? publicId : "");
+ }*/
+
+ /*
protected void read(VariableByteArrayInput istream) throws IOException {
name = istream.readUTF();
systemId = istream.readUTF();
@@ -127,4 +135,5 @@
if (publicId.length() == 0)
publicId = null;
}
-}
+ */
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2011-05-30 19:45:45
|
Revision: 14585
http://exist.svn.sourceforge.net/exist/?rev=14585&view=rev
Author: dizzzz
Date: 2011-05-30 19:45:38 +0000 (Mon, 30 May 2011)
Log Message:
-----------
[ignore] attempts to get things fixed
Modified Paths:
--------------
trunk/eXist/build/scripts/static-docs.xml
Modified: trunk/eXist/build/scripts/static-docs.xml
===================================================================
--- trunk/eXist/build/scripts/static-docs.xml 2011-05-30 19:14:51 UTC (rev 14584)
+++ trunk/eXist/build/scripts/static-docs.xml 2011-05-30 19:45:38 UTC (rev 14585)
@@ -144,7 +144,6 @@
<get src="${url}/building.xml" dest="${build.docs.html}/building.html"/>
<get src="${url}/client.xml" dest="${build.docs.html}/client.html"/>
<get src="${url}/cluster.xml" dest="${build.docs.html}/cluster.html"/>
- <get src="${url}/configuration.xml" dest="${build.docs.html}/configuration.html"/>
<get src="${url}/config-cache.xml" dest="${build.docs.html}/config-cache.html"/>
<get src="${url}/config-compression.xml" dest="${build.docs.html}/config-compression.html"/>
<get src="${url}/config-context.xml" dest="${build.docs.html}/config-context.html"/>
@@ -157,16 +156,17 @@
<get src="${url}/config-versioning.xml" dest="${build.docs.html}/config-versioning.html"/>
<get src="${url}/config-xqdoc.xml" dest="${build.docs.html}/config-xqdoc.html"/>
<get src="${url}/config-xslt.xml" dest="${build.docs.html}/config-xslt.html"/>
+ <get src="${url}/configuration.xml" dest="${build.docs.html}/configuration.html"/>
<get src="${url}/credits.xml" dest="${build.docs.html}/credits.html"/>
<get src="${url}/debugger.xml" dest="${build.docs.html}/debugger.html"/>
<get src="${url}/deployment.xml" dest="${build.docs.html}/deployment.html"/>
+ <get src="${url}/devguide.xml" dest="${build.docs.html}/devguide.html"/>
<get src="${url}/devguide_codereview.xml" dest="${build.docs.html}/devguide_codereview.html"/>
<get src="${url}/devguide_indexes.xml" dest="${build.docs.html}/devguide_indexes.html"/>
<get src="${url}/devguide_log4j.xml" dest="${build.docs.html}/devguide_log4j.html"/>
<get src="${url}/devguide_manifesto.xml" dest="${build.docs.html}/devguide_manifesto.html"/>
<get src="${url}/devguide_rest.xml" dest="${build.docs.html}/devguide_rest.html"/>
<get src="${url}/devguide_soap.xml" dest="${build.docs.html}/devguide_soap.html"/>
- <get src="${url}/devguide.xml" dest="${build.docs.html}/devguide.html"/>
<get src="${url}/devguide_xmldb.xml" dest="${build.docs.html}/devguide_xmldb.html"/>
<get src="${url}/devguide_xmlrpc.xml" dest="${build.docs.html}/devguide_xmlrpc.html"/>
<get src="${url}/devguide_xquery.xml" dest="${build.docs.html}/devguide_xquery.html"/>
@@ -178,10 +178,10 @@
<get src="${url}/extensions.xml" dest="${build.docs.html}/extensions.html"/>
<get src="${url}/facts.xml" dest="${build.docs.html}/facts.html"/>
<get src="${url}/ftlegacy.xml" dest="${build.docs.html}/ftlegacy.html"/>
- <get src="${url}/function_modules.xml" dest="${build.docs.html}/function_modules.xml.html"/>
+ <get src="${url}/function_modules.xml" dest="${build.docs.html}/function_modules.html"/>
<get src="${url}/header.xml" dest="${build.docs.html}/header.html"/>
+ <get src="${url}/index.xml" dest="${build.docs.html}/index.html"/>
<get src="${url}/indexing.xml" dest="${build.docs.html}/indexing.html"/>
- <get src="${url}/index.xml" dest="${build.docs.html}/index.html"/>
<get src="${url}/installing-exist-on-amazon-ec2.xml" dest="${build.docs.html}/installing-exist-on-amazon-ec2.html"/>
<get src="${url}/jmx.xml" dest="${build.docs.html}/jmx.html"/>
<get src="${url}/journal.xml" dest="${build.docs.html}/journal.html"/>
@@ -198,12 +198,13 @@
<get src="${url}/security.xml" dest="${build.docs.html}/security.html"/>
<get src="${url}/sidebar.xml" dest="${build.docs.html}/sidebar.html"/>
<get src="${url}/template.xml" dest="${build.docs.html}/template.html"/>
+ <mkdir dir="${build.docs.html}/testing"/>
+ <get src="${url}/testing/testing.xml" dest="${build.docs.html}/testing/testing.html"/>
<get src="${url}/triggers.xml" dest="${build.docs.html}/triggers.html"/>
<get src="${url}/tuning.xml" dest="${build.docs.html}/tuning.html"/>
<get src="${url}/ubuntu-server.xml" dest="${build.docs.html}/ubuntu-server.html"/>
<get src="${url}/update_ext.xml" dest="${build.docs.html}/update_ext.html"/>
<get src="${url}/upgrading.xml" dest="${build.docs.html}/upgrading.html"/>
- <get src="${url}/urlrewrite.xml" dest="${build.docs.html}/urlrewrite.html"/>
<get src="${url}/validation.xml" dest="${build.docs.html}/validation.html"/>
<get src="${url}/versioning.xml" dest="${build.docs.html}/versioning.html"/>
<get src="${url}/webdav.xml" dest="${build.docs.html}/webdav.html"/>
@@ -212,23 +213,23 @@
<get src="${url}/xacml-intro.xml" dest="${build.docs.html}/xacml-intro.html"/>
<get src="${url}/xacml-usage.xml" dest="${build.docs.html}/xacml-usage.html"/>
<get src="${url}/xacml.xml" dest="${build.docs.html}/xacml.html"/>
+ <mkdir dir="${build.docs.html}/xforms"/>
+ <get src="${url}/xforms/examples.xml" dest="${build.docs.html}/xforms/examples.html"/>
+ <get src="${url}/xforms/hello.xml" dest="${build.docs.html}/xforms/hello.html"/>
+ <get src="${url}/xforms/hello2.xml" dest="${build.docs.html}/xforms/hello2.html"/>
+ <get src="${url}/xforms/shakespeare.xml" dest="${build.docs.html}/xforms/shakespeare.html"/>
+ <!--get src="${url}/xforms/tasks/sidebar.xml" dest="${build.docs.html}/xforms/tasks/sidebar.html"/-->
+ <!--get src="${url}/xforms/tasks/todo-list.xml" dest="${build.docs.html}/xforms/tasks/todo-list.html"/>
+ <get src="${url}/xforms/tasks/todo-projects.xml" dest="${build.docs.html}/xforms/tasks/todo-projects.html"/-->
+ <get src="${url}/xforms/xforms.xml" dest="${build.docs.html}/xforms/xforms.html"/>
<get src="${url}/xinclude.xml" dest="${build.docs.html}/xinclude.html"/>
<get src="${url}/xmlprague06.xml" dest="${build.docs.html}/xmlprague06.html"/>
- <get src="${url}/xquery.xml" dest="${build.docs.html}/xquery.html"/>
-
-
- <mkdir dir="${build.docs.html}/xforms"/>
- <get src="${url}/xforms/xforms.xml" dest="${build.docs.html}/xforms/xforms.html"/>
+
<mkdir dir="${build.docs.html}/xproc"/>
<!--get src='${url}/xproc/xproc.xml' dest='${build.docs.html}/xproc/xproc.html'/-->
- <!--mkdir dir="${build.docs.html}/gsoc"/>
- <mkdir dir="${build.docs.html}/gsoc/2008"/>
- <get src='${url}/gsoc/2008/summer.xml' dest='${build.docs.html}/gsoc/2008/summer.html'/-->
<mkdir dir="${build.docs.html}/repo"/>
<get src="${url}/repo/repo.xml" dest="${build.docs.html}/repo/repo.html"/>
-
- <mkdir dir="${build.docs.html}/testing"/>
- <get src="${url}/testing/testing.xml" dest="${build.docs.html}/testing/testing.html"/>
+
</target>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2011-05-30 19:14:57
|
Revision: 14584
http://exist.svn.sourceforge.net/exist/?rev=14584&view=rev
Author: dizzzz
Date: 2011-05-30 19:14:51 +0000 (Mon, 30 May 2011)
Log Message:
-----------
[ignore] attempts to get things fixed
Modified Paths:
--------------
trunk/eXist/webapp/urlrewrite/style.xql
trunk/eXist/webapp/xquery/biblio.xml
Modified: trunk/eXist/webapp/urlrewrite/style.xql
===================================================================
--- trunk/eXist/webapp/urlrewrite/style.xql 2011-05-30 18:07:48 UTC (rev 14583)
+++ trunk/eXist/webapp/urlrewrite/style.xql 2011-05-30 19:14:51 UTC (rev 14584)
@@ -46,7 +46,7 @@
if (matches($link/@href, "^\w+://")) then
$link/@href/string()
else
- concat($node/@base, "/", $link/@href)
+ concat($node/@base, "/", ($link/@href)[0])
return
<li><a href="{$href}">{$link/string()}</a></li>
}
Modified: trunk/eXist/webapp/xquery/biblio.xml
===================================================================
--- trunk/eXist/webapp/xquery/biblio.xml 2011-05-30 18:07:48 UTC (rev 14583)
+++ trunk/eXist/webapp/xquery/biblio.xml 2011-05-30 19:14:51 UTC (rev 14584)
@@ -8,7 +8,7 @@
<xi:include href="header.xml"/>
<!-- include sidebar -->
- <xi:include href="sidebar.xml"/>
+ <xi:include href="../sidebar.xml"/>
<body>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <del...@us...> - 2011-05-30 18:07:57
|
Revision: 14583
http://exist.svn.sourceforge.net/exist/?rev=14583&view=rev
Author: deliriumsky
Date: 2011-05-30 18:07:48 +0000 (Mon, 30 May 2011)
Log Message:
-----------
[refactor] Permission modifications are now aggressively checked via AOP (moving toward the idea of a Single Responsibility pattern for a Permission). The Permission implementation is now responsible for checking access rights when it is updated.
Modified Paths:
--------------
branches/adam/eXist-acl/build.properties
branches/adam/eXist-acl/extensions/fluent/src/org/exist/fluent/Document.java
branches/adam/eXist-acl/extensions/fluent/src/org/exist/fluent/Folder.java
branches/adam/eXist-acl/extensions/fluent/src/org/exist/fluent/NamedResource.java
branches/adam/eXist-acl/extensions/fluent/test/src/org/exist/fluent/MetadataTest.java
branches/adam/eXist-acl/extensions/modules/src/org/exist/xquery/modules/expathrepo/Deploy.java
branches/adam/eXist-acl/src/org/exist/atom/modules/AtomProtocol.java
branches/adam/eXist-acl/src/org/exist/backup/SystemExport.java
branches/adam/eXist-acl/src/org/exist/client/ResourcePropertyDialog.java
branches/adam/eXist-acl/src/org/exist/client/messages.properties
branches/adam/eXist-acl/src/org/exist/client/messages_es_ES.properties
branches/adam/eXist-acl/src/org/exist/client/messages_fr_FR.properties
branches/adam/eXist-acl/src/org/exist/client/messages_it_IT.properties
branches/adam/eXist-acl/src/org/exist/client/messages_nb_NO.properties
branches/adam/eXist-acl/src/org/exist/client/messages_nl_NL.properties
branches/adam/eXist-acl/src/org/exist/client/messages_no.properties
branches/adam/eXist-acl/src/org/exist/client/messages_ru_RU.properties
branches/adam/eXist-acl/src/org/exist/client/messages_sv_SE.properties
branches/adam/eXist-acl/src/org/exist/client/messages_zh_CN.properties
branches/adam/eXist-acl/src/org/exist/cluster/ClusterCollection.java
branches/adam/eXist-acl/src/org/exist/collections/Collection.java
branches/adam/eXist-acl/src/org/exist/dom/BinaryDocument.java
branches/adam/eXist-acl/src/org/exist/dom/DocumentImpl.java
branches/adam/eXist-acl/src/org/exist/security/AbstractUnixStylePermission.java
branches/adam/eXist-acl/src/org/exist/security/Permission.java
branches/adam/eXist-acl/src/org/exist/security/PermissionFactory.java
branches/adam/eXist-acl/src/org/exist/security/UnixStylePermission.java
branches/adam/eXist-acl/src/org/exist/security/internal/aider/UnixStylePermissionAider.java
branches/adam/eXist-acl/src/org/exist/security/utils/Utils.java
branches/adam/eXist-acl/src/org/exist/storage/NativeBroker.java
branches/adam/eXist-acl/src/org/exist/storage/NativeClusterBroker.java
branches/adam/eXist-acl/src/org/exist/xmldb/LocalUserManagementService.java
branches/adam/eXist-acl/src/org/exist/xquery/functions/xmldb/XMLDBSetCollectionPermissions.java
branches/adam/eXist-acl/src/org/exist/xquery/functions/xmldb/XMLDBSetResourcePermissions.java
branches/adam/eXist-acl/test/src/org/exist/dom/DocumentImplTest.java
branches/adam/eXist-acl/test/src/org/exist/security/UnixStylePermissionTest.java
Added Paths:
-----------
branches/adam/eXist-acl/src/org/exist/security/PermissionRequired.java
branches/adam/eXist-acl/src/org/exist/security/PermissionRequiredAspect.java
Modified: branches/adam/eXist-acl/build.properties
===================================================================
--- branches/adam/eXist-acl/build.properties 2011-05-30 18:02:35 UTC (rev 14582)
+++ branches/adam/eXist-acl/build.properties 2011-05-30 18:07:48 UTC (rev 14583)
@@ -29,6 +29,9 @@
# Ant
tools.ant = ./tools/ant
+#aspectj
+tools.aspectj = ./tools/aspectj
+
# Common libs
lib.core = ./lib/core
lib.optional = ./lib/optional
Modified: branches/adam/eXist-acl/extensions/fluent/src/org/exist/fluent/Document.java
===================================================================
--- branches/adam/eXist-acl/extensions/fluent/src/org/exist/fluent/Document.java 2011-05-30 18:02:35 UTC (rev 14582)
+++ branches/adam/eXist-acl/extensions/fluent/src/org/exist/fluent/Document.java 2011-05-30 18:07:48 UTC (rev 14583)
@@ -125,8 +125,8 @@
*/
public static class MetadataFacet extends NamedResource.MetadataFacet {
private final DocumentMetadata docMetadata;
- private MetadataFacet(Permission permissions, DocumentMetadata docMetadata) {
- super(permissions);
+ private MetadataFacet(Permission permissions, DocumentMetadata docMetadata, Database db) {
+ super(permissions, db);
this.docMetadata = docMetadata;
}
@Override public Date creationDate() {return new Date(docMetadata.getCreated());}
@@ -197,7 +197,7 @@
}
@Override public MetadataFacet metadata() {
- if (metadata == null) metadata = new MetadataFacet(doc.getPermissions(), doc.getMetadata());
+ if (metadata == null) metadata = new MetadataFacet(doc.getPermissions(), doc.getMetadata(), db);
return metadata;
}
Modified: branches/adam/eXist-acl/extensions/fluent/src/org/exist/fluent/Folder.java
===================================================================
--- branches/adam/eXist-acl/extensions/fluent/src/org/exist/fluent/Folder.java 2011-05-30 18:02:35 UTC (rev 14582)
+++ branches/adam/eXist-acl/extensions/fluent/src/org/exist/fluent/Folder.java 2011-05-30 18:07:48 UTC (rev 14583)
@@ -645,7 +645,7 @@
}
@Override public MetadataFacet metadata() {
- if (metadata == null) metadata = new MetadataFacet(getQuickHandle().getPermissionsNoLock()) {
+ if (metadata == null) metadata = new MetadataFacet(getQuickHandle().getPermissionsNoLock(), db) {
@Override public Date creationDate() {
return new Date(getQuickHandle().getCreationTime());
}
Modified: branches/adam/eXist-acl/extensions/fluent/src/org/exist/fluent/NamedResource.java
===================================================================
--- branches/adam/eXist-acl/extensions/fluent/src/org/exist/fluent/NamedResource.java 2011-05-30 18:02:35 UTC (rev 14582)
+++ branches/adam/eXist-acl/extensions/fluent/src/org/exist/fluent/NamedResource.java 2011-05-30 18:07:48 UTC (rev 14583)
@@ -4,6 +4,8 @@
import java.util.regex.*;
import org.exist.security.Permission;
+import org.exist.security.PermissionDeniedException;
+import org.exist.storage.DBBroker;
/**
* A named resource in the contents tree of the database: either a folder or a document.
@@ -24,9 +26,11 @@
private static final Pattern SEGMENT_REGEX = Pattern.compile("([augo]+)([-+=])([rwu]*)");
private Permission permissions;
-
- protected MetadataFacet(Permission permissions) {
+ private final Database db;
+
+ protected MetadataFacet(Permission permissions, Database db) {
this.permissions = permissions;
+ this.db = db;
}
/**
@@ -48,7 +52,19 @@
*
* @param owner the new owner of this resource
*/
- public void owner(String owner) {permissions.setOwner(owner);}
+ public void owner(String owner) {
+ DBBroker broker = null;
+ try {
+ broker = db.acquireBroker();
+ permissions.setOwner(owner);
+ } catch(PermissionDeniedException pde) {
+ throw new DatabaseException(pde.getMessage(), pde);
+ } finally {
+ if(broker != null) {
+ db.releaseBroker(broker);
+ }
+ }
+ }
/**
* Return the group who has privileged access to this resource for purposes of permission management.
@@ -62,7 +78,19 @@
*
* @param group the new owning group of this resource
*/
- public void group(String group) {permissions.setGroup(group);}
+ public void group(String group) {
+ DBBroker broker = null;
+ try {
+ broker = db.acquireBroker();
+ permissions.setGroup(group);
+ } catch(PermissionDeniedException pde) {
+ throw new DatabaseException(pde.getMessage(), pde);
+ } finally {
+ if(broker != null) {
+ db.releaseBroker(broker);
+ }
+ }
+ }
/**
* Return whether the given subject has the given permission. The "who" character refers to
@@ -133,27 +161,32 @@
* @param instructions an instruction string encoding the desired changes to the permissions
*/
public void changePermissions(String instructions) {
- if (!INSTRUCTIONS_REGEX.matcher(instructions).matches())
- throw new IllegalArgumentException("bad permissions instructions: " + instructions);
- StringTokenizer tokenizer = new StringTokenizer(instructions, ",");
- while (tokenizer.hasMoreTokens()) {
- Matcher matcher = SEGMENT_REGEX.matcher(tokenizer.nextToken());
- if (!matcher.matches()) throw new RuntimeException("internal error: illegal segment got through syntax regex, instruction string " + instructions);
- int perms = convertPermissionBits(matcher.group(3));
- int mask = 0;
- boolean all = matcher.group(1).equals("a");
- if (all || matcher.group(1).indexOf('u') != -1) mask |= perms << 6;
- if (all || matcher.group(1).indexOf('g') != -1) mask |= perms << 3;
- if (all || matcher.group(1).indexOf('o') != -1) mask |= perms;
- int newPerms;
- switch(matcher.group(2).charAt(0)) {
- case '=': newPerms = mask; break;
- case '+': newPerms = permissions.getMode() | mask;
- case '-': newPerms = permissions.getMode() & ~mask;
- default: throw new RuntimeException("internal error: illegal segment operator got through syntax regex, instruction string " + instructions);
- }
- permissions.setMode(newPerms);
- }
+ if (!INSTRUCTIONS_REGEX.matcher(instructions).matches())
+ throw new IllegalArgumentException("bad permissions instructions: " + instructions);
+ StringTokenizer tokenizer = new StringTokenizer(instructions, ",");
+
+ try {
+ while (tokenizer.hasMoreTokens()) {
+ Matcher matcher = SEGMENT_REGEX.matcher(tokenizer.nextToken());
+ if (!matcher.matches()) throw new RuntimeException("internal error: illegal segment got through syntax regex, instruction string " + instructions);
+ int perms = convertPermissionBits(matcher.group(3));
+ int mask = 0;
+ boolean all = matcher.group(1).equals("a");
+ if (all || matcher.group(1).indexOf('u') != -1) mask |= perms << 6;
+ if (all || matcher.group(1).indexOf('g') != -1) mask |= perms << 3;
+ if (all || matcher.group(1).indexOf('o') != -1) mask |= perms;
+ int newPerms;
+ switch(matcher.group(2).charAt(0)) {
+ case '=': newPerms = mask; break;
+ case '+': newPerms = permissions.getMode() | mask;
+ case '-': newPerms = permissions.getMode() & ~mask;
+ default: throw new RuntimeException("internal error: illegal segment operator got through syntax regex, instruction string " + instructions);
+ }
+ permissions.setMode(newPerms);
+ }
+ } catch(PermissionDeniedException pde) {
+ throw new DatabaseException(pde.getMessage(), pde);
+ }
}
public String toString() {
Modified: branches/adam/eXist-acl/extensions/fluent/test/src/org/exist/fluent/MetadataTest.java
===================================================================
--- branches/adam/eXist-acl/extensions/fluent/test/src/org/exist/fluent/MetadataTest.java 2011-05-30 18:02:35 UTC (rev 14582)
+++ branches/adam/eXist-acl/extensions/fluent/test/src/org/exist/fluent/MetadataTest.java 2011-05-30 18:07:48 UTC (rev 14583)
@@ -102,7 +102,7 @@
@Test public void topFolderOwner() {
Folder folder = db.getFolder("/");
- assertEquals("admin", folder.metadata().owner());
+ assertEquals("SYSTEM", folder.metadata().owner());
folder.metadata().owner("guest");
assertEquals("guest", folder.metadata().owner());
}
Modified: branches/adam/eXist-acl/extensions/modules/src/org/exist/xquery/modules/expathrepo/Deploy.java
===================================================================
--- branches/adam/eXist-acl/extensions/modules/src/org/exist/xquery/modules/expathrepo/Deploy.java 2011-05-30 18:02:35 UTC (rev 14582)
+++ branches/adam/eXist-acl/extensions/modules/src/org/exist/xquery/modules/expathrepo/Deploy.java 2011-05-30 18:07:48 UTC (rev 14583)
@@ -406,19 +406,25 @@
* @param mime
* @param permission
*/
- private void setPermissions(MimeType mime, Permission permission) {
- if (user != null)
- permission.setOwner(user);
- if (group != null)
- permission.setGroup(group);
- int mode;
- if (perms > -1)
- mode = perms;
- else
- mode = permission.getMode();
- if (mime != null && mime.getName().equals(MimeType.XQUERY_TYPE.getName()))
- mode = mode | 0111;
- permission.setMode(mode);
+ private void setPermissions(MimeType mime, Permission permission) throws PermissionDeniedException {
+ if (user != null){
+ permission.setOwner(user);
+ }
+ if (group != null){
+ permission.setGroup(group);
+ }
+
+ int mode;
+ if (perms > -1) {
+ mode = perms;
+ } else {
+ mode = permission.getMode();
+ }
+
+ if (mime != null && mime.getName().equals(MimeType.XQUERY_TYPE.getName())){
+ mode = mode | 0111;
+ }
+ permission.setMode(mode);
}
private ElementImpl findElement(NodeImpl root, QName qname) throws XPathException {
Modified: branches/adam/eXist-acl/src/org/exist/atom/modules/AtomProtocol.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/atom/modules/AtomProtocol.java 2011-05-30 18:02:35 UTC (rev 14582)
+++ branches/adam/eXist-acl/src/org/exist/atom/modules/AtomProtocol.java 2011-05-30 18:07:48 UTC (rev 14583)
@@ -937,7 +937,7 @@
collection.setPermissions(permissions);
} catch (NumberFormatException e) {
try {
- collection.setPermissions(mode);
+ collection.getPermissions().setMode(mode);
} catch (SyntaxException e1) {
throw new PermissionDeniedException("syntax error for mode attribute in exist:permissions element");
}
Modified: branches/adam/eXist-acl/src/org/exist/backup/SystemExport.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/backup/SystemExport.java 2011-05-30 18:02:35 UTC (rev 14582)
+++ branches/adam/eXist-acl/src/org/exist/backup/SystemExport.java 2011-05-30 18:07:48 UTC (rev 14583)
@@ -735,7 +735,7 @@
if( callback != null ) {
callback.startCollection( uri );
}
- Collection collection = new Collection( XmldbURI.createInternal( uri ) );
+ Collection collection = new Collection(broker, XmldbURI.createInternal( uri ) );
VariableByteInput istream = store.getAsStream( pointer );
collection.read( broker, istream );
BackupDescriptor bd = null;
Modified: branches/adam/eXist-acl/src/org/exist/client/ResourcePropertyDialog.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/client/ResourcePropertyDialog.java 2011-05-30 18:02:35 UTC (rev 14582)
+++ branches/adam/eXist-acl/src/org/exist/client/ResourcePropertyDialog.java 2011-05-30 18:07:48 UTC (rev 14583)
@@ -15,7 +15,6 @@
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.text.DateFormat;
-import java.util.ArrayList;
import java.util.Date;
import java.util.Vector;
@@ -31,6 +30,7 @@
import org.exist.security.Permission;
import org.exist.security.Account;
+import org.exist.security.PermissionDeniedException;
import org.exist.xmldb.UserManagementService;
import org.exist.xmldb.XmldbURI;
import org.exist.xquery.util.URIUtils;
@@ -321,6 +321,7 @@
}
private void applyAction() {
+ try{
permissions.setOwner(null, (String) owners.getSelectedItem());
permissions.setGroup(null, (String) groups.getSelectedItem());
int perms =
@@ -330,5 +331,9 @@
permissions.setMode(perms);
this.setVisible(false);
result = APPLY_OPTION;
+ } catch(PermissionDeniedException pde) {
+ ClientFrame.showErrorMessage(Messages.getString("ClientFrame.222") + pde.getMessage(), pde); //$NON-NLS-1$
+ pde.printStackTrace();
+ }
}
}
Modified: branches/adam/eXist-acl/src/org/exist/client/messages.properties
===================================================================
--- branches/adam/eXist-acl/src/org/exist/client/messages.properties 2011-05-30 18:02:35 UTC (rev 14582)
+++ branches/adam/eXist-acl/src/org/exist/client/messages.properties 2011-05-30 18:07:48 UTC (rev 14583)
@@ -141,6 +141,7 @@
ClientFrame.219=Error
ClientFrame.220=Binary resources
ClientFrame.221=XML files
+ClientFrame.222=Permission Denied
LoginPanel.2=Username
Modified: branches/adam/eXist-acl/src/org/exist/client/messages_es_ES.properties
===================================================================
--- branches/adam/eXist-acl/src/org/exist/client/messages_es_ES.properties 2011-05-30 18:02:35 UTC (rev 14582)
+++ branches/adam/eXist-acl/src/org/exist/client/messages_es_ES.properties 2011-05-30 18:07:48 UTC (rev 14583)
@@ -1,11 +1,11 @@
ClientFrame.0=Cortar
ClientFrame.1=Copiar
ClientFrame.2=Pegar
-ClientFrame.3=Cliente de Administración eXist
-ClientFrame.5=Ir a la colección padre
-ClientFrame.7=Refrescar la vista de la colección
-ClientFrame.9=Crear nueva colección
-ClientFrame.11=Almacena uno o más ficheros en la base de datos
+ClientFrame.3=Cliente de Administraci\u00c3\u00b3n eXist
+ClientFrame.5=Ir a la colecci\u00c3\u00b3n padre
+ClientFrame.7=Refrescar la vista de la colecci\u00c3\u00b3n
+ClientFrame.9=Crear nueva colecci\u00c3\u00b3n
+ClientFrame.11=Almacena uno o m\u00c3\u00a1s ficheros en la base de datos
ClientFrame.13=Borrar ficheros o colecciones seleccionados
ClientFrame.14=icons/Preferences24.gif
ClientFrame.15=Editar propietarios/permisos de los recursos seleccionados
@@ -14,49 +14,49 @@
ClientFrame.20=icons/keyring-small.png
ClientFrame.21=Administrar usuarios
ClientFrame.23=Consultar la base de datos usando XPath
-ClientFrame.24=Menú de Consola
-ClientFrame.27=Cliente de Administración de eXist conectado -
+ClientFrame.24=Men\u00c3\u00ba de Consola
+ClientFrame.27=Cliente de Administraci\u00c3\u00b3n de eXist conectado -
ClientFrame.31=Fichero
ClientFrame.32=Almacenar ficheros/directorios
-ClientFrame.34=Crear colección
-ClientFrame.36=Crear documento vacío
-ClientFrame.38=Nombre del recurso XML (incluída la extensión)
+ClientFrame.34=Crear colecci\u00c3\u00b3n
+ClientFrame.36=Crear documento vac\u00c3\u00ado
+ClientFrame.38=Nombre del recurso XML (inclu\u00c3\u00adda la extensi\u00c3\u00b3n)
ClientFrame.39=<template></template>
ClientFrame.40=Eliminar
ClientFrame.42=Copiar
ClientFrame.44=Mover
ClientFrame.46=Renombrar
ClientFrame.47=Exportar recurso a fichero ...
-ClientFrame.48=Reindexar colección
+ClientFrame.48=Reindexar colecci\u00c3\u00b3n
ClientFrame.50=Propiedades del recurso
ClientFrame.52=Salir
ClientFrame.54=Herramientas
ClientFrame.55=Encontrar
ClientFrame.57=Editar Usuarios
-ClientFrame.59=Editar Índices
+ClientFrame.59=Editar \u00c3\u008dndices
ClientFrame.60=Editar Triggers
-ClientFrame.61=Editar Políticas
+ClientFrame.61=Editar Pol\u00c3\u00adticas
ClientFrame.62a=Entrar en modo mantenimiento
ClientFrame.62b=Salir de modo mantenimiento
ClientFrame.63=Copia de seguridad
-ClientFrame.64=Restauración
-ClientFrame.65=Conexión
+ClientFrame.64=Restauraci\u00c3\u00b3n
+ClientFrame.65=Conexi\u00c3\u00b3n
ClientFrame.66=Desconectar
ClientFrame.67=desconectado\n
ClientFrame.69=Conectar
-ClientFrame.70=Abrir panel de login para cambiar el servidor o identidad de la conexión.
-ClientFrame.71=Cliente de Administración de eXist conectado -
-ClientFrame.75=¡La conexión a
-ClientFrame.77=\ falló\!
+ClientFrame.70=Abrir panel de login para cambiar el servidor o identidad de la conexi\u00c3\u00b3n.
+ClientFrame.71=Cliente de Administraci\u00c3\u00b3n de eXist conectado -
+ClientFrame.75=\u00c2\u00a1La conexi\u00c3\u00b3n a
+ClientFrame.77=\ fall\u00c3\u00b3\!
ClientFrame.78=Imposible reconectar a
ClientFrame.80=Opciones
ClientFrame.81=Indentar
-ClientFrame.82=sí
-ClientFrame.83=sí
+ClientFrame.82=s\u00c3\u00ad
+ClientFrame.83=s\u00c3\u00ad
ClientFrame.84=no
ClientFrame.85=Expandir XIncludes
-ClientFrame.86=sí
-ClientFrame.87=sí
+ClientFrame.86=s\u00c3\u00ad
+ClientFrame.87=s\u00c3\u00ad
ClientFrame.88=no
ClientFrame.89=Ayuda
ClientFrame.90=Acerca de
@@ -64,17 +64,17 @@
ClientFrame.92=\
ClientFrame.93=Backspace
ClientFrame.94=cd ..\n
-ClientFrame.96=Por favor, introduzca el nombre de la nueva colección
+ClientFrame.96=Por favor, introduzca el nombre de la nueva colecci\u00c3\u00b3n
ClientFrame.99=Por favor, introduzca una URI base XML:DB (sin
-ClientFrame.100=la ruta a la colección)
-ClientFrame.102=¡La conexión a
-ClientFrame.103=\ falló\!
-ClientFrame.104=¿Está seguro de que quiere eliminar los recursos
+ClientFrame.100=la ruta a la colecci\u00c3\u00b3n)
+ClientFrame.102=\u00c2\u00a1La conexi\u00c3\u00b3n a
+ClientFrame.103=\ fall\u00c3\u00b3\!
+ClientFrame.104=\u00c2\u00bfEst\u00c3\u00a1 seguro de que quiere eliminar los recursos
ClientFrame.105=seleccionados?
ClientFrame.106=Confirmar borrado
-ClientFrame.107=Eliminación en Progreso
+ClientFrame.107=Eliminaci\u00c3\u00b3n en Progreso
ClientFrame.108=
-ClientFrame.111=Seleccioar colección de destino
+ClientFrame.111=Seleccioar colecci\u00c3\u00b3n de destino
ClientFrame.112=Copiar
ClientFrame.115=Moviendo
ClientFrame.116=\ a
@@ -82,22 +82,22 @@
ClientFrame.118=Traslado completado.
ClientFrame.119=Por favor, introduzca un nuevo nombre de fichero
ClientFrame.120=Renombrar
-ClientFrame.121=No pudo procesarse el nuevo nombre como una uri válidad:
+ClientFrame.121=No pudo procesarse el nuevo nombre como una uri v\u00c3\u00a1lidad:
ClientFrame.124=Renombrando
ClientFrame.125=\ a
ClientFrame.126=...
ClientFrame.127=Renombrado completado.
-ClientFrame.128=Seleccionar colección de destino
+ClientFrame.128=Seleccionar colecci\u00c3\u00b3n de destino
ClientFrame.129=Copiar
ClientFrame.132=Copiando
ClientFrame.133=\ a
ClientFrame.134=...
ClientFrame.135=Copia completada.
-ClientFrame.136=Sólo se puede reindexar las colecciones.
+ClientFrame.136=S\u00c3\u00b3lo se puede reindexar las colecciones.
ClientFrame.137=Error
-ClientFrame.138=¿Está seguro de que quiere reindexar las colecciones seleccionadas \ny todos los recursos dentro de ellas?
+ClientFrame.138=\u00c2\u00bfEst\u00c3\u00a1 seguro de que quiere reindexar las colecciones seleccionadas \ny todos los recursos dentro de ellas?
ClientFrame.139=Confirmar reindexado
-ClientFrame.142=Reindexando colección
+ClientFrame.142=Reindexando colecci\u00c3\u00b3n
ClientFrame.143=...
ClientFrame.144=Reindexado completado.
ClientFrame.145=working-dir
@@ -108,15 +108,15 @@
ClientFrame.167=__contents__.xml
ClientFrame.168=__contents__.xml files
ClientFrame.169=Seleccionar el archivo de copia de seguridad a restaurar
-ClientFrame.170=contraseña de dba/admin a usar para el proceso de restauración:
-ClientFrame.171=Contraseña de Administración
+ClientFrame.170=contrase\u00c3\u00b1a de dba/admin a usar para el proceso de restauraci\u00c3\u00b3n:
+ClientFrame.171=Contrase\u00c3\u00b1a de Administraci\u00c3\u00b3n
ClientFrame.181=Exception:
ClientFrame.184=Editar Usuarios
-ClientFrame.185=Falló recuperar UserManagementService
-ClientFrame.186=Editar Índices
-ClientFrame.187=No se pudo obtener la colección del sistema
-ClientFrame.190=XACML no está habilitado. Para habilitarlo, añade\n\n <xacml enable="yes"/>\n\na conf.xml y reinicia eXist.
-ClientFrame.191=No se pudo contactar con el administración de instancias de la base de datos para determinar si está habilitado XACML
+ClientFrame.185=Fall\u00c3\u00b3 recuperar UserManagementService
+ClientFrame.186=Editar \u00c3\u008dndices
+ClientFrame.187=No se pudo obtener la colecci\u00c3\u00b3n del sistema
+ClientFrame.190=XACML no est\u00c3\u00a1 habilitado. Para habilitarlo, a\u00c3\u00b1ade\n\n <xacml enable="yes"/>\n\na conf.xml y reinicia eXist.
+ClientFrame.191=No se pudo contactar con el administraci\u00c3\u00b3n de instancias de la base de datos para determinar si est\u00c3\u00a1 habilitado XACML
ClientFrame.194=...
ClientFrame.195=
ClientFrame.196=
@@ -140,28 +140,29 @@
ClientFrame.219=Error
ClientFrame.220=Recursos binarios
ClientFrame.221=Ficheros XML
+ClientFrame.222=Permission Denied
LoginPanel.2=Nombre de usuario
LoginPanel.1=favoritos
-LoginPanel.3=Contraseña
+LoginPanel.3=Contrase\u00c3\u00b1a
-LoginPanel.4=Conexión
+LoginPanel.4=Conexi\u00c3\u00b3n
LoginPanel.5=Remota
LoginPanel.6=Embebida
-LoginPanel.8=Configuración
+LoginPanel.8=Configuraci\u00c3\u00b3n
-LoginPanel.9=Un fichero de configuración eXist para una instancia embebida
+LoginPanel.9=Un fichero de configuraci\u00c3\u00b3n eXist para una instancia embebida
LoginPanel.10=Seleccionar
-LoginPanel.11=Selecciona un fichero de configuración alternativo para el modo embebido.
+LoginPanel.11=Selecciona un fichero de configuraci\u00c3\u00b3n alternativo para el modo embebido.
LoginPanel.12=URL
-LoginPanel.13=Título
+LoginPanel.13=T\u00c3\u00adtulo
LoginPanel.14=Favoritos
@@ -171,9 +172,9 @@
LoginPanel.17=Grabar
-LoginPanel.18=Graba la configuración
+LoginPanel.18=Graba la configuraci\u00c3\u00b3n
-LoginPanel.19=Ya existe una conexión con este nombre. ¿Quiere sobrescribirla?
+LoginPanel.19=Ya existe una conexi\u00c3\u00b3n con este nombre. \u00c2\u00bfQuiere sobrescribirla?
LoginPanel.20=Conflicto
@@ -187,7 +188,7 @@
LoginPanel.25=favourites.xml
-LoginPanel.26=No seleccionó ningún fichero de favoritos
+LoginPanel.26=No seleccion\u00c3\u00b3 ning\u00c3\u00ban fichero de favoritos
LoginPanel.27=Error
@@ -199,7 +200,7 @@
LoginPanel.31=Importar favoritos desde fichero
-LoginPanel.33=No seleccionó ningún fichero de favoritos
+LoginPanel.33=No seleccion\u00c3\u00b3 ning\u00c3\u00ban fichero de favoritos
LoginPanel.34=Error
@@ -207,7 +208,7 @@
LoginPanel.36=Error
-LoginPanel.37=Seleccione un fichero de configuración de instancia de eXist
+LoginPanel.37=Seleccione un fichero de configuraci\u00c3\u00b3n de instancia de eXist
#Leave this value
LoginPanel.42=name
#Leave this value
@@ -223,13 +224,13 @@
UploadDialog.1=Almacenado\:
-UploadDialog.2=Calculando tamaño de los ficheros ...
+UploadDialog.2=Calculando tama\u00c3\u00b1o de los ficheros ...
UploadDialog.3=Directorio\:
UploadDialog.4=Cargando fichero\:
-UploadDialog.5=Tamaño\:
+UploadDialog.5=Tama\u00c3\u00b1o\:
UploadDialog.6=0K
@@ -259,13 +260,13 @@
DocumentView.0=Ver el Documento
-DocumentView.6=El recursos ya está bloqueado por el usuario
+DocumentView.6=El recursos ya est\u00c3\u00a1 bloqueado por el usuario
-DocumentView.7=. ¿Debería intentar readquirir el bloqueo?
+DocumentView.7=. \u00c2\u00bfDeber\u00c3\u00ada intentar readquirir el bloqueo?
DocumentView.8=Recurso bloqueado
-DocumentView.9=El recurso no puede ser bloqueado. Abriendo en sólo lectura.
+DocumentView.9=El recurso no puede ser bloqueado. Abriendo en s\u00c3\u00b3lo lectura.
DocumentView.10=XMLDB error\:
@@ -281,11 +282,11 @@
DocumentView.24=Exportar a fichero.
-DocumentView.26=Copiar selección.
+DocumentView.26=Copiar selecci\u00c3\u00b3n.
-DocumentView.28=Cortar selección.
+DocumentView.28=Cortar selecci\u00c3\u00b3n.
-DocumentView.30=Pegar selección.
+DocumentView.30=Pegar selecci\u00c3\u00b3n.
DocumentView.32=Refrescar Documento.
@@ -299,7 +300,7 @@
DocumentView.37=XMLDBException\:
-DocumentView.38=Nombre del recurso XML (incluída la extensión)
+DocumentView.38=Nombre del recurso XML (inclu\u00c3\u00adda la extensi\u00c3\u00b3n)
DocumentView.39=Almacenando
@@ -309,9 +310,9 @@
DocumentView.44=Seleccione el fichero a exportar
-DocumentView.45=El fichero ya existe. ¿Quiere sobrescribirlo?
+DocumentView.45=El fichero ya existe. \u00c2\u00bfQuiere sobrescribirlo?
-DocumentView.46=¿Quiere sobrescribir?
+DocumentView.46=\u00c2\u00bfQuiere sobrescribir?
DocumentView.48=XMLDBException\:
@@ -319,14 +320,14 @@
DocumentView.53=\ desde
-QueryDialog.0=Diálogo de consulta
+QueryDialog.0=Di\u00c3\u00a1logo de consulta
QueryDialog.opentooltip=Leer consulta desde fichero
QueryDialog.saveastooltip=Grabar consulta en fichero
QueryDialog.saveresultstooltip=Grabar resultados en fichero
-QueryDialog.copytooltip=Copiar selección
-QueryDialog.cuttooltip=Cortar selección
+QueryDialog.copytooltip=Copiar selecci\u00c3\u00b3n
+QueryDialog.cuttooltip=Cortar selecci\u00c3\u00b3n
QueryDialog.pastetooltip=Pegar del portapapeles
-QueryDialog.compiletooltip=Sólo compilar consulta
+QueryDialog.compiletooltip=S\u00c3\u00b3lo compilar consulta
QueryDialog.submittooltip=Ejecutar consulta
QueryDialog.submitbutton=Ejecutar
QueryDialog.killtooltip=Detener consulta
@@ -337,8 +338,8 @@
QueryDialog.inputtab=Consulta de entrada\:
QueryDialog.historylabel=Historial\:
QueryDialog.contextlabel=Contexto\:
-QueryDialog.collectionretrievalerrormessage=Error durante la obtención de la lista de colecciones
-QueryDialog.maxlabel=Mostrar máx.\:
+QueryDialog.collectionretrievalerrormessage=Error durante la obtenci\u00c3\u00b3n de la lista de colecciones
+QueryDialog.maxlabel=Mostrar m\u00c3\u00a1x.\:
QueryDialog.opendialog=elegir fichero de consulta
QueryDialog.Error=Error
QueryDialog.cannotreadmessage=No se puede leer la consulta desde el fichero
@@ -346,19 +347,19 @@
QueryDialog.savedialogpost=donde grabar
QueryDialog.cannotsavemessagepre=Imposible escribir
QueryDialog.cannotsavemessageinf=al fichero
-QueryDialog.savedialogconfirm=El fichero ya existe. ¿Sobreesribir?
+QueryDialog.savedialogconfirm=El fichero ya existe. \u00c2\u00bfSobreesribir?
QueryDialog.compilemessage=Compilando consulta ...
-QueryDialog.Compilation=Compilación
-QueryDialog.Execution=Ejecución
-QueryDialog.compilationerrormessage=Saltó una excepción durante la compilación de la consulta
+QueryDialog.Compilation=Compilaci\u00c3\u00b3n
+QueryDialog.Execution=Ejecuci\u00c3\u00b3n
+QueryDialog.compilationerrormessage=Salt\u00c3\u00b3 una excepci\u00c3\u00b3n durante la compilaci\u00c3\u00b3n de la consulta
QueryDialog.processingquerymessage=Procesando consulta ...
QueryDialog.retrievingmessage=Recuperando resultados ...
-QueryDialog.retrievalerrormessage=Saltó un error durante la recuperación de resultados
+QueryDialog.retrievalerrormessage=Salt\u00c3\u00b3 un error durante la recuperaci\u00c3\u00b3n de resultados
QueryDialog.Found=Hallados
QueryDialog.items=resultados
-QueryDialog.queryrunerrormessage=Saltó una excepción durante la ejecución de la consulta
+QueryDialog.queryrunerrormessage=Salt\u00c3\u00b3 una excepci\u00c3\u00b3n durante la ejecuci\u00c3\u00b3n de la consulta
-TriggersDialog.Collection=Collección
+TriggersDialog.Collection=Collecci\u00c3\u00b3n
TriggersDialog.Triggers=Triggers
-TriggersDialog.addbutton=Añadir
+TriggersDialog.addbutton=A\u00c3\u00b1adir
TriggersDialog.deletebutton=Borrar
Modified: branches/adam/eXist-acl/src/org/exist/client/messages_fr_FR.properties
===================================================================
--- branches/adam/eXist-acl/src/org/exist/client/messages_fr_FR.properties 2011-05-30 18:02:35 UTC (rev 14582)
+++ branches/adam/eXist-acl/src/org/exist/client/messages_fr_FR.properties 2011-05-30 18:07:48 UTC (rev 14583)
@@ -2,55 +2,55 @@
ClientFrame.1=Copier
ClientFrame.2=Coller
ClientFrame.3=Client d'administration eXist
-ClientFrame.5=Aller à la collection parent
-ClientFrame.7=Rafraîchir la vue des collections
-ClientFrame.9=Créer une nouvelle collection
-ClientFrame.11=Charger un ou plusieurs fichiers dans la base de données
-ClientFrame.13=Supprimer les fichiers ou collections sélectionnés
+ClientFrame.5=Aller \u00c3\u00a0 la collection parent
+ClientFrame.7=Rafra\u00c3\u00aechir la vue des collections
+ClientFrame.9=Cr\u00c3\u00a9er une nouvelle collection
+ClientFrame.11=Charger un ou plusieurs fichiers dans la base de donn\u00c3\u00a9es
+ClientFrame.13=Supprimer les fichiers ou collections s\u00c3\u00a9lectionn\u00c3\u00a9s
ClientFrame.14=icons/Preferences24.gif
-ClientFrame.15=Editer les propriétaires/permissions pour la ressource sélectionnée
-ClientFrame.17=Créer une sauvegarde
+ClientFrame.15=Editer les propri\u00c3\u00a9taires/permissions pour la ressource s\u00c3\u00a9lectionn\u00c3\u00a9e
+ClientFrame.17=Cr\u00c3\u00a9er une sauvegarde
ClientFrame.19=Restaurer les fichiers depuis une sauvegarde
ClientFrame.20=icons/keyring-small.png
-ClientFrame.21=Gérer les utilisateurs
-ClientFrame.23=Interroger la base de données avec XQuery
+ClientFrame.21=G\u00c3\u00a9rer les utilisateurs
+ClientFrame.23=Interroger la base de donn\u00c3\u00a9es avec XQuery
ClientFrame.24=Menu de la console
-ClientFrame.27=Client d'administration eXist connecté -
+ClientFrame.27=Client d'administration eXist connect\u00c3\u00a9 -
ClientFrame.31=Fichier
-ClientFrame.32=Charger des fichiers/répertoires...
-ClientFrame.34=Créer une collection...
-ClientFrame.36=Créer un document vide...
+ClientFrame.32=Charger des fichiers/r\u00c3\u00a9pertoires...
+ClientFrame.34=Cr\u00c3\u00a9er une collection...
+ClientFrame.36=Cr\u00c3\u00a9er un document vide...
ClientFrame.38=Nom de la ressource (extension incluse)
ClientFrame.39=<template></template>
ClientFrame.40=Supprimer...
ClientFrame.42=Copier...
-ClientFrame.44=Déplacer...
+ClientFrame.44=D\u00c3\u00a9placer...
ClientFrame.46=Renommer...
-ClientFrame.48=Réindexer une collection
-ClientFrame.50=Propriétés de la ressource
+ClientFrame.48=R\u00c3\u00a9indexer une collection
+ClientFrame.50=Propri\u00c3\u00a9t\u00c3\u00a9s de la ressource
ClientFrame.52=Quitter
ClientFrame.54=Outils
ClientFrame.55=Interroger la base...
ClientFrame.57=Editer les utilisateurs
ClientFrame.59=Editer les index
-ClientFrame.61=Editer les politiques de sécurité
+ClientFrame.61=Editer les politiques de s\u00c3\u00a9curit\u00c3\u00a9
ClientFrame.63=Faire une copie de sauvegarde
ClientFrame.64=Restaurer une copie de sauvegarde
ClientFrame.65=Connexion
ClientFrame.66=Eteindre
ClientFrame.67=Eteindre\n
ClientFrame.69=Se connecter...
-ClientFrame.70=Ouvrir la console de connexion pour chnager de serveur ou d'identité.
-ClientFrame.71=Client d'administration eXist connecté -
-ClientFrame.75=Connexion à
+ClientFrame.70=Ouvrir la console de connexion pour chnager de serveur ou d'identit\u00c3\u00a9.
+ClientFrame.71=Client d'administration eXist connect\u00c3\u00a9 -
+ClientFrame.75=Connexion \u00c3\u00a0
ClientFrame.77=\ failed\!
-ClientFrame.78=Impossible de se reconnecter à
+ClientFrame.78=Impossible de se reconnecter \u00c3\u00a0
ClientFrame.80=Options
ClientFrame.81=Indenter
ClientFrame.82=oui
ClientFrame.83=oui
ClientFrame.84=non
-ClientFrame.85=Réaliser les XIncludes
+ClientFrame.85=R\u00c3\u00a9aliser les XIncludes
ClientFrame.86=oui
ClientFrame.87=oui
ClientFrame.88=non
@@ -63,16 +63,16 @@
ClientFrame.96=Veuillez entrer un nom pour la nouvelle collection
ClientFrame.99=Veuillez entrer une URI XML:DB de base (sans
ClientFrame.100=le chemin de collection)
-ClientFrame.102=Connection à
-ClientFrame.103=\ échoué\!
-ClientFrame.104=Etes-vous sûr que vous voulez supprimer
-ClientFrame.105=les ressources sélectionnées ?
+ClientFrame.102=Connection \u00c3\u00a0
+ClientFrame.103=\ \u00c3\u00a9chou\u00c3\u00a9\!
+ClientFrame.104=Etes-vous s\u00c3\u00bbr que vous voulez supprimer
+ClientFrame.105=les ressources s\u00c3\u00a9lectionn\u00c3\u00a9es ?
ClientFrame.106=Confirmation de la supression
ClientFrame.107=Progression de la supression
ClientFrame.108=
-ClientFrame.111=Sélectionnez la colection de destination
+ClientFrame.111=S\u00c3\u00a9lectionnez la colection de destination
ClientFrame.112=Copie
-ClientFrame.115=Déplacement en cours
+ClientFrame.115=D\u00c3\u00a9placement en cours
ClientFrame.116=\ vers
ClientFrame.117=...
ClientFrame.118=Move completed.
@@ -82,20 +82,20 @@
ClientFrame.124=Renommage en cours
ClientFrame.125=\ vers
ClientFrame.126=...
-ClientFrame.127=Renommage terminé
-ClientFrame.128=Sélectionnez la colection de destination
+ClientFrame.127=Renommage termin\u00c3\u00a9
+ClientFrame.128=S\u00c3\u00a9lectionnez la colection de destination
ClientFrame.129=Copier
ClientFrame.132=Copie en cours
ClientFrame.133=\ vers
ClientFrame.134=...
-ClientFrame.135=Copie terminée
-ClientFrame.136=Seules les collections peuvent être réindexées
+ClientFrame.135=Copie termin\u00c3\u00a9e
+ClientFrame.136=Seules les collections peuvent \u00c3\u00aatre r\u00c3\u00a9index\u00c3\u00a9es
ClientFrame.137=Erreur
-ClientFrame.138=Etes vous sûr que vous voulez réindexer la collection sélectionnée\net toutes les resources qu'elle contient ?
-ClientFrame.139=Confirmation de la réindexation
-ClientFrame.142=Réindexation de la collection
+ClientFrame.138=Etes vous s\u00c3\u00bbr que vous voulez r\u00c3\u00a9indexer la collection s\u00c3\u00a9lectionn\u00c3\u00a9e\net toutes les resources qu'elle contient ?
+ClientFrame.139=Confirmation de la r\u00c3\u00a9indexation
+ClientFrame.142=R\u00c3\u00a9indexation de la collection
ClientFrame.143=...
-ClientFrame.144=Réindexation terminée
+ClientFrame.144=R\u00c3\u00a9indexation termin\u00c3\u00a9e
ClientFrame.145=working-dir
ClientFrame.146=Select files or directories to store
ClientFrame.147=XMLDBException:
@@ -104,15 +104,15 @@
ClientFrame.167=__contents__.xml
ClientFrame.168=__contents__.xml files
ClientFrame.169=Select backup file for restore
-ClientFrame.170=Mot de passe dba/admin à utiliser lors du processus de restauration:
+ClientFrame.170=Mot de passe dba/admin \u00c3\u00a0 utiliser lors du processus de restauration:
ClientFrame.171=Mot de passe administrateur
ClientFrame.181=Exception:
ClientFrame.184=Editer les utilisateurs
ClientFrame.185=Impossible de trouver le service de gestion des utilisateurs
ClientFrame.186=Editer les index
-ClientFrame.187=Impossible d'obtenir la collection système
-ClientFrame.190=XACML n'est actuellement pas activé. Pour l'activer, ajoutez\n\n <xacml enable="yes"/>\n\nà conf.xml et redémarrez eXist.
-ClientFrame.191=Impossible d'obtenir le gestionnaire d'instance de base de données pour déterminer l'état d'activation de XACML
+ClientFrame.187=Impossible d'obtenir la collection syst\u00c3\u00a8me
+ClientFrame.190=XACML n'est actuellement pas activ\u00c3\u00a9. Pour l'activer, ajoutez\n\n <xacml enable="yes"/>\n\n\u00c3\u00a0 conf.xml et red\u00c3\u00a9marrez eXist.
+ClientFrame.191=Impossible d'obtenir le gestionnaire d'instance de base de donn\u00c3\u00a9es pour d\u00c3\u00a9terminer l'\u00c3\u00a9tat d'activation de XACML
ClientFrame.194=...
ClientFrame.195=
ClientFrame.196=
@@ -123,11 +123,11 @@
ClientFrame.206=Erreur XMLDB :
ClientFrame.207=Ressource
ClientFrame.208=Date
-ClientFrame.209=Propriétaire
+ClientFrame.209=Propri\u00c3\u00a9taire
ClientFrame.210=Groupe
ClientFrame.211=Permissions
ClientFrame.212=La colonne n'existe pas\!
-ClientFrame.213=Connexion à une base de données eXist
+ClientFrame.213=Connexion \u00c3\u00a0 une base de donn\u00c3\u00a9es eXist
ClientFrame.214=Message:
ClientFrame.215=Pile d'exception :
ClientFrame.216=Erreur
@@ -136,6 +136,7 @@
ClientFrame.219=Erreur
ClientFrame.220=Ressources binaires
ClientFrame.221=Fichiers XML
+ClientFrame.222=Permission Denied
LoginPanel.2=Nom d'utilisateur
@@ -151,9 +152,9 @@
LoginPanel.9=Fichier de configuration eXist pour l'instance locale
-LoginPanel.10=Sélectionner
+LoginPanel.10=S\u00c3\u00a9lectionner
-LoginPanel.11=Sélectionner un autre fichier de configuration pour l'instance locale
+LoginPanel.11=S\u00c3\u00a9lectionner un autre fichier de configuration pour l'instance locale
LoginPanel.12=URL
@@ -161,15 +162,15 @@
LoginPanel.14=Favoris
-LoginPanel.15=Sélectionner
+LoginPanel.15=S\u00c3\u00a9lectionner
-LoginPanel.16=Sélectionner le favori
+LoginPanel.16=S\u00c3\u00a9lectionner le favori
LoginPanel.17=Sauvegarder
-LoginPanel.18=Sauvegarder les réglages
+LoginPanel.18=Sauvegarder les r\u00c3\u00a9glages
-LoginPanel.19=Une connection portant ce nom existe déjà. Ecraser ?
+LoginPanel.19=Une connection portant ce nom existe d\u00c3\u00a9j\u00c3\u00a0. Ecraser ?
LoginPanel.20=Conflit
@@ -183,7 +184,7 @@
LoginPanel.25=favourites.xml
-LoginPanel.26=Aucun fichier de favoris sélectionné
+LoginPanel.26=Aucun fichier de favoris s\u00c3\u00a9lectionn\u00c3\u00a9
LoginPanel.27=Erreur
@@ -195,15 +196,15 @@
LoginPanel.31=Importer des favoris depuis un fichier
-LoginPanel.33=Aucun fichier de favoris sélectionné
+LoginPanel.33=Aucun fichier de favoris s\u00c3\u00a9lectionn\u00c3\u00a9
LoginPanel.34=Erreur
-LoginPanel.35=Impossible de lire le fichier sélectionné
+LoginPanel.35=Impossible de lire le fichier s\u00c3\u00a9lectionn\u00c3\u00a9
LoginPanel.36=Erreur
-LoginPanel.37=Sélectionner un fichier de configuration
+LoginPanel.37=S\u00c3\u00a9lectionner un fichier de configuration
#Leave this value
LoginPanel.42=name
#Leave this value
@@ -217,7 +218,7 @@
UploadDialog.0=Chargement des fichiers...
-UploadDialog.1=Stocké\:
+UploadDialog.1=Stock\u00c3\u00a9\:
UploadDialog.2=Calcul des tailles de fichiers...
@@ -255,13 +256,13 @@
DocumentView.0=Voir le document
-DocumentView.6=La ressource est déjà verrouillée par l'utilisateur
+DocumentView.6=La ressource est d\u00c3\u00a9j\u00c3\u00a0 verrouill\u00c3\u00a9e par l'utilisateur
DocumentView.7=. Dois-je essayer de la reverrouiller ?
-DocumentView.8=Ressource verrouillée
+DocumentView.8=Ressource verrouill\u00c3\u00a9e
-DocumentView.9=La ressource ne peut être verrouillée. Ouverture en lecture seule.
+DocumentView.9=La ressource ne peut \u00c3\u00aatre verrouill\u00c3\u00a9e. Ouverture en lecture seule.
DocumentView.10=Erreur XMLDB :
@@ -271,19 +272,19 @@
DocumentView.17=Sauvegarder
-DocumentView.20=Charger les données modifiées dans la base de données
+DocumentView.20=Charger les donn\u00c3\u00a9es modifi\u00c3\u00a9es dans la base de donn\u00c3\u00a9es
-DocumentView.22=Charger un document dans la base de données
+DocumentView.22=Charger un document dans la base de donn\u00c3\u00a9es
DocumentView.24=Exporter vers un fichier
-DocumentView.26=Copier la sélection
+DocumentView.26=Copier la s\u00c3\u00a9lection
-DocumentView.28=Couper la sélection
+DocumentView.28=Couper la s\u00c3\u00a9lection
-DocumentView.30=Coller la sélection
+DocumentView.30=Coller la s\u00c3\u00a9lection
-DocumentView.32=Rafraîchir le document
+DocumentView.32=Rafra\u00c3\u00aechir le document
DocumentView.33=XML
@@ -303,7 +304,7 @@
DocumentView.41=URISyntaxException\:
-DocumentView.44=Sélectionner un fichier à exporter
+DocumentView.44=S\u00c3\u00a9lectionner un fichier \u00c3\u00a0 exporter
DocumentView.45=Le fichier existe. Ecraser ?
@@ -311,6 +312,6 @@
DocumentView.48=XMLDBException\:
-DocumentView.52=Chargé
+DocumentView.52=Charg\u00c3\u00a9
DocumentView.53= depuis
Modified: branches/adam/eXist-acl/src/org/exist/client/messages_it_IT.properties
===================================================================
--- branches/adam/eXist-acl/src/org/exist/client/messages_it_IT.properties 2011-05-30 18:02:35 UTC (rev 14582)
+++ branches/adam/eXist-acl/src/org/exist/client/messages_it_IT.properties 2011-05-30 18:07:48 UTC (rev 14583)
@@ -5,7 +5,7 @@
ClientFrame.5=Vai alla directory superiore
ClientFrame.7=Aggiorna la vista directory
ClientFrame.9=Crea una directory
-ClientFrame.11=Memorizza uno o più file nel database
+ClientFrame.11=Memorizza uno o pi\u00c3\u00b9 file nel database
ClientFrame.13=Cancella i file o le directory selezionate
ClientFrame.14=icons/Preferences24.gif
ClientFrame.15=Edita il proprietario/i permessi per la risorsa selezionata
@@ -27,9 +27,9 @@
ClientFrame.44=Sposta
ClientFrame.46=Rinomina
ClientFrame.48=Reindicizza la directory
-ClientFrame.50=Proprietà della risorsa
+ClientFrame.50=Propriet\u00c3\u00a0 della risorsa
ClientFrame.52=Esci
-ClientFrame.54=Utilità
+ClientFrame.54=Utilit\u00c3\u00a0
ClientFrame.55=Trova
ClientFrame.57=Edita Utenti
ClientFrame.59=Edita Indici
@@ -40,7 +40,7 @@
ClientFrame.66=Shutdown
ClientFrame.67=shutdown\n
ClientFrame.69=Connetti
-ClientFrame.70=Apre il pannello delle connessioni per cambiare server o identità.
+ClientFrame.70=Apre il pannello delle connessioni per cambiare server o identit\u00c3\u00a0.
ClientFrame.71=eXist Admin Client connesso -
ClientFrame.75=Connessione a
ClientFrame.77=\ fallita\!
@@ -111,8 +111,8 @@
ClientFrame.185=Tentativo fallito di connesione a UserManagementService
ClientFrame.186=Edita Indici
ClientFrame.187=Impossibile recuperare la directory system
-ClientFrame.190=XACML non è abilitato. Per abilitarlo, aggiungere\n\n <xacml enable="yes"/>\n\nal file conf.xml e riavviare eXist.
-ClientFrame.191=Impossibile ottenere una istanza dal database manager per deter minare se XACML è attivo
+ClientFrame.190=XACML non \u00c3\u00a8 abilitato. Per abilitarlo, aggiungere\n\n <xacml enable="yes"/>\n\nal file conf.xml e riavviare eXist.
+ClientFrame.191=Impossibile ottenere una istanza dal database manager per deter minare se XACML \u00c3\u00a8 attivo
ClientFrame.194=...
ClientFrame.195=
ClientFrame.196=
@@ -136,6 +136,7 @@
ClientFrame.219=Errore
ClientFrame.220=Risorsa binaria
ClientFrame.221=XML files
+ClientFrame.222=Permission Denied
LoginPanel.2=Nome utente
@@ -149,11 +150,11 @@
LoginPanel.8=Configurazione
-LoginPanel.9=Una configurazione per eXist in modalità embed
+LoginPanel.9=Una configurazione per eXist in modalit\u00c3\u00a0 embed
LoginPanel.10=Seleziona
-LoginPanel.11=Seleziona un file conf alternativo per la modalità embed.
+LoginPanel.11=Seleziona un file conf alternativo per la modalit\u00c3\u00a0 embed.
LoginPanel.12=URL
@@ -169,7 +170,7 @@
LoginPanel.18=Salva le impostazioni
-LoginPanel.19=Una connessione con questo nome esiste già. Sovrascriverla?
+LoginPanel.19=Una connessione con questo nome esiste gi\u00c3\u00a0. Sovrascriverla?
LoginPanel.20=Conflitto
@@ -183,7 +184,7 @@
LoginPanel.25=favourites.xml
-LoginPanel.26=Non è stato selezionato alcun file per i favoriti
+LoginPanel.26=Non \u00c3\u00a8 stato selezionato alcun file per i favoriti
LoginPanel.27=Errore
@@ -195,7 +196,7 @@
LoginPanel.31=Importa i favoriti da un file
-LoginPanel.33=Non è stato selezionato alcun file per i favoriti
+LoginPanel.33=Non \u00c3\u00a8 stato selezionato alcun file per i favoriti
LoginPanel.34=Errore
@@ -255,13 +256,13 @@
DocumentView.0=Mostra il documento
-DocumentView.6=La risorsa è già bloccata da un altro utente
+DocumentView.6=La risorsa \u00c3\u00a8 gi\u00c3\u00a0 bloccata da un altro utente
DocumentView.7=. Nuovo tentativo di blocco?
DocumentView.8=Risorsa bloccata
-DocumentView.9=La risorsa non può essere bloccata. Apertura in modalità solo lettura.
+DocumentView.9=La risorsa non pu\u00c3\u00b2 essere bloccata. Apertura in modalit\u00c3\u00a0 solo lettura.
DocumentView.10=XMLDB error\:
@@ -305,7 +306,7 @@
DocumentView.44=Seleziona la risorsa da esportare
-DocumentView.45=Il file esiste già. Sovrascriverlo?
+DocumentView.45=Il file esiste gi\u00c3\u00a0. Sovrascriverlo?
DocumentView.46=Sovrascrivere?
Modified: branches/adam/eXist-acl/src/org/exist/client/messages_nb_NO.properties
===================================================================
--- branches/adam/eXist-acl/src/org/exist/client/messages_nb_NO.properties 2011-05-30 18:02:35 UTC (rev 14582)
+++ branches/adam/eXist-acl/src/org/exist/client/messages_nb_NO.properties 2011-05-30 18:07:48 UTC (rev 14583)
@@ -2,7 +2,7 @@
ClientFrame.1=Kopier
ClientFrame.2=Lim inn
ClientFrame.3=eXist- Administrasjonsklient
-ClientFrame.5=Gå til samlingen over
+ClientFrame.5=G\u00c3\u00a5 til samlingen over
ClientFrame.7=Oppdater samlingsliste
ClientFrame.9=Lag ny samling
ClientFrame.11=Legg til en eller flere filer til databasen
@@ -13,23 +13,23 @@
ClientFrame.19=Gjenoppbygg fra sikkerhetskopi
ClientFrame.20=icons/keyring-small.png
ClientFrame.21=Administrer brukere
-ClientFrame.23=Åpne vindu for å søke i db med XPath/XQuery
+ClientFrame.23=\u00c3\u0085pne vindu for \u00c3\u00a5 s\u00c3\u00b8ke i db med XPath/XQuery
ClientFrame.24=Konsollmeny
ClientFrame.27=eXist-adminklient tilkoblet -
ClientFrame.31=Fil
ClientFrame.32=Legg til filer eller kataloger
ClientFrame.34=Lag samling
ClientFrame.36=Lag tomt dokument
-ClientFrame.38=Navn på XML-dokumentet (inklusive filtillegg)
+ClientFrame.38=Navn p\u00c3\u00a5 XML-dokumentet (inklusive filtillegg)
ClientFrame.39=<template></template>
ClientFrame.40=Slett
ClientFrame.42=Kopier
ClientFrame.44=Flytt
ClientFrame.46=Endre navn
-ClientFrame.48=Indekser samlingen på nytt
+ClientFrame.48=Indekser samlingen p\u00c3\u00a5 nytt
ClientFrame.50=Ressursegenskapar
ClientFrame.52=Avslutt
-ClientFrame.54=Verktøy
+ClientFrame.54=Verkt\u00c3\u00b8y
ClientFrame.55=Finn
ClientFrame.57=Administrer brukere
ClientFrame.59=Administrer indekser
@@ -40,7 +40,7 @@
ClientFrame.66=Kople fra
ClientFrame.67=Kople fra\n
ClientFrame.69=Kople til
-ClientFrame.70=Åpne innloggingspanelet for å koble til, bytte server, eller bytte brukeridentitet.
+ClientFrame.70=\u00c3\u0085pne innloggingspanelet for \u00c3\u00a5 koble til, bytte server, eller bytte brukeridentitet.
ClientFrame.71=eXist-adminklient tilkoblet -
ClientFrame.75=Koble til
ClientFrame.77=\ mislykket\!
@@ -60,16 +60,16 @@
ClientFrame.92=\
ClientFrame.93=Backspace
ClientFrame.94=cd ..\n
-ClientFrame.96=Gi navn på ny samling
+ClientFrame.96=Gi navn p\u00c3\u00a5 ny samling
ClientFrame.99=Spesifiser en gyldig XML:DB-base-URI (uten
ClientFrame.100=samlingssti)
ClientFrame.102=Kobling til
ClientFrame.103=\ mislykket\!
-ClientFrame.104=Er du sikker på at du vil slette de valgte
+ClientFrame.104=Er du sikker p\u00c3\u00a5 at du vil slette de valgte
ClientFrame.105=ressursene?
ClientFrame.106=Bekreft slettingen
-ClientFrame.107=Holder på å slette
-ClientFrame.111=Velg målsamling
+ClientFrame.107=Holder p\u00c3\u00a5 \u00c3\u00a5 slette
+ClientFrame.111=Velg m\u00c3\u00a5lsamling
ClientFrame.112=Kopier
ClientFrame.115=Flytter
ClientFrame.116=\ til
@@ -82,7 +82,7 @@
ClientFrame.125=\ til
ClientFrame.126=...
ClientFrame.127=Navneendringen er ferdig.
-ClientFrame.128=Velg målsamling.
+ClientFrame.128=Velg m\u00c3\u00a5lsamling.
ClientFrame.129=Kopier
ClientFrame.132=Kopierer
ClientFrame.133=\ til
@@ -90,7 +90,7 @@
ClientFrame.135=Kopieringen er ferdig.
ClientFrame.136=Bare samlinger kan bli re-indeksert.
ClientFrame.137=Feil
-ClientFrame.138=Er du sikker på at du vil re-indeksere de valgte samlingene \nog alle ressursene under dem?
+ClientFrame.138=Er du sikker p\u00c3\u00a5 at du vil re-indeksere de valgte samlingene \nog alle ressursene under dem?
ClientFrame.139=Bekreft re-indeksering
ClientFrame.142=Re-indekserer samlingen
ClientFrame.143=...
@@ -107,11 +107,11 @@
ClientFrame.171=Admin-passord
ClientFrame.181=Unntak:
ClientFrame.184=Administrer brukere
-ClientFrame.185=Mislyktes med å nå brukaradministrasjons-service (UserManagementService)
+ClientFrame.185=Mislyktes med \u00c3\u00a5 n\u00c3\u00a5 brukaradministrasjons-service (UserManagementService)
ClientFrame.186=Administrer indekser
-ClientFrame.187=Kunne ikke få tak i system-samlingen
-ClientFrame.190=XACML er ikkje slått på. For å slå det på, legg til\n\n <xacml enable="yes"/>\n\ni conf.xml, og start eXist på nytt.
-ClientFrame.191=Kunne ikke få tak i databaseinstanse-håndtereren for å avgjøre om XACML er slått på
+ClientFrame.187=Kunne ikke f\u00c3\u00a5 tak i system-samlingen
+ClientFrame.190=XACML er ikkje sl\u00c3\u00a5tt p\u00c3\u00a5. For \u00c3\u00a5 sl\u00c3\u00a5 det p\u00c3\u00a5, legg til\n\n <xacml enable="yes"/>\n\ni conf.xml, og start eXist p\u00c3\u00a5 nytt.
+ClientFrame.191=Kunne ikke f\u00c3\u00a5 tak i databaseinstanse-h\u00c3\u00a5ndtereren for \u00c3\u00a5 avgj\u00c3\u00b8re om XACML er sl\u00c3\u00a5tt p\u00c3\u00a5
ClientFrame.194=...
ClientFrame.197=XMLDB-unntak:
ClientFrame.198=\n
@@ -131,14 +131,15 @@
ClientFrame.217=Melding:
ClientFrame.218=Stakkutskrift:
ClientFrame.219=Feil
-ClientFrame.220=Binære ressurser
+ClientFrame.220=Bin\u00c3\u00a6re ressurser
ClientFrame.221=XML-filer
+ClientFrame.222=Permission Denied
DocumentView.0=Vis dokument
-DocumentView.6=Dokumentet er låst
-DocumentView.7=Vil du prøve å låse opp filen?
-DocumentView.8=Dokumentet er låst
-DocumentView.9=Dokumentet kan ikke bli låst. Det blir bare åpnet for lesing.
+DocumentView.6=Dokumentet er l\u00c3\u00a5st
+DocumentView.7=Vil du pr\u00c3\u00b8ve \u00c3\u00a5 l\u00c3\u00a5se opp filen?
+DocumentView.8=Dokumentet er l\u00c3\u00a5st
+DocumentView.9=Dokumentet kan ikke bli l\u00c3\u00a5st. Det blir bare \u00c3\u00a5pnet for lesing.
DocumentView.10=XMLDB-feil:
DocumentView.13=Feil
DocumentView.16=Fil
@@ -149,17 +150,17 @@
DocumentView.26=Kopier markeringen.
DocumentView.28=Klipp ut markeringen.
DocumentView.30=Lim inn utklippet.
-DocumentView.32=Les dokumentet på nytt fra databasen.
+DocumentView.32=Les dokumentet p\u00c3\u00a5 nytt fra databasen.
DocumentView.33=XML-ressurs
DocumentView.34=Les inn
DocumentView.35=\ ...
DocumentView.36=Lagrer
DocumentView.37=XMLDB-unntak:
-DocumentView.38=Gi navn på XML-ressursen (inklusive filtillegg)
+DocumentView.38=Gi navn p\u00c3\u00a5 XML-ressursen (inklusive filtillegg)
DocumentView.39=Lagrer
DocumentView.40=XMLDB-unntak:
DocumentView.41=URI-syntaks unntak:
-DocumentView.44=Spesifiser fil å eksportere til
+DocumentView.44=Spesifiser fil \u00c3\u00a5 eksportere til
DocumentView.45=Filen eksisterer allerede. Skrive over?
DocumentView.46=Skrive over?
DocumentView.48=XMLDB-unntak:
@@ -168,10 +169,10 @@
UploadDialog.0=Legg til filer
UploadDialog.1=Lagt til filene:
-UploadDialog.2=Regner ut størrelsen på dokumentet ...
+UploadDialog.2=Regner ut st\u00c3\u00b8rrelsen p\u00c3\u00a5 dokumentet ...
UploadDialog.3=Katalog:
UploadDialog.4=Legg til fil:
-UploadDialog.5=Størrelse:
+UploadDialog.5=St\u00c3\u00b8rrelse:
UploadDialog.6=OK
UploadDialog.7=Fremdrift:
UploadDialog.9=Avbryt
Modified: branches/adam/eXist-acl/src/org/exist/client/messages_nl_NL.properties
===================================================================
--- branches/adam/eXist-acl/src/org/exist/client/messages_nl_NL.properties 2011-05-30 18:02:35 UTC (rev 14582)
+++ branches/adam/eXist-acl/src/org/exist/client/messages_nl_NL.properties 2011-05-30 18:07:48 UTC (rev 14583)
@@ -133,6 +133,7 @@
ClientFrame.219=Fout
ClientFrame.220=Binaire documenten
ClientFrame.221=XML documenten
+ClientFrame.222=Permission Denied
LoginPanel.10=Selecteer
Modified: branches/adam/eXist-acl/src/org/exist/client/messages_no.properties
===================================================================
--- branches/adam/eXist-acl/src/org/exist/client/messages_no.properties 2011-05-30 18:02:35 UTC (rev 14582)
+++ branches/adam/eXist-acl/src/org/exist/client/messages_no.properties 2011-05-30 18:07:48 UTC (rev 14583)
@@ -2,7 +2,7 @@
ClientFrame.1=Kopier
ClientFrame.2=Lim inn
ClientFrame.3=eXist-administrasjonsklient
-ClientFrame.5=Gå til samlinga over
+ClientFrame.5=G\u00c3\u00a5 til samlinga over
ClientFrame.7=Oppdater samlingslistinga
ClientFrame.9=Lag ny samling
ClientFrame.11=Legg til ein eller fleire filer til databasen
@@ -10,23 +10,23 @@
ClientFrame.14=icons/Preferences24.gif
ClientFrame.15=Rediger eigar/rettar for dei valde filene eller samlingane
ClientFrame.17=Lag tryggingskopi
-ClientFrame.19=Gjenoppbygg frå tryggingskopi
+ClientFrame.19=Gjenoppbygg fr\u00c3\u00a5 tryggingskopi
ClientFrame.20=icons/keyring-small.png
ClientFrame.21=Administrer brukarar
-ClientFrame.23=Opna vindauga for å søkja i db med XPath/XQuery
+ClientFrame.23=Opna vindauga for \u00c3\u00a5 s\u00c3\u00b8kja i db med XPath/XQuery
ClientFrame.24=Konsollmeny
ClientFrame.27=eXist-adminklienten tilkopla -
ClientFrame.31=Fil
ClientFrame.32=Legg til filer eller katalogar
ClientFrame.34=Lag samling
ClientFrame.36=Lag tomt dokument
-ClientFrame.38=Namn på XML-dokumentet (inklusive filtillegg)
+ClientFrame.38=Namn p\u00c3\u00a5 XML-dokumentet (inklusive filtillegg)
ClientFrame.39=<template></template>
ClientFrame.40=Slett
ClientFrame.42=Kopier
ClientFrame.44=Flytt
ClientFrame.46=Endra namn
-ClientFrame.48=Indekser samlinga på nytt
+ClientFrame.48=Indekser samlinga p\u00c3\u00a5 nytt
ClientFrame.50=Ressurseigenskapar
ClientFrame.52=Avslutt
ClientFrame.54=Verkty
@@ -35,12 +35,12 @@
ClientFrame.59=Administrer indeksar
ClientFrame.61=Administrer policy for rettar
ClientFrame.63=Lag tryggingsskopi
-ClientFrame.64=Gjenoppbygg frå tryggingskopi
+ClientFrame.64=Gjenoppbygg fr\u00c3\u00a5 tryggingskopi
ClientFrame.65=Tilkopling
-ClientFrame.66=Kopla frå
-ClientFrame.67=Kopla frå\n
+ClientFrame.66=Kopla fr\u00c3\u00a5
+ClientFrame.67=Kopla fr\u00c3\u00a5\n
ClientFrame.69=Kopla til
-ClientFrame.70=Opna innloggingspanetet for å kopla til, byta servar, eller byta brukaridentitet.
+ClientFrame.70=Opna innloggingspanetet for \u00c3\u00a5 kopla til, byta servar, eller byta brukaridentitet.
ClientFrame.71=eXist-adminklienten tilkopla -
ClientFrame.75=Kopla til
ClientFrame.77=\ misslyktest\!
@@ -60,16 +60,16 @@
ClientFrame.92=\
ClientFrame.93=Backspace
ClientFrame.94=cd ..\n
-ClientFrame.96=Gje namn på ny samling
+ClientFrame.96=Gje namn p\u00c3\u00a5 ny samling
ClientFrame.99=Spesifiser ein gyldig XML:DB-base-URI (utan
ClientFrame.100=samlingsstig)
ClientFrame.102=Kopling til
ClientFrame.103=\ mislyktest\!
-ClientFrame.104=Er du sikker på at du vil sletta dei valde
+ClientFrame.104=Er du sikker p\u00c3\u00a5 at du vil sletta dei valde
ClientFrame.105=ressursane?
ClientFrame.106=Stadfest slettinga
-ClientFrame.107=Held på og slettar
-ClientFrame.111=Vel målsamling
+ClientFrame.107=Held p\u00c3\u00a5 og slettar
+ClientFrame.111=Vel m\u00c3\u00a5lsamling
ClientFrame.112=Kopier
ClientFrame.115=Flyttar
ClientFrame.116=\ til
@@ -82,7 +82,7 @@
ClientFrame.125=\ til
ClientFrame.126=...
ClientFrame.127=Namneendringa ferdig.
-ClientFrame.128=Vel målsamlinga.
+ClientFrame.128=Vel m\u00c3\u00a5lsamlinga.
ClientFrame.129=Kopier
ClientFrame.132=Kopierer
ClientFrame.133=\ til
@@ -90,7 +90,7 @@
ClientFrame.135=Kopieringa ferdig.
ClientFrame.136=Berre samlingar kan bli reindeksert.
ClientFrame.137=Feil
-ClientFrame.138=Er du sikker på at du vil reindeksera dei valde samlingane \n og alle ressursane under dei?
+ClientFrame.138=Er du sikker p\u00c3\u00a5 at du vil reindeksera dei valde samlingane \n og alle ressursane under dei?
ClientFrame.139=Stadfest reindekseringa
ClientFrame.142=Reindekserer samlinga
ClientFrame.143=...
@@ -102,16 +102,16 @@
ClientFrame.157=Lag tryggingskopi
ClientFrame.167=__contents__.xml
ClientFrame.168=__contents__.xml-filer
-ClientFrame.169=Vel tryggingsfil for å gjenoppbygga
+ClientFrame.169=Vel tryggingsfil for \u00c3\u00a5 gjenoppbygga
ClientFrame.170=dba/admin-passord som skal nyttast for gjennoppbygginga:
ClientFrame.171=Admin-passord
ClientFrame.181=Unnatak:
ClientFrame.184=Administrer brukarar
-ClientFrame.185=Mislyktest med å nå brukaradministrasjonssørvisen (UserManagementService)
+ClientFrame.185=Mislyktest med \u00c3\u00a5 n\u00c3\u00a5...
[truncated message content] |
|
From: <del...@us...> - 2011-05-30 18:02:41
|
Revision: 14582
http://exist.svn.sourceforge.net/exist/?rev=14582&view=rev
Author: deliriumsky
Date: 2011-05-30 18:02:35 +0000 (Mon, 30 May 2011)
Log Message:
-----------
Permission should be round-tripped
Modified Paths:
--------------
branches/adam/eXist-acl/test/src/org/exist/xmldb/RemoteDatabaseImplTest.java
Modified: branches/adam/eXist-acl/test/src/org/exist/xmldb/RemoteDatabaseImplTest.java
===================================================================
--- branches/adam/eXist-acl/test/src/org/exist/xmldb/RemoteDatabaseImplTest.java 2011-05-30 16:45:51 UTC (rev 14581)
+++ branches/adam/eXist-acl/test/src/org/exist/xmldb/RemoteDatabaseImplTest.java 2011-05-30 18:02:35 UTC (rev 14582)
@@ -57,38 +57,35 @@
public void testGetCollection() {
try {
- Class<?> cl = Class.forName(DB_DRIVER);
- Database database = (Database) cl.newInstance();
- DatabaseManager.registerDatabase(database);
+ Class<?> cl = Class.forName(DB_DRIVER);
+ Database database = (Database) cl.newInstance();
+ DatabaseManager.registerDatabase(database);
+
+ Collection rootCollection = DatabaseManager.getCollection(URI + DBBroker.ROOT_COLLECTION, "admin", "");
- Collection rootCollection = DatabaseManager.getCollection(URI + DBBroker.ROOT_COLLECTION, "admin", "");
-
- CollectionManagementService cms = (CollectionManagementService) rootCollection.getService(
- "CollectionManagementService", "1.0");
- Collection adminCollection = cms.createCollection(ADMIN_COLLECTION_NAME);
- UserManagementService ums = (UserManagementService) rootCollection.getService("UserManagementService", "1.0");
- if (ums != null) {
-
- Permission p = PermissionFactory.getPermission();
- p.setMode(Permission.USER_STRING + "=+read,+write," + Permission.GROUP_STRING + "=-read,-write," + Permission.OTHER_STRING + "=-read,-write");
- ums.setPermissions(adminCollection, p);
-
- Collection guestCollection = DatabaseManager.getCollection(URI + DBBroker.ROOT_COLLECTION + "/" + ADMIN_COLLECTION_NAME, "guest",
- "guest");
-
- Resource resource = guestCollection.createResource("testguest", "BinaryResource");
- resource.setContent("123".getBytes());
- try {
- guestCollection.storeResource(resource);
- fail();
- } catch (XMLDBException e) {
-
- }
-
- cms.removeCollection(ADMIN_COLLECTION_NAME);
- }
- } catch (Exception e) {
- fail(e.getMessage());
+ CollectionManagementService cms = (CollectionManagementService) rootCollection.getService("CollectionManagementService", "1.0");
+ Collection adminCollection = cms.createCollection(ADMIN_COLLECTION_NAME);
+ UserManagementService ums = (UserManagementService) rootCollection.getService("UserManagementService", "1.0");
+ if (ums != null) {
+ Permission p = ums.getPermissions(adminCollection);
+ p.setMode(Permission.USER_STRING + "=+read,+write," + Permission.GROUP_STRING + "=-read,-write," + Permission.OTHER_STRING + "=-read,-write");
+ ums.setPermissions(adminCollection, p);
+
+ Collection guestCollection = DatabaseManager.getCollection(URI + DBBroker.ROOT_COLLECTION + "/" + ADMIN_COLLECTION_NAME, "guest", "guest");
+
+ Resource resource = guestCollection.createResource("testguest", "BinaryResource");
+ resource.setContent("123".getBytes());
+ try {
+ guestCollection.storeResource(resource);
+ fail();
+ } catch (XMLDBException e) {
+
+ }
+
+ cms.removeCollection(ADMIN_COLLECTION_NAME);
+ }
+ } catch (Exception e) {
+ fail(e.getMessage());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <del...@us...> - 2011-05-30 16:45:58
|
Revision: 14581
http://exist.svn.sourceforge.net/exist/?rev=14581&view=rev
Author: deliriumsky
Date: 2011-05-30 16:45:51 +0000 (Mon, 30 May 2011)
Log Message:
-----------
Added aspectj to the classpath for tests, needed for running advised code
Modified Paths:
--------------
branches/adam/eXist-acl/extensions/fluent/build.xml
branches/adam/eXist-acl/extensions/indexes/common.xml
branches/adam/eXist-acl/extensions/indexes/lucene/build.xml
branches/adam/eXist-acl/extensions/indexes/ngram/build.xml
branches/adam/eXist-acl/extensions/indexes/spatial/build.xml
branches/adam/eXist-acl/extensions/security/activedirectory/build.xml
branches/adam/eXist-acl/extensions/svn/build.xml
branches/adam/eXist-acl/extensions/xqdoc/build.xml
Modified: branches/adam/eXist-acl/extensions/fluent/build.xml
===================================================================
--- branches/adam/eXist-acl/extensions/fluent/build.xml 2011-05-30 16:18:52 UTC (rev 14580)
+++ branches/adam/eXist-acl/extensions/fluent/build.xml 2011-05-30 16:45:51 UTC (rev 14581)
@@ -47,6 +47,11 @@
<pathelement path="${top.dir}/exist.jar"/>
<pathelement path="${java.class.path}"/>
</path>
+ <path id="classpath.aspectj">
+ <fileset dir="../../${tools.aspectj}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
<path id="classpath.jar">
<pathelement path="${top.dir}/exist-fluent.jar"/>
</path>
@@ -142,6 +147,7 @@
<classpath>
<path refid="classpath.core"/>
+ <path refid="classpath.aspectj"/>
<path refid="classpath.jar"/>
<path refid="classpath.test"/>
<path refid="classpath.test-libs"/>
Modified: branches/adam/eXist-acl/extensions/indexes/common.xml
===================================================================
--- branches/adam/eXist-acl/extensions/indexes/common.xml 2011-05-30 16:18:52 UTC (rev 14580)
+++ branches/adam/eXist-acl/extensions/indexes/common.xml 2011-05-30 16:45:51 UTC (rev 14581)
@@ -39,6 +39,12 @@
<pathelement path="${java.class.path}"/>
</path>
+ <path id="classpath.aspectj">
+ <fileset dir="${top.dir}/tools/aspectj/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
<path id="classpath.junit">
<pathelement path="${top.dir}/test/classes"/>
<pathelement path="${test.classes}"/>
Modified: branches/adam/eXist-acl/extensions/indexes/lucene/build.xml
===================================================================
--- branches/adam/eXist-acl/extensions/indexes/lucene/build.xml 2011-05-30 16:18:52 UTC (rev 14580)
+++ branches/adam/eXist-acl/extensions/indexes/lucene/build.xml 2011-05-30 16:45:51 UTC (rev 14581)
@@ -26,6 +26,7 @@
<classpath refid="classpath.core"/>
<classpath refid="classpath.junit"/>
+ <classpath refid="classpath.aspectj"/>
<formatter type="plain"/>
<formatter type="xml"/>
Modified: branches/adam/eXist-acl/extensions/indexes/ngram/build.xml
===================================================================
--- branches/adam/eXist-acl/extensions/indexes/ngram/build.xml 2011-05-30 16:18:52 UTC (rev 14580)
+++ branches/adam/eXist-acl/extensions/indexes/ngram/build.xml 2011-05-30 16:45:51 UTC (rev 14581)
@@ -24,6 +24,7 @@
<classpath refid="classpath.core"/>
<classpath refid="classpath.junit"/>
+ <classpath refid="classpath.aspectj"/>
<formatter type="plain"/>
<formatter type="xml"/>
Modified: branches/adam/eXist-acl/extensions/indexes/spatial/build.xml
===================================================================
--- branches/adam/eXist-acl/extensions/indexes/spatial/build.xml 2011-05-30 16:18:52 UTC (rev 14580)
+++ branches/adam/eXist-acl/extensions/indexes/spatial/build.xml 2011-05-30 16:45:51 UTC (rev 14581)
@@ -135,6 +135,7 @@
<junit fork="yes" haltonfailure="false" printsummary="yes" showoutput="${junit.output}" maxmemory="300m">
<classpath refid="classpath.core"/>
+ <classpath refid="classpath.aspectj"/>
<classpath refid="classpath.junit"/>
<formatter type="plain"/>
Modified: branches/adam/eXist-acl/extensions/security/activedirectory/build.xml
===================================================================
--- branches/adam/eXist-acl/extensions/security/activedirectory/build.xml 2011-05-30 16:18:52 UTC (rev 14580)
+++ branches/adam/eXist-acl/extensions/security/activedirectory/build.xml 2011-05-30 16:45:51 UTC (rev 14581)
@@ -46,6 +46,12 @@
<pathelement path="${top.dir}/start.jar"/>
<pathelement path="${java.class.path}"/>
</path>
+
+ <path id="classpath.aspectj">
+ <fileset dir="${top.dir}/tools/aspectj/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
<target name="prepare">
<mkdir dir="${classes}"/>
@@ -103,6 +109,7 @@
<classpath refid="classpath.core"/>
<classpath refid="classpath.junit"/>
+ <classpath refid="classpath.aspectj"/>
<formatter type="plain"/>
<formatter type="xml"/>
Modified: branches/adam/eXist-acl/extensions/svn/build.xml
===================================================================
--- branches/adam/eXist-acl/extensions/svn/build.xml 2011-05-30 16:18:52 UTC (rev 14580)
+++ branches/adam/eXist-acl/extensions/svn/build.xml 2011-05-30 16:45:51 UTC (rev 14581)
@@ -39,6 +39,11 @@
<pathelement path="${top.dir}/start.jar"/>
<pathelement path="${java.class.path}"/>
</path>
+ <path id="classpath.aspectj">
+ <fileset dir="${top.dir}/tools/aspectj/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
<path id="classpath.test-libs">
<fileset dir="${top.dir}/${lib.test}">
<include name="*.jar"/>
@@ -134,6 +139,7 @@
<classpath>
<path refid="classpath.core"/>
+ <path refid="classpath.aspectj"/>
<path refid="classpath.jar"/>
<path refid="classpath.test"/>
<path refid="classpath.test-libs"/>
Modified: branches/adam/eXist-acl/extensions/xqdoc/build.xml
===================================================================
--- branches/adam/eXist-acl/extensions/xqdoc/build.xml 2011-05-30 16:18:52 UTC (rev 14580)
+++ branches/adam/eXist-acl/extensions/xqdoc/build.xml 2011-05-30 16:45:51 UTC (rev 14581)
@@ -54,6 +54,11 @@
<pathelement path="${top.dir}/start.jar"/>
<pathelement path="${java.class.path}"/>
</path>
+ <path id="classpath.aspectj">
+ <fileset dir="${top.dir}/tools/aspectj/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
<path id="classpath.junit">
<pathelement path="${top.dir}/test/classes"/>
<pathelement path="${test.classes}"/>
@@ -126,6 +131,7 @@
<junit fork="yes" haltonfailure="false" printsummary="yes" showoutput="${junit.output}" maxmemory="${junit.forked.VM.maxmemory}">
<classpath refid="classpath.core"/>
+ <classpath refid="classpath.aspectj"/>
<classpath refid="classpath.junit"/>
<classpath refid="classpath.test-libs"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <del...@us...> - 2011-05-30 16:18:58
|
Revision: 14580
http://exist.svn.sourceforge.net/exist/?rev=14580&view=rev
Author: deliriumsky
Date: 2011-05-30 16:18:52 +0000 (Mon, 30 May 2011)
Log Message:
-----------
Added aspectj to the classpath for tests, needed for running advised code
Modified Paths:
--------------
branches/adam/eXist-acl/build/scripts/junit.xml
Modified: branches/adam/eXist-acl/build/scripts/junit.xml
===================================================================
--- branches/adam/eXist-acl/build/scripts/junit.xml 2011-05-30 15:34:07 UTC (rev 14579)
+++ branches/adam/eXist-acl/build/scripts/junit.xml 2011-05-30 16:18:52 UTC (rev 14580)
@@ -97,6 +97,7 @@
<sysproperty key="exist.home" value="${basedir}" />
<classpath refid="classpath.core"/>
<classpath refid="classpath.jetty"/>
+ <classpath refid="classpath.aspectj"/>
<classpath refid="classpath.junit"/>
<classpath refid="classpath.test-libs"/>
@@ -162,6 +163,7 @@
<junit haltonfailure="false" printsummary="yes" showoutput="${junit.output}" maxmemory="${junit.forked.VM.maxmemory}">
<sysproperty key="exist.home" value="${basedir}" />
<classpath refid="classpath.core"/>
+ <classpath refid="classpath.aspectj"/>
<classpath refid="classpath.jetty"/>
<classpath refid="classpath.junit"/>
<classpath refid="classpath.test-libs"/>
@@ -189,6 +191,7 @@
<junit haltonfailure="false" printsummary="on" showoutput="${junit.output}" fork="no">
<sysproperty key="exist.home" value="${basedir}" />
<classpath refid="classpath.core"/>
+ <classpath refid="classpath.aspectj"/>
<classpath refid="classpath.jetty"/>
<classpath refid="classpath.junit"/>
<classpath refid="classpath.test-libs"/>
@@ -207,6 +210,7 @@
<junit haltonfailure="false" printsummary="on" showoutput="${junit.output}" fork="yes" maxmemory="${junit.forked.VM.maxmemory}">
<sysproperty key="exist.home" value="${basedir}" />
<classpath refid="classpath.core"/>
+ <classpath refid="classpath.aspectj"/>
<classpath refid="classpath.jetty"/>
<classpath refid="classpath.junit"/>
<classpath refid="classpath.test-libs"/>
@@ -256,6 +260,7 @@
<junit haltonfailure="false" printsummary="yes" showoutput="${junit.output}" maxmemory="${junit.forked.VM.maxmemory}">
<sysproperty key="exist.home" value="${basedir}" />
<classpath refid="classpath.core"/>
+ <classpath refid="classpath.aspectj"/>
<classpath refid="classpath.jetty"/>
<classpath refid="classpath.junit"/>
<classpath refid="classpath.test-libs"/>
@@ -281,6 +286,7 @@
<junit haltonfailure="false" printsummary="yes" showoutput="${junit.output}" maxmemory="${junit.forked.VM.maxmemory}">
<sysproperty key="exist.home" value="${basedir}" />
<classpath refid="classpath.core"/>
+ <classpath refid="classpath.aspectj"/>
<classpath refid="classpath.jetty"/>
<classpath refid="classpath.junit"/>
<classpath refid="classpath.test-libs"/>
@@ -299,6 +305,7 @@
<junit haltonfailure="false" printsummary="yes" showoutput="${junit.output}" maxmemory="${junit.forked.VM.maxmemory}">
<sysproperty key="exist.home" value="${basedir}" />
<classpath refid="classpath.core"/>
+ <classpath refid="classpath.aspectj"/>
<classpath refid="classpath.jetty"/>
<classpath refid="classpath.junit"/>
<classpath refid="classpath.test-libs"/>
@@ -416,9 +423,10 @@
source="${build.compiler.source}" target="${build.compiler.target}">
<classpath>
<path refid="classpath.core"/>
+ <path refid="classpath.aspectj"/>
<path refid="classpath.junit"/>
- <path refid="classpath.test-libs"/>
- <path refid="classpath.xslts"/>
+ <path refid="classpath.test-libs"/>
+ <path refid="classpath.xslts"/>
</classpath>
</javac>
<echo>JUnit tests generated.</echo>
@@ -440,6 +448,7 @@
<junit haltonfailure="false" printsummary="on" showoutput="${junit.output}" fork="yes" maxmemory="${junit.forked.VM.maxmemory}">
<sysproperty key="exist.home" value="${basedir}" />
<classpath refid="classpath.core"/>
+ <classpath refid="classpath.aspectj"/>
<classpath refid="classpath.jetty"/>
<classpath refid="classpath.ant_launcher"/>
<classpath refid="classpath.junit"/>
@@ -462,6 +471,7 @@
<junit haltonfailure="false" printsummary="on" showoutput="${junit.output}" fork="yes" maxmemory="512m">
<sysproperty key="exist.home" value="${basedir}" />
<classpath refid="classpath.core"/>
+ <classpath refid="classpath.aspectj"/>
<classpath refid="classpath.jetty"/>
<classpath refid="classpath.ant_launcher"/>
<classpath refid="classpath.junit"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <del...@us...> - 2011-05-30 15:34:15
|
Revision: 14579
http://exist.svn.sourceforge.net/exist/?rev=14579&view=rev
Author: deliriumsky
Date: 2011-05-30 15:34:07 +0000 (Mon, 30 May 2011)
Log Message:
-----------
More rigid permission testing
Modified Paths:
--------------
branches/adam/eXist-acl/test/src/org/exist/security/XMLDBSecurityTest.java
Modified: branches/adam/eXist-acl/test/src/org/exist/security/XMLDBSecurityTest.java
===================================================================
--- branches/adam/eXist-acl/test/src/org/exist/security/XMLDBSecurityTest.java 2011-05-30 13:27:26 UTC (rev 14578)
+++ branches/adam/eXist-acl/test/src/org/exist/security/XMLDBSecurityTest.java 2011-05-30 15:34:07 UTC (rev 14579)
@@ -3,14 +3,12 @@
import org.exist.jetty.JettyStart;
import org.exist.security.internal.aider.GroupAider;
import org.exist.security.internal.aider.UserAider;
-import org.exist.xmldb.DatabaseInstanceManager;
import org.exist.xmldb.UserManagementService;
import org.junit.*;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.xmldb.api.DatabaseManager;
import org.xmldb.api.base.Collection;
-import org.xmldb.api.base.Database;
import org.xmldb.api.base.Resource;
import org.xmldb.api.base.XMLDBException;
import org.xmldb.api.modules.CollectionManagementService;
@@ -94,7 +92,7 @@
}
@Test (expected=XMLDBException.class)
- // only the owner or admin can chown a collection or resource
+ // only the owner or dba can chown a collection or resource
public void worldChownResource() throws XMLDBException {
Collection test = DatabaseManager.getCollection(baseUri + "/db/securityTest1", "guest", "guest");
Resource resource = test.getResource("test.xml");
@@ -106,79 +104,69 @@
}
@Test
- public void groupCreateSubColl() {
- try {
- Collection test = DatabaseManager.getCollection(baseUri + "/db/securityTest1", "test2", "test2");
- CollectionManagementService cms = (CollectionManagementService)
- test.getService("CollectionManagementService", "1.0");
- Collection newCol = cms.createCollection("createdByTest2");
- assertNotNull(newCol);
- } catch (XMLDBException e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void groupCreateSubColl() throws XMLDBException {
+ Collection test = DatabaseManager.getCollection(baseUri + "/db/securityTest1", "test2", "test2");
+ CollectionManagementService cms = (CollectionManagementService)test.getService("CollectionManagementService", "1.0");
+ Collection newCol = cms.createCollection("createdByTest2");
+ assertNotNull(newCol);
}
@Test
- public void groupCreateResource() {
- try {
- Collection test = DatabaseManager.getCollection(baseUri + "/db/securityTest1", "test2", "test2");
- Resource resource = test.createResource("createdByTest2.xml", "XMLResource");
- resource.setContent("<testMe/>");
- test.storeResource(resource);
+ public void groupCreateResource() throws XMLDBException {
+ Collection test = DatabaseManager.getCollection(baseUri + "/db/securityTest1", "test2", "test2");
+ Resource resource = test.createResource("createdByTest2.xml", "XMLResource");
+ resource.setContent("<testMe/>");
+ test.storeResource(resource);
- resource = test.getResource("createdByTest2.xml");
- assertNotNull(resource);
- assertEquals("<testMe/>", resource.getContent().toString());
- } catch (XMLDBException e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ resource = test.getResource("createdByTest2.xml");
+ assertNotNull(resource);
+ assertEquals("<testMe/>", resource.getContent().toString());
}
@Test
- public void groupRemoveCollection() {
- try {
- Collection root = DatabaseManager.getCollection(baseUri + "/db", "test2", "test2");
- CollectionManagementService cms = (CollectionManagementService)
- root.getService("CollectionManagementService", "1.0");
- cms.removeCollection("securityTest1");
- } catch (XMLDBException e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void groupRemoveCollection() throws XMLDBException {
+ Collection root = DatabaseManager.getCollection(baseUri + "/db", "test2", "test2");
+ CollectionManagementService cms = (CollectionManagementService)
+ root.getService("CollectionManagementService", "1.0");
+ cms.removeCollection("securityTest1");
}
+ @Test(expected=XMLDBException.class)
+ public void groupChmodCollection_asNotOwnerAndNotDBA() throws XMLDBException {
+
+ Collection test = DatabaseManager.getCollection(baseUri + "/db/securityTest1", "test2", "test2");
+ UserManagementService ums = (UserManagementService)test.getService("UserManagementService", "1.0");
+
+ // grant myself all rights ;-)
+ ums.chmod(07777);
+ }
+
@Test
- public void groupChmodCollection() {
- try {
- Collection test = DatabaseManager.getCollection(baseUri + "/db/securityTest1", "test2", "test2");
- UserManagementService ums = (UserManagementService)
- test.getService("UserManagementService", "1.0");
- // grant myself all rights ;-)
- ums.chmod(07777);
-
- assertEquals("rwsrwsrwt", ums.getPermissions(test).toString());
-
- } catch (XMLDBException e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void groupChmodCollection_asOwner() throws XMLDBException {
+ Collection test = DatabaseManager.getCollection(baseUri + "/db/securityTest1", "test1", "test1");
+ UserManagementService ums = (UserManagementService) test.getService("UserManagementService", "1.0");
+ // grant myself all rights ;-)
+ ums.chmod(07777);
+
+ assertEquals("rwsrwsrwt", ums.getPermissions(test).toString());
}
+ @Test(expected=XMLDBException.class)
+ public void groupChmodResource_asNotOwnerAndNotDBA() throws XMLDBException {
+ Collection test = DatabaseManager.getCollection(baseUri + "/db/securityTest1", "test2", "test2");
+ Resource resource = test.getResource("test.xml");
+ UserManagementService ums = (UserManagementService) test.getService("UserManagementService", "1.0");
+ // grant myself all rights ;-)
+ ums.chmod(resource, 0777);
+ }
+
@Test
- public void groupChmodResource() {
- try {
- Collection test = DatabaseManager.getCollection(baseUri + "/db/securityTest1", "test2", "test2");
- Resource resource = test.getResource("test.xml");
- UserManagementService ums = (UserManagementService)
- test.getService("UserManagementService", "1.0");
- // grant myself all rights ;-)
- ums.chmod(resource, 0777);
- } catch (XMLDBException e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void groupChmodResource_asOwner() throws XMLDBException {
+ Collection test = DatabaseManager.getCollection(baseUri + "/db/securityTest1", "test1", "test1");
+ Resource resource = test.getResource("test.xml");
+ UserManagementService ums = (UserManagementService) test.getService("UserManagementService", "1.0");
+ // grant myself all rights ;-)
+ ums.chmod(resource, 0777);
}
@Test (expected=XMLDBException.class)
@@ -213,11 +201,19 @@
UserManagementService ums = (UserManagementService) root.getService("UserManagementService", "1.0");
Account test1 = ums.getAccount("test1");
- if (test1 != null) ums.removeAccount(test1);
+ if (test1 != null){
+ ums.removeAccount(test1);
+ }
+
Account test2 = ums.getAccount("test2");
- if (test2 != null) ums.removeAccount(test2);
+ if (test2 != null){
+ ums.removeAccount(test2);
+ }
+
Group group = ums.getGroup("users");
- if (group != null) ums.removeGroup(group);
+ if (group != null){
+ ums.removeGroup(group);
+ }
group = new GroupAider("exist","users");
ums.addGroup(group);
@@ -231,8 +227,7 @@
ums.addAccount(user);
// create a collection /db/securityTest as user "test1"
- CollectionManagementService cms = (CollectionManagementService)
- root.getService("CollectionManagementService", "1.0");
+ CollectionManagementService cms = (CollectionManagementService)root.getService("CollectionManagementService", "1.0");
Collection test = cms.createCollection("securityTest1");
ums = (UserManagementService) test.getService("UserManagementService", "1.0");
// pass ownership to test1
@@ -245,8 +240,8 @@
Resource resource = test.createResource("test.xml", "XMLResource");
resource.setContent("<test/>");
test.storeResource(resource);
+ ums.chmod(resource, 0770);
- ums.chmod(resource, 0770);
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
@@ -257,17 +252,27 @@
public void cleanup() {
try {
Collection root = DatabaseManager.getCollection(baseUri + "/db", "admin", "");
- CollectionManagementService cms =
- (CollectionManagementService) root.getService("CollectionManagementService", "1.0");
- if (root.getChildCollection("securityTest1") != null)
+ CollectionManagementService cms = (CollectionManagementService) root.getService("CollectionManagementService", "1.0");
+ if (root.getChildCollection("securityTest1") != null) {
cms.removeCollection("securityTest1");
+ }
+
UserManagementService ums = (UserManagementService) root.getService("UserManagementService", "1.0");
+
Account test1 = ums.getAccount("test1");
- if (test1 != null) ums.removeAccount(test1);
+ if (test1 != null) {
+ ums.removeAccount(test1);
+ }
+
Account test2 = ums.getAccount("test2");
- if (test2 != null) ums.removeAccount(test2);
+ if (test2 != null) {
+ ums.removeAccount(test2);
+ }
+
Group group = ums.getGroup("users");
- if (group != null) ums.removeGroup(group);
+ if (group != null) {
+ ums.removeGroup(group);
+ }
} catch (XMLDBException e) {
e.printStackTrace();
fail(e.getMessage());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <del...@us...> - 2011-05-30 13:27:32
|
Revision: 14578
http://exist.svn.sourceforge.net/exist/?rev=14578&view=rev
Author: deliriumsky
Date: 2011-05-30 13:27:26 +0000 (Mon, 30 May 2011)
Log Message:
-----------
Support for AOP
Modified Paths:
--------------
branches/adam/eXist-acl/build/scripts/build-impl.xml
Added Paths:
-----------
branches/adam/eXist-acl/tools/aspectj/
branches/adam/eXist-acl/tools/aspectj/lib/
branches/adam/eXist-acl/tools/aspectj/lib/aspectjrt-1.6.11.jar
branches/adam/eXist-acl/tools/aspectj/lib/aspectjtools-1.6.11.jar
branches/adam/eXist-acl/tools/aspectj/lib/aspectjweaver-1.6.11.jar
Modified: branches/adam/eXist-acl/build/scripts/build-impl.xml
===================================================================
--- branches/adam/eXist-acl/build/scripts/build-impl.xml 2011-05-30 11:01:49 UTC (rev 14577)
+++ branches/adam/eXist-acl/build/scripts/build-impl.xml 2011-05-30 13:27:26 UTC (rev 14578)
@@ -97,6 +97,18 @@
</fileset>
</path>
+ <path id="classpath.catalina">
+ <fileset dir="${catalina.home}/bin">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${catalina.home}/server/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <!--fileset dir="${catalina.home}/common/lib">
+ <include name="*.jar"/>
+ </fileset-->
+ </path>
+
<taskdef name="java2wsdl" classname="org.apache.axis.tools.ant.wsdl.Java2WsdlAntTask">
<classpath refid="classpath.core"/>
</taskdef>
@@ -113,6 +125,14 @@
<classpath refid="classpath.core"/>
</taskdef-->
+ <taskdef classpath="${tools.aspectj}/lib/aspectjtools-1.6.11.jar" resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties"/>
+ <path id="classpath.aspectj">
+ <fileset dir="${tools.aspectj}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+
<!-- =================================================================== -->
<!-- Prepare the build -->
<!-- =================================================================== -->
@@ -177,6 +197,7 @@
<echo
message="Compiling with Java ${ant.java.version} from ${build.compiler.source} source to ${build.compiler.target} target, debug ${build.debug}, optimize ${build.optimize}, deprecation ${build.deprecation}"/>
+
<javac includeAntRuntime="false" debug="${build.debug}" deprecation="${build.deprecation}" destdir="${build.classes}"
encoding="UTF-8" optimize="${build.optimize}" srcdir="${src}"
source="${build.compiler.source}" target="${build.compiler.target}"
@@ -189,6 +210,7 @@
<classpath>
<path refid="classpath.core"/>
<path refid="classpath.jetty"/>
+ <path refid="classpath.aspectj"/>
</classpath>
</javac>
@@ -207,20 +229,39 @@
<include name="org/exist/http/realm/**"/>
<classpath>
<path refid="classpath.core"/>
- <fileset dir="${catalina.home}/bin">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${catalina.home}/server/lib">
- <include name="*.jar"/>
- </fileset>
- <!--fileset dir="${catalina.home}/common/lib">
- <include name="*.jar"/>
- </fileset-->
+ <path refid="classpath.catalina"/>
</classpath>
</javac>
</target>
<!-- =================================================================== -->
+ <!-- Compiles the aspects -->
+ <!-- =================================================================== -->
+ <target name="compile-aspectj" depends="prepare,compile,compile-tomcat-realm" description="Compiles the aspects">
+
+ <echo
+ message="Compiling aspects with Java ${ant.java.version} from ${build.compiler.source} source to ${build.compiler.target} target, debug ${build.debug}, optimize ${build.optimize}, deprecation ${build.deprecation}"/>
+
+ <iajc debug="${build.debug}" deprecation="${build.deprecation}" destdir="${build.classes}"
+ encoding="UTF-8" srcdir="${src}"
+ source="${build.compiler.source}" target="${build.compiler.target}"
+ fork="true" maxmem="1024m" showWeaveInfo="true">
+
+ <include name="org/**"/>
+ <include name="org/exist/schema/**"/>
+ <exclude name="org/exist/http/realm/**"/>
+ <exclude name="doxygen"/>
+
+ <classpath>
+ <path refid="classpath.aspectj"/>
+ <path refid="classpath.core"/>
+ <path refid="classpath.jetty"/>
+ <!-- path refid="classpath.catalina"/ -->
+ </classpath>
+ </iajc>
+ </target>
+
+ <!-- =================================================================== -->
<!-- Run antlr parser generator -->
<!-- needs antlr distribution-directory in the classpath -->
<!-- =================================================================== -->
@@ -258,9 +299,9 @@
<target depends="XQueryTreeParser,jar" name="xquery-ng"/>
<!-- ================================================================== -->
- <!-- Create jar files -->
+ <!-- Create jar files -->
<!-- ================================================================== -->
- <target name="jar" depends="compile, compile-tomcat-realm"
+ <target name="jar" depends="compile, compile-tomcat-realm, compile-aspectj"
description="Create eXist unsigned jar files">
<filter token="version" value="${project.version}"/>
<filter token="build" value="${DSTAMP}"/>
Added: branches/adam/eXist-acl/tools/aspectj/lib/aspectjrt-1.6.11.jar
===================================================================
(Binary files differ)
Property changes on: branches/adam/eXist-acl/tools/aspectj/lib/aspectjrt-1.6.11.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/adam/eXist-acl/tools/aspectj/lib/aspectjtools-1.6.11.jar
===================================================================
(Binary files differ)
Property changes on: branches/adam/eXist-acl/tools/aspectj/lib/aspectjtools-1.6.11.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/adam/eXist-acl/tools/aspectj/lib/aspectjweaver-1.6.11.jar
===================================================================
(Binary files differ)
Property changes on: branches/adam/eXist-acl/tools/aspectj/lib/aspectjweaver-1.6.11.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wol...@us...> - 2011-05-30 11:01:55
|
Revision: 14577
http://exist.svn.sourceforge.net/exist/?rev=14577&view=rev
Author: wolfgang_m
Date: 2011-05-30 11:01:49 +0000 (Mon, 30 May 2011)
Log Message:
-----------
[bugfix] avoid NPE in deadlock detection
Modified Paths:
--------------
stable/eXist-1.4.x/src/org/exist/storage/lock/MultiReadReentrantLock.java
Modified: stable/eXist-1.4.x/src/org/exist/storage/lock/MultiReadReentrantLock.java
===================================================================
--- stable/eXist-1.4.x/src/org/exist/storage/lock/MultiReadReentrantLock.java 2011-05-30 09:06:12 UTC (rev 14576)
+++ stable/eXist-1.4.x/src/org/exist/storage/lock/MultiReadReentrantLock.java 2011-05-30 11:01:49 UTC (rev 14577)
@@ -533,10 +533,10 @@
* @param owner the thread
* @return true if owner has a lock
*/
- public boolean hasLock(Thread owner) {
+ public synchronized boolean hasLock(Thread owner) {
if (writeLockedThread == owner)
return true;
- return hasReadLock(owner);
+ return isLockedForRead(owner);
}
public void wakeUp() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <del...@us...> - 2011-05-30 09:06:18
|
Revision: 14576
http://exist.svn.sourceforge.net/exist/?rev=14576&view=rev
Author: deliriumsky
Date: 2011-05-30 09:06:12 +0000 (Mon, 30 May 2011)
Log Message:
-----------
Some XML-RPC fixes for Permissions
Modified Paths:
--------------
branches/adam/eXist-acl/src/org/exist/xmldb/RemoteUserManagementService.java
branches/adam/eXist-acl/src/org/exist/xmlrpc/RpcAPI.java
branches/adam/eXist-acl/src/org/exist/xmlrpc/RpcConnection.java
branches/adam/eXist-acl/test/src/org/exist/security/XMLDBSecurityTest.java
Modified: branches/adam/eXist-acl/src/org/exist/xmldb/RemoteUserManagementService.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/xmldb/RemoteUserManagementService.java 2011-05-29 16:52:16 UTC (rev 14575)
+++ branches/adam/eXist-acl/src/org/exist/xmldb/RemoteUserManagementService.java 2011-05-30 09:06:12 UTC (rev 14576)
@@ -164,29 +164,33 @@
*@param mode Access mode
*@exception XMLDBException Description of the Exception
*/
- public void chmod(String mode) throws XMLDBException {
- try {
+ @Override
+ public void chmod(String mode) throws XMLDBException {
+ try {
List<Object> params = new ArrayList<Object>(2);
- params.add(parent.getPath());
- params.add(mode);
- parent.getClient().execute("setPermissions", params);
- } catch (XmlRpcException e) {
- throw new XMLDBException(ErrorCodes.VENDOR_ERROR, e.getMessage(), e);
- }
+ params.add(parent.getPath());
+ params.add(mode);
+
+ parent.getClient().execute("setPermissions", params);
+ } catch (XmlRpcException e) {
+ throw new XMLDBException(ErrorCodes.VENDOR_ERROR, e.getMessage(), e);
+ }
}
/**
* @see org.exist.xmldb.UserManagementService#chmod(int)
*/
- public void chmod(int mode) throws XMLDBException {
- try {
+ @Override
+ public void chmod(int mode) throws XMLDBException {
+ try {
List<Object> params = new ArrayList<Object>(2);
- params.add(parent.getPath());
- params.add(new Integer(mode));
- parent.getClient().execute("setPermissions", params);
- } catch (XmlRpcException e) {
- throw new XMLDBException(ErrorCodes.VENDOR_ERROR, e.getMessage(), e);
- }
+ params.add(parent.getPath());
+ params.add(new Integer(mode));
+
+ parent.getClient().execute("setPermissions", params);
+ } catch (XmlRpcException e) {
+ throw new XMLDBException(ErrorCodes.VENDOR_ERROR, e.getMessage(), e);
+ }
}
/* (non-Javadoc)
@@ -243,40 +247,42 @@
*@param group Description of the Parameter
*@exception XMLDBException Description of the Exception
*/
- public void chown(Account u, String group) throws XMLDBException {
- try {
+ @Override
+ public void chown(Account u, String group) throws XMLDBException {
+ try {
List<Object> params = new ArrayList<Object>(4);
- params.add(parent.getPath());
- params.add(u.getName());
- params.add(group);
- params.add(null);
- parent.getClient().execute("setPermissions", params);
- } catch (XmlRpcException e) {
- throw new XMLDBException(ErrorCodes.VENDOR_ERROR, e.getMessage(), e);
- }
+ params.add(parent.getPath());
+ params.add(u.getName());
+ params.add(group);
+
+ parent.getClient().execute("setPermissions", params);
+ } catch (XmlRpcException e) {
+ throw new XMLDBException(ErrorCodes.VENDOR_ERROR, e.getMessage(), e);
+ }
}
- /**
- * Change the owner of a resource
- *
- *@param res Resource
- *@param u The new owner of the resource
- *@param group The owner group
- *@exception XMLDBException Description of the Exception
- */
- public void chown(Resource res, Account u, String group) throws XMLDBException {
+ /**
+ * Change the owner of a resource
+ *
+ *@param res Resource
+ *@param u The new owner of the resource
+ *@param group The owner group
+ *@exception XMLDBException Description of the Exception
+ */
+ @Override
+ public void chown(Resource res, Account u, String group) throws XMLDBException {
//TODO : use dedicated function in XmldbURI
- String path = ((RemoteCollection) res.getParentCollection()).getPath() + "/" + res.getId();
- try {
+ String path = ((RemoteCollection) res.getParentCollection()).getPath() + "/" + res.getId();
+ try {
List<Object> params = new ArrayList<Object>(4);
- params.add(path);
- params.add(u.getName());
- params.add(group);
- params.add("");
- parent.getClient().execute("setPermissions", params);
- } catch (XmlRpcException e) {
- throw new XMLDBException(ErrorCodes.VENDOR_ERROR, e.getMessage(), e);
- }
+ params.add(path);
+ params.add(u.getName());
+ params.add(group);
+
+ parent.getClient().execute("setPermissions", params);
+ } catch (XmlRpcException e) {
+ throw new XMLDBException(ErrorCodes.VENDOR_ERROR, e.getMessage(), e);
+ }
}
/**
Modified: branches/adam/eXist-acl/src/org/exist/xmlrpc/RpcAPI.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/xmlrpc/RpcAPI.java 2011-05-29 16:52:16 UTC (rev 14575)
+++ branches/adam/eXist-acl/src/org/exist/xmlrpc/RpcAPI.java 2011-05-30 09:06:12 UTC (rev 14576)
@@ -771,6 +771,12 @@
final List<ACEAider> aces)
throws EXistException, PermissionDeniedException, URISyntaxException;
+ public boolean setPermissions(
+ final String resource,
+ final String owner,
+ final String ownerGroup)
+ throws EXistException, PermissionDeniedException, URISyntaxException;
+
public boolean lockResource(String path, String userName)
throws EXistException, PermissionDeniedException, URISyntaxException;
Modified: branches/adam/eXist-acl/src/org/exist/xmlrpc/RpcConnection.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/xmlrpc/RpcConnection.java 2011-05-29 16:52:16 UTC (rev 14575)
+++ branches/adam/eXist-acl/src/org/exist/xmlrpc/RpcConnection.java 2011-05-30 09:06:12 UTC (rev 14576)
@@ -3412,6 +3412,20 @@
}
@Override
+ public boolean setPermissions(final String resource, final String owner, final String ownerGroup) throws EXistException, PermissionDeniedException, URISyntaxException {
+ DBBroker broker = factory.getBrokerPool().get(user);
+ PermissionFactory.updatePermissions(broker, XmldbURI.xmldbUriFor(resource), new PermissionModifier(){
+ @Override
+ public void modify(Permission permission) throws PermissionDeniedException {
+ permission.setOwner(owner);
+ permission.setGroup(ownerGroup);
+ }
+ });
+
+ return true;
+ }
+
+ @Override
public boolean setPermissions(final String resource, final int permissions) throws EXistException, PermissionDeniedException, URISyntaxException {
DBBroker broker = factory.getBrokerPool().get(user);
PermissionFactory.updatePermissions(broker, XmldbURI.xmldbUriFor(resource), new PermissionModifier(){
Modified: branches/adam/eXist-acl/test/src/org/exist/security/XMLDBSecurityTest.java
===================================================================
--- branches/adam/eXist-acl/test/src/org/exist/security/XMLDBSecurityTest.java 2011-05-29 16:52:16 UTC (rev 14575)
+++ branches/adam/eXist-acl/test/src/org/exist/security/XMLDBSecurityTest.java 2011-05-30 09:06:12 UTC (rev 14576)
@@ -191,7 +191,7 @@
Account test2 = ums.getAccount("test2");
ums.chown(test2, "users");
Permission perms = ums.getPermissions(test);
- assertEquals("test2", perms.getOwner());
+ assertEquals("test2", perms.getOwner().getName());
}
@Test (expected=XMLDBException.class)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wol...@us...> - 2011-05-29 16:52:23
|
Revision: 14575
http://exist.svn.sourceforge.net/exist/?rev=14575&view=rev
Author: wolfgang_m
Date: 2011-05-29 16:52:16 +0000 (Sun, 29 May 2011)
Log Message:
-----------
[ignore] Improved error messages for invalid element constructors (display name of unclosed element).
Modified Paths:
--------------
trunk/eXist/src/org/exist/xquery/parser/XQuery.g
trunk/eXist/src/org/exist/xquery/parser/XQueryParser.java
Modified: trunk/eXist/src/org/exist/xquery/parser/XQuery.g
===================================================================
--- trunk/eXist/src/org/exist/xquery/parser/XQuery.g 2011-05-29 13:08:53 UTC (rev 14574)
+++ trunk/eXist/src/org/exist/xquery/parser/XQuery.g 2011-05-29 16:52:16 UTC (rev 14575)
@@ -1250,11 +1250,6 @@
}
:
( LT qName ~( GT | SLASH ) ) => elementWithAttributes | elementWithoutAttributes
- exception catch [RecognitionException e]
- {
- lexer.wsExplicit = false;
- throw new XPathException("err:XPST0003: Parse error: element name containing whitespace: " + e.getMessage() + " at line: " + e.getLine() + " column: " + e.getColumn());
- }
;
elementWithoutAttributes throws XPathException
@@ -1294,6 +1289,11 @@
)
)
{ #elementWithoutAttributes.copyLexInfo(#q); }
+ exception catch [RecognitionException e]
+ {
+ lexer.wsExplicit = false;
+ throw new XPathException(#q, "err:XPST0003: No closing end tag found for element constructor: " + name);
+ }
;
// === XML ===
@@ -1321,10 +1321,10 @@
content:mixedElementContent END_TAG_START! name=qn:qName! GT!
{
if (elementStack.isEmpty())
- throw new XPathException(#qn, "found closing tag without opening tag: " + name);
+ throw new XPathException(#qn, "err:XPST0003: Found closing tag without opening tag: " + name);
String prev= (String) elementStack.pop();
if (!prev.equals(name))
- throw new XPathException(#qn, "found closing tag: " + name + "; expected: " + prev);
+ throw new XPathException(#qn, "err:XPST0003: Found closing tag: " + name + "; expected: " + prev);
#elementWithAttributes= #(#[ELEMENT, name], #attrs);
if (!elementStack.isEmpty()) {
lexer.inElementContent= true;
@@ -1333,6 +1333,11 @@
)
)
{ #elementWithAttributes.copyLexInfo(#q); }
+ exception catch [RecognitionException e]
+ {
+ lexer.wsExplicit = false;
+ throw new XPathException(#q, "err:XPST0003: Static error: no closing end tag found for element constructor: " + name);
+ }
;
attributeList throws XPathException
Modified: trunk/eXist/src/org/exist/xquery/parser/XQueryParser.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/parser/XQueryParser.java 2011-05-29 13:08:53 UTC (rev 14574)
+++ trunk/eXist/src/org/exist/xquery/parser/XQueryParser.java 2011-05-29 16:52:16 UTC (rev 14575)
@@ -8972,52 +8972,40 @@
//lexer.wsExplicit = true;
- try { // for error handling
- boolean synPredMatched392 = false;
- if (((LA(1)==LT))) {
- int _m392 = mark();
- synPredMatched392 = true;
- inputState.guessing++;
- try {
- {
- match(LT);
- qName();
- {
- match(_tokenSet_14);
- }
- }
+ boolean synPredMatched392 = false;
+ if (((LA(1)==LT))) {
+ int _m392 = mark();
+ synPredMatched392 = true;
+ inputState.guessing++;
+ try {
+ {
+ match(LT);
+ qName();
+ {
+ match(_tokenSet_14);
}
- catch (RecognitionException pe) {
- synPredMatched392 = false;
}
- rewind(_m392);
-inputState.guessing--;
}
- if ( synPredMatched392 ) {
- elementWithAttributes();
- astFactory.addASTChild(currentAST, returnAST);
- elementConstructor_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+ catch (RecognitionException pe) {
+ synPredMatched392 = false;
}
- else if ((LA(1)==LT)) {
- elementWithoutAttributes();
- astFactory.addASTChild(currentAST, returnAST);
- elementConstructor_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
- }
- else {
- throw new NoViableAltException(LT(1), getFilename());
- }
-
+ rewind(_m392);
+inputState.guessing--;
}
- catch (RecognitionException e) {
- if (inputState.guessing==0) {
-
- lexer.wsExplicit = false;
- throw new XPathException("err:XPST0003: Parse error: element name containing whitespace: " + e.getMessage() + " at line: " + e.getLine() + " column: " + e.getColumn());
-
- } else {
- throw e;
- }
+ if ( synPredMatched392 ) {
+ elementWithAttributes();
+ astFactory.addASTChild(currentAST, returnAST);
+ elementConstructor_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
}
+ else if ((LA(1)==LT)) {
+ elementWithoutAttributes();
+ astFactory.addASTChild(currentAST, returnAST);
+ elementConstructor_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+ }
+ else {
+ throw new NoViableAltException(LT(1), getFilename());
+ }
+
returnAST = elementConstructor_AST;
}
@@ -9895,84 +9883,96 @@
org.exist.xquery.parser.XQueryAST qn_AST = null;
String name= null;
- match(LT);
- name=qName();
- q_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
- astFactory.addASTChild(currentAST, returnAST);
- attributeList();
- attrs_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
- astFactory.addASTChild(currentAST, returnAST);
- {
- switch ( LA(1)) {
- case SLASH:
- {
+ try { // for error handling
+ match(LT);
+ name=qName();
+ q_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
+ astFactory.addASTChild(currentAST, returnAST);
+ attributeList();
+ attrs_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
+ astFactory.addASTChild(currentAST, returnAST);
{
- match(SLASH);
- match(GT);
- if ( inputState.guessing==0 ) {
- elementWithAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
-
- if (!elementStack.isEmpty())
+ switch ( LA(1)) {
+ case SLASH:
+ {
+ {
+ match(SLASH);
+ match(GT);
+ if ( inputState.guessing==0 ) {
+ elementWithAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+
+ if (!elementStack.isEmpty())
+ lexer.inElementContent= true;
+ elementWithAttributes_AST= (org.exist.xquery.parser.XQueryAST)astFactory.make( (new ASTArray(2)).add((org.exist.xquery.parser.XQueryAST)astFactory.create(ELEMENT,name)).add(attrs_AST));
+
+ currentAST.root = elementWithAttributes_AST;
+ currentAST.child = elementWithAttributes_AST!=null &&elementWithAttributes_AST.getFirstChild()!=null ?
+ elementWithAttributes_AST.getFirstChild() : elementWithAttributes_AST;
+ currentAST.advanceChildToEnd();
+ }
+ }
+ break;
+ }
+ case GT:
+ {
+ {
+ match(GT);
+ if ( inputState.guessing==0 ) {
+
+ elementStack.push(name);
lexer.inElementContent= true;
- elementWithAttributes_AST= (org.exist.xquery.parser.XQueryAST)astFactory.make( (new ASTArray(2)).add((org.exist.xquery.parser.XQueryAST)astFactory.create(ELEMENT,name)).add(attrs_AST));
-
- currentAST.root = elementWithAttributes_AST;
- currentAST.child = elementWithAttributes_AST!=null &&elementWithAttributes_AST.getFirstChild()!=null ?
- elementWithAttributes_AST.getFirstChild() : elementWithAttributes_AST;
- currentAST.advanceChildToEnd();
+
+ }
+ mixedElementContent();
+ content_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
+ astFactory.addASTChild(currentAST, returnAST);
+ match(END_TAG_START);
+ name=qName();
+ qn_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
+ match(GT);
+ if ( inputState.guessing==0 ) {
+ elementWithAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+
+ if (elementStack.isEmpty())
+ throw new XPathException(qn_AST, "err:XPST0003: Found closing tag without opening tag: " + name);
+ String prev= (String) elementStack.pop();
+ if (!prev.equals(name))
+ throw new XPathException(qn_AST, "err:XPST0003: Found closing tag: " + name + "; expected: " + prev);
+ elementWithAttributes_AST= (org.exist.xquery.parser.XQueryAST)astFactory.make( (new ASTArray(2)).add((org.exist.xquery.parser.XQueryAST)astFactory.create(ELEMENT,name)).add(attrs_AST));
+ if (!elementStack.isEmpty()) {
+ lexer.inElementContent= true;
+ }
+
+ currentAST.root = elementWithAttributes_AST;
+ currentAST.child = elementWithAttributes_AST!=null &&elementWithAttributes_AST.getFirstChild()!=null ?
+ elementWithAttributes_AST.getFirstChild() : elementWithAttributes_AST;
+ currentAST.advanceChildToEnd();
+ }
+ }
+ break;
}
- }
- break;
- }
- case GT:
- {
+ default:
{
- match(GT);
- if ( inputState.guessing==0 ) {
-
- elementStack.push(name);
- lexer.inElementContent= true;
-
+ throw new NoViableAltException(LT(1), getFilename());
}
- mixedElementContent();
- content_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
- astFactory.addASTChild(currentAST, returnAST);
- match(END_TAG_START);
- name=qName();
- qn_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
- match(GT);
+ }
+ }
if ( inputState.guessing==0 ) {
elementWithAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+ elementWithAttributes_AST.copyLexInfo(q_AST);
+ }
+ elementWithAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+ }
+ catch (RecognitionException e) {
+ if (inputState.guessing==0) {
- if (elementStack.isEmpty())
- throw new XPathException(qn_AST, "found closing tag without opening tag: " + name);
- String prev= (String) elementStack.pop();
- if (!prev.equals(name))
- throw new XPathException(qn_AST, "found closing tag: " + name + "; expected: " + prev);
- elementWithAttributes_AST= (org.exist.xquery.parser.XQueryAST)astFactory.make( (new ASTArray(2)).add((org.exist.xquery.parser.XQueryAST)astFactory.create(ELEMENT,name)).add(attrs_AST));
- if (!elementStack.isEmpty()) {
- lexer.inElementContent= true;
- }
-
- currentAST.root = elementWithAttributes_AST;
- currentAST.child = elementWithAttributes_AST!=null &&elementWithAttributes_AST.getFirstChild()!=null ?
- elementWithAttributes_AST.getFirstChild() : elementWithAttributes_AST;
- currentAST.advanceChildToEnd();
+ lexer.wsExplicit = false;
+ throw new XPathException(q_AST, "err:XPST0003: Static error: no closing end tag found for element constructor: " + name);
+
+ } else {
+ throw e;
}
- }
- break;
}
- default:
- {
- throw new NoViableAltException(LT(1), getFilename());
- }
- }
- }
- if ( inputState.guessing==0 ) {
- elementWithAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
- elementWithAttributes_AST.copyLexInfo(q_AST);
- }
- elementWithAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
returnAST = elementWithAttributes_AST;
}
@@ -9986,86 +9986,98 @@
org.exist.xquery.parser.XQueryAST qn_AST = null;
String name= null;
- org.exist.xquery.parser.XQueryAST tmp396_AST = null;
- tmp396_AST = (org.exist.xquery.parser.XQueryAST)astFactory.create(LT(1));
- astFactory.addASTChild(currentAST, tmp396_AST);
- match(LT);
- name=qName();
- q_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
- astFactory.addASTChild(currentAST, returnAST);
- {
- switch ( LA(1)) {
- case SLASH:
- {
+ try { // for error handling
+ org.exist.xquery.parser.XQueryAST tmp396_AST = null;
+ tmp396_AST = (org.exist.xquery.parser.XQueryAST)astFactory.create(LT(1));
+ astFactory.addASTChild(currentAST, tmp396_AST);
+ match(LT);
+ name=qName();
+ q_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
+ astFactory.addASTChild(currentAST, returnAST);
{
- match(SLASH);
- match(GT);
- if ( inputState.guessing==0 ) {
- elementWithoutAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
-
- lexer.wsExplicit= false;
- if (!elementStack.isEmpty())
+ switch ( LA(1)) {
+ case SLASH:
+ {
+ {
+ match(SLASH);
+ match(GT);
+ if ( inputState.guessing==0 ) {
+ elementWithoutAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+
+ lexer.wsExplicit= false;
+ if (!elementStack.isEmpty())
+ lexer.inElementContent= true;
+ elementWithoutAttributes_AST= (org.exist.xquery.parser.XQueryAST)astFactory.create(ELEMENT,name);
+
+ currentAST.root = elementWithoutAttributes_AST;
+ currentAST.child = elementWithoutAttributes_AST!=null &&elementWithoutAttributes_AST.getFirstChild()!=null ?
+ elementWithoutAttributes_AST.getFirstChild() : elementWithoutAttributes_AST;
+ currentAST.advanceChildToEnd();
+ }
+ }
+ break;
+ }
+ case GT:
+ {
+ {
+ match(GT);
+ if ( inputState.guessing==0 ) {
+
+ elementStack.push(name);
lexer.inElementContent= true;
- elementWithoutAttributes_AST= (org.exist.xquery.parser.XQueryAST)astFactory.create(ELEMENT,name);
-
- currentAST.root = elementWithoutAttributes_AST;
- currentAST.child = elementWithoutAttributes_AST!=null &&elementWithoutAttributes_AST.getFirstChild()!=null ?
- elementWithoutAttributes_AST.getFirstChild() : elementWithoutAttributes_AST;
- currentAST.advanceChildToEnd();
+
+ }
+ mixedElementContent();
+ content_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
+ astFactory.addASTChild(currentAST, returnAST);
+ match(END_TAG_START);
+ name=qName();
+ qn_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
+ match(GT);
+ if ( inputState.guessing==0 ) {
+ elementWithoutAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+
+ if (elementStack.isEmpty())
+ throw new XPathException(qn_AST, "found additional closing tag: " + name);
+ String prev= (String) elementStack.pop();
+ if (!prev.equals(name))
+ throw new XPathException(qn_AST, "found closing tag: " + name + "; expected: " + prev);
+ elementWithoutAttributes_AST= (org.exist.xquery.parser.XQueryAST)astFactory.make( (new ASTArray(2)).add((org.exist.xquery.parser.XQueryAST)astFactory.create(ELEMENT,name)).add(content_AST));
+ if (!elementStack.isEmpty()) {
+ lexer.inElementContent= true;
+ //lexer.wsExplicit= false;
+ }
+
+ currentAST.root = elementWithoutAttributes_AST;
+ currentAST.child = elementWithoutAttributes_AST!=null &&elementWithoutAttributes_AST.getFirstChild()!=null ?
+ elementWithoutAttributes_AST.getFirstChild() : elementWithoutAttributes_AST;
+ currentAST.advanceChildToEnd();
+ }
+ }
+ break;
}
- }
- break;
- }
- case GT:
- {
+ default:
{
- match(GT);
- if ( inputState.guessing==0 ) {
-
- elementStack.push(name);
- lexer.inElementContent= true;
-
+ throw new NoViableAltException(LT(1), getFilename());
}
- mixedElementContent();
- content_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
- astFactory.addASTChild(currentAST, returnAST);
- match(END_TAG_START);
- name=qName();
- qn_AST = (org.exist.xquery.parser.XQueryAST)returnAST;
- match(GT);
+ }
+ }
if ( inputState.guessing==0 ) {
elementWithoutAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+ elementWithoutAttributes_AST.copyLexInfo(q_AST);
+ }
+ elementWithoutAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+ }
+ catch (RecognitionException e) {
+ if (inputState.guessing==0) {
- if (elementStack.isEmpty())
- throw new XPathException(qn_AST, "found additional closing tag: " + name);
- String prev= (String) elementStack.pop();
- if (!prev.equals(name))
- throw new XPathException(qn_AST, "found closing tag: " + name + "; expected: " + prev);
- elementWithoutAttributes_AST= (org.exist.xquery.parser.XQueryAST)astFactory.make( (new ASTArray(2)).add((org.exist.xquery.parser.XQueryAST)astFactory.create(ELEMENT,name)).add(content_AST));
- if (!elementStack.isEmpty()) {
- lexer.inElementContent= true;
- //lexer.wsExplicit= false;
- }
-
- currentAST.root = elementWithoutAttributes_AST;
- currentAST.child = elementWithoutAttributes_AST!=null &&elementWithoutAttributes_AST.getFirstChild()!=null ?
- elementWithoutAttributes_AST.getFirstChild() : elementWithoutAttributes_AST;
- currentAST.advanceChildToEnd();
+ lexer.wsExplicit = false;
+ throw new XPathException(q_AST, "err:XPST0003: No closing end tag found for element constructor: " + name);
+
+ } else {
+ throw e;
}
- }
- break;
}
- default:
- {
- throw new NoViableAltException(LT(1), getFilename());
- }
- }
- }
- if ( inputState.guessing==0 ) {
- elementWithoutAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
- elementWithoutAttributes_AST.copyLexInfo(q_AST);
- }
- elementWithoutAttributes_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
returnAST = elementWithoutAttributes_AST;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <del...@us...> - 2011-05-29 13:08:59
|
Revision: 14574
http://exist.svn.sourceforge.net/exist/?rev=14574&view=rev
Author: deliriumsky
Date: 2011-05-29 13:08:53 +0000 (Sun, 29 May 2011)
Log Message:
-----------
[ignore] formatting change
Modified Paths:
--------------
branches/adam/eXist-acl/test/src/org/exist/security/UnixStylePermissionTest.java
Modified: branches/adam/eXist-acl/test/src/org/exist/security/UnixStylePermissionTest.java
===================================================================
--- branches/adam/eXist-acl/test/src/org/exist/security/UnixStylePermissionTest.java 2011-05-29 12:44:39 UTC (rev 14573)
+++ branches/adam/eXist-acl/test/src/org/exist/security/UnixStylePermissionTest.java 2011-05-29 13:08:53 UTC (rev 14574)
@@ -419,4 +419,4 @@
return super.encodeAsBitVector(userId, groupId, mode);
}
}
-}
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <del...@us...> - 2011-05-29 12:44:45
|
Revision: 14573
http://exist.svn.sourceforge.net/exist/?rev=14573&view=rev
Author: deliriumsky
Date: 2011-05-29 12:44:39 +0000 (Sun, 29 May 2011)
Log Message:
-----------
impl note
Modified Paths:
--------------
branches/adam/eXist-acl/src/org/exist/security/AbstractUnixStylePermission.java
Modified: branches/adam/eXist-acl/src/org/exist/security/AbstractUnixStylePermission.java
===================================================================
--- branches/adam/eXist-acl/src/org/exist/security/AbstractUnixStylePermission.java 2011-05-29 12:43:26 UTC (rev 14572)
+++ branches/adam/eXist-acl/src/org/exist/security/AbstractUnixStylePermission.java 2011-05-29 12:44:39 UTC (rev 14573)
@@ -26,6 +26,9 @@
import org.exist.util.SyntaxException;
/**
+ * All code in this class must be side-effect free
+ * and not carry state, thus ensuring that thus class
+ * can be used in a local or remote scenario
*
* @author Adam Retter <ad...@ex...>
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|