tdraier 2005/12/21 13:55:15 CET
Modified files:
core/src/conf/java/org/apache/slide/util/resources
messages.properties
core/src/conf/java/org/apache/slide slide.properties
Log:
rollbacked conversion of <br>
Revision Changes Path
1.6 +31 -31
jahia/core/src/conf/java/org/apache/slide/slide.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/org/apache/slide/slide.properties.diff?r1=1.5&r2=1.6&f=h
1.3 +266 -267
jahia/core/src/conf/java/org/apache/slide/util/resources/messages.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/org/apache/slide/util/resources/messages.properties.diff?r1=1.2&r2=1.3&f=h
Index: messages.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/org/apache/slide/util/resources/messages.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- messages.properties 20 Dec 2005 14:27:49 -0000 1.2
+++ messages.properties 21 Dec 2005 12:55:15 -0000 1.3
@@ -1,267 +1,266 @@
-#<br/>
-# Slide messages<br/>
-#<br/>
-# $Id: messages.properties,v 1.2 2005/12/20 14:27:49 pvollenweider Exp $<br/>
-#<br/>
-# @version $Revision: 1.2 $ $Date: 2005/12/20 14:27:49 $<br/>
-#<br/>
-<br/>
-#<br/>
-# Messages produced by authenticate<br/>
-#<br/>
-<br/>
-<br/>
-#<br/>
-# Messages produced by common<br/>
-#<br/>
-org.apache.slide.common.DomainInitializationFailedError = \<br/>
- Domain initialization error<br/>
-org.apache.slide.common.InvalidNamespaceConfigurationException = \<br/>
- Namespace configuration {0} failed : {1}<br/>
-org.apache.slide.common.MalformedUriException = \<br/>
- Malformed Uri : {0}<br/>
-org.apache.slide.common.ServiceAccessException = \<br/>
- Service {0} access error : {1}<br/>
-org.apache.slide.common.ServiceAccessError = \<br/>
- Service {0} access error : {1}<br/>
-org.apache.slide.common.ServiceConnectionFailedException = \<br/>
- Service {0} connection failed : {1}<br/>
-org.apache.slide.common.ServiceDisconnectionFailedException = \<br/>
- Service {0} disconnection failed : {1}<br/>
-org.apache.slide.common.ServiceInitializationFailedException = \<br/>
- Service {0} initialization failed : {1}<br/>
-org.apache.slide.common.ServiceMissingOnRootNodeException = \<br/>
- Service is missing on root node<br/>
-org.apache.slide.common.ServiceParameterErrorException = \<br/>
- Service {0} has an incorrect parameter value for parameter {1}<br/>
-org.apache.slide.common.ServiceParameterMissingException = \<br/>
- Service {0} is missing parameter {1}<br/>
-org.apache.slide.common.SeviceRegistrationFailedException = \<br/>
- Failed to register service {0}<br/>
-org.apache.slide.common.ServiceResetFailedException = \<br/>
- Service {0} reset failed : {1}<br/>
-org.apache.slide.common.ServicesInitializationFailedException = \<br/>
- Services initialization failed<br/>
-org.apache.slide.common.ServicesShutDownFailedException = \<br/>
- Services shut down failed<br/>
-org.apache.slide.common.SLMLParsingException = \<br/>
- Slide XML parsing error : {0}<br/>
-org.apache.slide.common.UnableToLocateServiceException = \<br/>
- Unable to locate service for Uri {0}<br/>
-org.apache.slide.common.UnknownObjectClassException = \<br/>
- Unable to load SlideObject class {0}<br/>
-org.apache.slide.common.UnknownServiceDeclarationException = \<br/>
- Unknown service name {0}<br/>
-org.apache.slide.common.ObjectValidationFailedException = \<br/>
- Invalid object at {0} : {1}<br/>
-org.apache.slide.common.InvalidContentInterceptor = \<br/>
- Invalid content interceptor : {0} : {1}<br/>
-<br/>
-#<br/>
-# Messages produced by structure<br/>
-#<br/>
-org.apache.slide.structure.LinkedObjectNotFoundException = \<br/>
- Link {0} has an invalid target {1}<br/>
-org.apache.slide.structure.ObjectAlreadyExistsException = \<br/>
- Another object already exist at {0}<br/>
-org.apache.slide.structure.ObjectHasChildrenException = \<br/>
- Object {0} has children<br/>
-org.apache.slide.structure.ObjectNotFoundException = \<br/>
- No object found at {0}<br/>
-org.apache.slide.structure.NoObjectAssociatedWithPropertiesException = \<br/>
- No object associated with properties at {0}<br/>
-org.apache.slide.structure.PropertiesAlreadyExistException = \<br/>
- Properties already exist at {0}<br/>
-org.apache.slide.structure.PropertiesNotFoundException = \<br/>
- Properties not found on object {0}<br/>
-org.apache.slide.structure.ObjectNode.nullUri = \<br/>
- Object uri is null<br/>
-org.apache.slide.structure.ObjectNode.incorrectUri = \<br/>
- Object uri is incorrect<br/>
-org.apache.slide.structure.ObjectNode.nullChildrenVector = \<br/>
- Children vector is null<br/>
-org.apache.slide.structure.ObjectNode.nullLinksVector = \<br/>
- Links vector is null<br/>
-org.apache.slide.structure.LinkNode.nullLink = \<br/>
- Link is null<br/>
-<br/>
-#<br/>
-# Messages produced by lock<br/>
-#<br/>
-org.apache.slide.lock.LockTokenNotFoundException = \<br/>
- Token {0} not found<br/>
-org.apache.slide.lock.ObjectIsAlreadyLockedException = \<br/>
- Object {0} is already locked<br/>
-org.apache.slide.lock.NodeLock.nullObjectUri = \<br/>
- Lock object uri is null<br/>
-org.apache.slide.lock.NodeLock.incorrectObjectUri = \<br/>
- Lock object uri is incorrect<br/>
-org.apache.slide.lock.NodeLock.nullSubjectUri = \<br/>
- Lock subject uri is null<br/>
-org.apache.slide.lock.NodeLock.nullTypeUri = \<br/>
- Lock type uri is null<br/>
-org.apache.slide.lock.NodeLock.nullExpirationDate = \<br/>
- Lock expiration date is null<br/>
-org.apache.slide.lock.NodeLock.nullLockId = \<br/>
- Lock Id is null<br/>
-<br/>
-#<br/>
-# Messages produced by security<br/>
-#<br/>
-org.apache.slide.security.AccessDeniedException = \<br/>
- Access denied on {0} by user {1} for action {2}<br/>
-org.apache.slide.security.NodePermission.nullObjectUri = \<br/>
- Permission object uri is null<br/>
-org.apache.slide.security.NodePermission.incorrectObjectUri = \<br/>
- Permission object uri is incorrect<br/>
-org.apache.slide.security.NodePermission.nullSubjectUri = \<br/>
- Permission subject uri is null<br/>
-org.apache.slide.security.NodePermission.nullActionUri = \<br/>
- Permission action uri is null<br/>
-<br/>
-#<br/>
-# Messages produced by store<br/>
-#<br/>
-org.apache.slide.store.AbstractStore.enlist = \<br/>
- Enlist service {0} in active transaction<br/>
-org.apache.slide.store.AbstractStore.enlistFail = \<br/>
- Failed to enlist service {0} in active transaction<br/>
-org.apache.slide.store.AbstractStore.delist = \<br/>
- Delist service {0} from active transaction<br/>
-org.apache.slide.store.AbstractStore.delistFail = \<br/>
- Delisting service {0} from active transaction with failure<br/>
-<br/>
-#<br/>
-# Messages produced by content<br/>
-#<br/>
-org.apache.slide.content.RevisionAlreadyExistException = \<br/>
- Revision {1} already exists on object {0}<br/>
-org.apache.slide.content.RevisionNotFoundException = \<br/>
- Revision {1} of object {0} not found<br/>
-org.apache.slide.content.RevisionDescriptorNotFoundException = \<br/>
- No revision descriptor found on object {0}<br/>
-org.apache.slide.content.RevisionContentNotFoundException = \<br/>
- Revision {1} of object {0} content not found<br/>
-org.apache.slide.content.BranchNotFoundException = \<br/>
- Branch {1} of object {0} not found<br/>
-org.apache.slide.content.NodeNotVersionedException = \<br/>
- Object {0} is not versioned<br/>
-org.apache.slide.content.NodeProperty.nullName = \<br/>
- Property name is null<br/>
-org.apache.slide.content.NodeProperty.nullNamespace = \<br/>
- Property namespace is null<br/>
-org.apache.slide.content.NodeProperty.nullValue = \<br/>
- Property value is null<br/>
-org.apache.slide.content.NodeRevisionNumber.nullNumber = \<br/>
- Revision number is null<br/>
-org.apache.slide.content.NodeRevisionNumber.invalidNumber = \<br/>
- RevisionNumber is invalid<br/>
-org.apache.slide.content.NodeRevisionContent.noContent = \<br/>
- No content<br/>
-org.apache.slide.content.NodeRevisionDescriptor.nullBranchName = \<br/>
- Revision descriptor branch name is null<br/>
-org.apache.slide.content.NodeRevisionDescriptor.nullNumber = \<br/>
- Revision descriptor revision number is null<br/>
-org.apache.slide.content.NodeRevisionDescriptor.nullLabels = \<br/>
- Revision descriptor labels vector is null<br/>
-org.apache.slide.content.NodeRevisionDescriptor.nullProperties = \<br/>
- Revision descriptor properties hashtable is null<br/>
-org.apache.slide.content.NodeRevisionDescriptor.invalidPropertyType = \<br/>
- Revision descriptor property has an invalid type<br/>
-org.apache.slide.content.NodeRevisionDescriptors.nullUri = \<br/>
- Revision descriptors uri is null<br/>
-org.apache.slide.content.NodeRevisionDescriptors.incorrectUri = \<br/>
- Revision descriptors uri is incorrect<br/>
-org.apache.slide.content.NodeRevisionDescriptors.nullWorkingRevisions =
\<br/>
- Revision descriptors working revisions is null<br/>
-org.apache.slide.content.NodeRevisionDescriptors.nullLatestRevisionNumbers =
\<br/>
- Revision descriptors latest revision numbers is null<br/>
-org.apache.slide.content.NodeRevisionDescriptors.nullBranches = \<br/>
- Revision descriptors branches hashtable is null<br/>
-<br/>
-<br/>
-#<br/>
-# Messages produced by webdav<br/>
-#<br/>
-org.apache.slide.webdav.GetMethod.directorylistingfor = \<br/>
- Directory listing for {0}<br/>
-org.apache.slide.webdav.GetMethod.filename = \<br/>
- Filename<br/>
-org.apache.slide.webdav.GetMethod.size = \<br/>
- Size<br/>
-org.apache.slide.webdav.GetMethod.parent = \<br/>
- Up To {0}<br/>
-org.apache.slide.webdav.GetMethod.lastModified = \<br/>
- Last Modified<br/>
-org.apache.slide.webdav.GetMethod.version = \<br/>
- Jakarta Slide 1.0<br/>
-org.apache.slide.webdav.GetMethod.aclinfo = \<br/>
- ACL Info<br/>
-org.apache.slide.webdav.GetMethod.subject = \<br/>
- Subject<br/>
-org.apache.slide.webdav.GetMethod.action = \<br/>
- Action<br/>
-org.apache.slide.webdav.GetMethod.inheritable = \<br/>
- Inheritable<br/>
-org.apache.slide.webdav.GetMethod.deny = \<br/>
- Deny<br/>
-org.apache.slide.webdav.GetMethod.locksinfo = \<br/>
- Locks Info<br/>
-org.apache.slide.webdav.GetMethod.type = \<br/>
- Type<br/>
-org.apache.slide.webdav.GetMethod.expiration = \<br/>
- Expiration<br/>
-org.apache.slide.webdav.GetMethod.exclusive = \<br/>
- Exclusive<br/>
-org.apache.slide.webdav.GetMethod.add = \<br/>
- Add<br/>
-org.apache.slide.webdav.GetMethod.remove = \<br/>
- Remove<br/>
-<br/>
-#<br/>
-# Messages produced by org.apache.slide.util.Configuration<br/>
-#<br/>
-conf.missingProperty = \<br/>
- Slide configuration file missing property {0}<br/>
-conf.notDefaultConfigurationFile = \<br/>
- Could not obtain the default configuration file {0} from the Slide
JAR<br/>
-<br/>
-<br/>
-#<br/>
-# Messages produced by macro<br/>
-#<br/>
-org.apache.slide.macro.ForbiddenException = \<br/>
- Forbidden for uri {0}. Cause is: {1}<br/>
-org.apache.slide.macro.ConflictException = \<br/>
- Conflict with uri {0}. Cause is: {1}<br/>
-<br/>
-<br/>
-#<br/>
-# Messages produced by the transaction manager<br/>
-#<br/>
-org.apache.slide.transaction.SlideTransactionManager.begin = \<br/>
- Begin {0}<br/>
-org.apache.slide.transaction.SlideTransactionManager.commit = \<br/>
- Commit {0}<br/>
-org.apache.slide.transaction.SlideTransactionManager.rollback = \<br/>
- Rollback {0}<br/>
-org.apache.slide.transaction.SlideTransactionManager.rollbackOnly = \<br/>
- Set rollback only {0}<br/>
-<br/>
-org.apache.slide.transaction.SlideTransaction.enlist = \<br/>
- Enlist resource manager {0} with flag {1} in {2}<br/>
-org.apache.slide.transaction.SlideTransaction.enlistFail = \<br/>
- Enlist failure: Resource manager {0} Error code {1} in {2}<br/>
-<br/>
-org.apache.slide.transaction.SlideTransaction.delist = \<br/>
- Delist resource manager {0} with flag {1} in {2}<br/>
-org.apache.slide.transaction.SlideTransaction.delistFail = \<br/>
- Delist failure: Resource manager {0} Error code {1} in {2}<br/>
-<br/>
-org.apache.slide.transaction.SlideTransaction.rollbackFail = \<br/>
- Rollback failure: Resource manager {0} Error code {1} in {2}<br/>
-org.apache.slide.transaction.SlideTransaction.commitFail = \<br/>
- Commit failure: Resource manager {0} Error code {1} in {2}<br/>
-org.apache.slide.transaction.SlideTransaction.prepareFail = \<br/>
- Prepare failure: Resource manager {0} Error code {1} in {2}<br/>
-<br/>
+#
+# Slide messages
+#
+# $Id: messages.properties,v 1.3 2005/12/21 12:55:15 tdraier Exp $
+#
+# @version $Revision: 1.3 $ $Date: 2005/12/21 12:55:15 $
+#
+
+#
+# Messages produced by authenticate
+#
+
+
+#
+# Messages produced by common
+#
+org.apache.slide.common.DomainInitializationFailedError=\
+ Domain initialization error
+org.apache.slide.common.InvalidNamespaceConfigurationException=\
+ Namespace configuration {0} failed : {1}
+org.apache.slide.common.MalformedUriException=\
+ Malformed Uri : {0}
+org.apache.slide.common.ServiceAccessException=\
+ Service {0} access error : {1}
+org.apache.slide.common.ServiceAccessError=\
+ Service {0} access error : {1}
+org.apache.slide.common.ServiceConnectionFailedException=\
+ Service {0} connection failed : {1}
+org.apache.slide.common.ServiceDisconnectionFailedException=\
+ Service {0} disconnection failed : {1}
+org.apache.slide.common.ServiceInitializationFailedException=\
+ Service {0} initialization failed : {1}
+org.apache.slide.common.ServiceMissingOnRootNodeException=\
+ Service is missing on root node
+org.apache.slide.common.ServiceParameterErrorException=\
+ Service {0} has an incorrect parameter value for parameter {1}
+org.apache.slide.common.ServiceParameterMissingException=\
+ Service {0} is missing parameter {1}
+org.apache.slide.common.SeviceRegistrationFailedException=\
+ Failed to register service {0}
+org.apache.slide.common.ServiceResetFailedException=\
+ Service {0} reset failed : {1}
+org.apache.slide.common.ServicesInitializationFailedException=\
+ Services initialization failed
+org.apache.slide.common.ServicesShutDownFailedException=\
+ Services shut down failed
+org.apache.slide.common.SLMLParsingException=\
+ Slide XML parsing error : {0}
+org.apache.slide.common.UnableToLocateServiceException=\
+ Unable to locate service for Uri {0}
+org.apache.slide.common.UnknownObjectClassException=\
+ Unable to load SlideObject class {0}
+org.apache.slide.common.UnknownServiceDeclarationException=\
+ Unknown service name {0}
+org.apache.slide.common.ObjectValidationFailedException=\
+ Invalid object at {0} : {1}
+org.apache.slide.common.InvalidContentInterceptor=\
+ Invalid content interceptor : {0} : {1}
+
+#
+# Messages produced by structure
+#
+org.apache.slide.structure.LinkedObjectNotFoundException=\
+ Link {0} has an invalid target {1}
+org.apache.slide.structure.ObjectAlreadyExistsException=\
+ Another object already exist at {0}
+org.apache.slide.structure.ObjectHasChildrenException=\
+ Object {0} has children
+org.apache.slide.structure.ObjectNotFoundException=\
+ No object found at {0}
+org.apache.slide.structure.NoObjectAssociatedWithPropertiesException=\
+ No object associated with properties at {0}
+org.apache.slide.structure.PropertiesAlreadyExistException=\
+ Properties already exist at {0}
+org.apache.slide.structure.PropertiesNotFoundException=\
+ Properties not found on object {0}
+org.apache.slide.structure.ObjectNode.nullUri=\
+ Object uri is null
+org.apache.slide.structure.ObjectNode.incorrectUri=\
+ Object uri is incorrect
+org.apache.slide.structure.ObjectNode.nullChildrenVector=\
+ Children vector is null
+org.apache.slide.structure.ObjectNode.nullLinksVector=\
+ Links vector is null
+org.apache.slide.structure.LinkNode.nullLink=\
+ Link is null
+
+#
+# Messages produced by lock
+#
+org.apache.slide.lock.LockTokenNotFoundException=\
+ Token {0} not found
+org.apache.slide.lock.ObjectIsAlreadyLockedException=\
+ Object {0} is already locked
+org.apache.slide.lock.NodeLock.nullObjectUri=\
+ Lock object uri is null
+org.apache.slide.lock.NodeLock.incorrectObjectUri=\
+ Lock object uri is incorrect
+org.apache.slide.lock.NodeLock.nullSubjectUri=\
+ Lock subject uri is null
+org.apache.slide.lock.NodeLock.nullTypeUri=\
+ Lock type uri is null
+org.apache.slide.lock.NodeLock.nullExpirationDate=\
+ Lock expiration date is null
+org.apache.slide.lock.NodeLock.nullLockId=\
+ Lock Id is null
+
+#
+# Messages produced by security
+#
+org.apache.slide.security.AccessDeniedException=\
+ Access denied on {0} by user {1} for action {2}
+org.apache.slide.security.NodePermission.nullObjectUri=\
+ Permission object uri is null
+org.apache.slide.security.NodePermission.incorrectObjectUri=\
+ Permission object uri is incorrect
+org.apache.slide.security.NodePermission.nullSubjectUri=\
+ Permission subject uri is null
+org.apache.slide.security.NodePermission.nullActionUri=\
+ Permission action uri is null
+
+#
+# Messages produced by store
+#
+org.apache.slide.store.AbstractStore.enlist=\
+ Enlist service {0} in active transaction
+org.apache.slide.store.AbstractStore.enlistFail=\
+ Failed to enlist service {0} in active transaction
+org.apache.slide.store.AbstractStore.delist=\
+ Delist service {0} from active transaction
+org.apache.slide.store.AbstractStore.delistFail=\
+ Delisting service {0} from active transaction with failure
+
+#
+# Messages produced by content
+#
+org.apache.slide.content.RevisionAlreadyExistException=\
+ Revision {1} already exists on object {0}
+org.apache.slide.content.RevisionNotFoundException=\
+ Revision {1} of object {0} not found
+org.apache.slide.content.RevisionDescriptorNotFoundException=\
+ No revision descriptor found on object {0}
+org.apache.slide.content.RevisionContentNotFoundException=\
+ Revision {1} of object {0} content not found
+org.apache.slide.content.BranchNotFoundException=\
+ Branch {1} of object {0} not found
+org.apache.slide.content.NodeNotVersionedException=\
+ Object {0} is not versioned
+org.apache.slide.content.NodeProperty.nullName=\
+ Property name is null
+org.apache.slide.content.NodeProperty.nullNamespace=\
+ Property namespace is null
+org.apache.slide.content.NodeProperty.nullValue=\
+ Property value is null
+org.apache.slide.content.NodeRevisionNumber.nullNumber=\
+ Revision number is null
+org.apache.slide.content.NodeRevisionNumber.invalidNumber=\
+ RevisionNumber is invalid
+org.apache.slide.content.NodeRevisionContent.noContent=\
+ No content
+org.apache.slide.content.NodeRevisionDescriptor.nullBranchName=\
+ Revision descriptor branch name is null
+org.apache.slide.content.NodeRevisionDescriptor.nullNumber=\
+ Revision descriptor revision number is null
+org.apache.slide.content.NodeRevisionDescriptor.nullLabels=\
+ Revision descriptor labels vector is null
+org.apache.slide.content.NodeRevisionDescriptor.nullProperties=\
+ Revision descriptor properties hashtable is null
+org.apache.slide.content.NodeRevisionDescriptor.invalidPropertyType=\
+ Revision descriptor property has an invalid type
+org.apache.slide.content.NodeRevisionDescriptors.nullUri=\
+ Revision descriptors uri is null
+org.apache.slide.content.NodeRevisionDescriptors.incorrectUri=\
+ Revision descriptors uri is incorrect
+org.apache.slide.content.NodeRevisionDescriptors.nullWorkingRevisions=\
+ Revision descriptors working revisions is null
+org.apache.slide.content.NodeRevisionDescriptors.nullLatestRevisionNumbers=\
+ Revision descriptors latest revision numbers is null
+org.apache.slide.content.NodeRevisionDescriptors.nullBranches=\
+ Revision descriptors branches hashtable is null
+
+
+#
+# Messages produced by webdav
+#
+org.apache.slide.webdav.GetMethod.directorylistingfor=\
+ Directory listing for {0}
+org.apache.slide.webdav.GetMethod.filename=\
+ Filename
+org.apache.slide.webdav.GetMethod.size=\
+ Size
+org.apache.slide.webdav.GetMethod.parent=\
+ Up To {0}
+org.apache.slide.webdav.GetMethod.lastModified=\
+ Last Modified
+org.apache.slide.webdav.GetMethod.version=\
+ Jakarta Slide 1.0
+org.apache.slide.webdav.GetMethod.aclinfo=\
+ ACL Info
+org.apache.slide.webdav.GetMethod.subject=\
+ Subject
+org.apache.slide.webdav.GetMethod.action=\
+ Action
+org.apache.slide.webdav.GetMethod.inheritable=\
+ Inheritable
+org.apache.slide.webdav.GetMethod.deny=\
+ Deny
+org.apache.slide.webdav.GetMethod.locksinfo=\
+ Locks Info
+org.apache.slide.webdav.GetMethod.type=\
+ Type
+org.apache.slide.webdav.GetMethod.expiration=\
+ Expiration
+org.apache.slide.webdav.GetMethod.exclusive=\
+ Exclusive
+org.apache.slide.webdav.GetMethod.add=\
+ Add
+org.apache.slide.webdav.GetMethod.remove=\
+ Remove
+
+#
+# Messages produced by org.apache.slide.util.Configuration
+#
+conf.missingProperty=\
+ Slide configuration file missing property {0}
+conf.notDefaultConfigurationFile=\
+ Could not obtain the default configuration file {0} from the Slide JAR
+
+
+#
+# Messages produced by macro
+#
+org.apache.slide.macro.ForbiddenException=\
+ Forbidden for uri {0}. Cause is: {1}
+org.apache.slide.macro.ConflictException=\
+ Conflict with uri {0}. Cause is: {1}
+
+
+#
+# Messages produced by the transaction manager
+#
+org.apache.slide.transaction.SlideTransactionManager.begin=\
+ Begin {0}
+org.apache.slide.transaction.SlideTransactionManager.commit=\
+ Commit {0}
+org.apache.slide.transaction.SlideTransactionManager.rollback=\
+ Rollback {0}
+org.apache.slide.transaction.SlideTransactionManager.rollbackOnly=\
+ Set rollback only {0}
+
+org.apache.slide.transaction.SlideTransaction.enlist=\
+ Enlist resource manager {0} with flag {1} in {2}
+org.apache.slide.transaction.SlideTransaction.enlistFail=\
+ Enlist failure: Resource manager {0} Error code {1} in {2}
+
+org.apache.slide.transaction.SlideTransaction.delist=\
+ Delist resource manager {0} with flag {1} in {2}
+org.apache.slide.transaction.SlideTransaction.delistFail=\
+ Delist failure: Resource manager {0} Error code {1} in {2}
+
+org.apache.slide.transaction.SlideTransaction.rollbackFail=\
+ Rollback failure: Resource manager {0} Error code {1} in {2}
+org.apache.slide.transaction.SlideTransaction.commitFail=\
+ Commit failure: Resource manager {0} Error code {1} in {2}
+org.apache.slide.transaction.SlideTransaction.prepareFail=\
+ Prepare failure: Resource manager {0} Error code {1} in {2}
Index: slide.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/org/apache/slide/slide.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- slide.properties 20 Dec 2005 14:27:48 -0000 1.5
+++ slide.properties 21 Dec 2005 12:55:15 -0000 1.6
@@ -1,31 +1,31 @@
-# Domain XML definition file<br/>
-# Default : Will look for domain.xml in current directory<br/>
-org.apache.slide.domain = ../slide/Domain.xml<br/>
-<br/>
-# Automatically perform security checks<br/>
-# Default : true<br/>
-org.apache.slide.security = true<br/>
-<br/>
-# Automatically perform locking checks<br/>
-# Default : true<br/>
-org.apache.slide.lock = true<br/>
-<br/>
-# Use version control (DeltaV)<br/>
-# Default: true<br/>
-org.apache.slide.versioncontrol = true<br/>
-<br/>
-# DASL<br/>
-# Default: true<br/>
-org.apache.slide.search = true<br/>
-<br/>
-# Use UTF-8<br/>
-# Default: true<br/>
-org.apache.slide.useUtf8 = true<br/>
-<br/>
-# URL Encoding<br/>
-# Default: platform default encoding<br/>
-org.apache.slide.urlEncoding = WINDOWS-1252<br/>
-<br/>
-# Debug<br/>
-# Default: false<br/>
-org.apache.slide.debug = false<br/>
+# Domain XML definition file
+# Default : Will look for domain.xml in current directory
+org.apache.slide.domain=../slide/Domain.xml
+
+# Automatically perform security checks
+# Default : true
+org.apache.slide.security=true
+
+# Automatically perform locking checks
+# Default : true
+org.apache.slide.lock=true
+
+# Use version control (DeltaV)
+# Default: true
+org.apache.slide.versioncontrol=true
+
+# DASL
+# Default: true
+org.apache.slide.search=true
+
+# Use UTF-8
+# Default: true
+org.apache.slide.useUtf8=true
+
+# URL Encoding
+# Default: platform default encoding
+org.apache.slide.urlEncoding=WINDOWS-1252
+
+# Debug
+# Default: false
+org.apache.slide.debug=false
\ No newline at end of file
