Re: Patch for review: remove the text JDORI from error messages in *20 projects

[Craig Russell]

Hi Michael, On Aug 10, 2005, at 6:19 AM, Michael Bouschen wrote: Hi Craig, some Bundle.properties files in core20, runtime20, query20 and fostore20 define error messages that still use the phrase "JDO Reference Implementation (jdo.jar and jdo-ri.jar)". I changed the error messages. Please find a patch file for review attached. Regards Michael --  Michael Bouschen        [EMAIL PROTECTED] Engineering GmbH mailto:[EMAIL PROTECTED]    http://www.tech.spree.de/ Tel.:++49/30/235 520-33        Buelowstr. 66             Fax.:++49/30/2175 2012        D-10783 Berlin             Index: fostore20/src/java/org/apache/jdo/impl/fostore/Bundle.properties =================================================================== --- fostore20/src/java/org/apache/jdo/impl/fostore/Bundle.properties    (revision 231187) +++ fostore20/src/java/org/apache/jdo/impl/fostore/Bundle.properties    (working copy) @@ -36,7 +36,7 @@  trying to read the system property ''{0}''. \  \n{1}\  \nYou must grant java.util.PropertyPermission("*","read") to the codeBase \ -containing the JDO Reference Implementation (jdo-ri.jar). +containing the fostore implementation.  #  # AbstractRequest @@ -155,7 +155,7 @@  EXC_CannotSpecifyStreamHandler=A SecurityException was thrown when trying to \  connect to the fostore database. You must grant \  java.net.NetPermission("specifyStreamHandler") to the codeBase \ -containing the JDO Reference Implementation (jdo-ri.jar). +containing the fostore implementation.  #  # FOStoreConnector @@ -169,22 +169,20 @@  #  EXC_SecurityExceptionOnCreateBtreeStorage=A SecurityException was thrown when trying to \  create a fostore datastore. You must grant the following permissions to the \ -codeBases containing the JDO Reference Implementation (jdo-ri.jar and \ -btree.jar): \ +codeBases containing the fostore and btree implementation: \  java.io.FilePermission("<fostore database files>","read,write,delete") and \  java.util.PropertyPermission("*","read").  EXC_SecurityExceptionOnCloseBtreeStorage=A SecurityException was thrown when trying to \  close a fostore datastore. You must grant the following permissions to the \ -codeBases containing the JDO Reference Implementation (jdo-ri.jar and \ -btree.jar): \ +codeBases containing the fostore and btree implementation: \  java.io.FilePermission("<fostore database files>","read,write,delete") and \  java.util.PropertyPermission("*","read").  EXC_CannotReadFile=A SecurityException was thrown when trying to read file or \  directory ''{0}''.  You must grant java.io.FilePermission("{0}","read") to the \ -codeBase containing the JDO Reference Implementation (jdo-ri.jar). +codeBase containing the fostore implementation.  EXC_CannotDeleteFile=A SecurityException was thrown when trying to delete file \  or directory ''{0}''. You must grant java.io.FilePermission("{0}","delete") to \ -the codeBase containing the JDO Reference Implementation (jdo-ri.jar). +the codeBase containing the fostore implementation.  #NOI18N  ERR_CLIDNotProv=given CLID is not provisional: {0}.  #NOI18N Index: runtime20/src/java/org/apache/jdo/impl/state/Bundle.properties =================================================================== --- runtime20/src/java/org/apache/jdo/impl/state/Bundle.properties    (revision 231187) +++ runtime20/src/java/org/apache/jdo/impl/state/Bundle.properties    (working copy) @@ -31,12 +31,12 @@  EXC_CannotGetJDOImplHelper=A SecurityException was thrown when trying to get \  the singleton JDOImplHelper instance. In order to get runtime metadata, you \  must grant javax.jdo.spi.JDOPermission("getMetadata") to the codeBases \ -containing the JDO Reference Implementation (jdo.jar and jdori.jar). +containing the state manager implementation.  EXC_CannotSetStateManager=A SecurityException was thrown when calling \  jdoReplaceStateManager on persistence capable class instance. In order to set \  the state manager, you must grant \  javax.jdo.spi.JDOPermission("setStateManager") to the codeBases containing \ -the JDO Reference Implementation (jdo.jar and jdori.jar) and to the codeBase \ +the state manager implementation and to the codeBase \  containing the class files of the persistent capable classes. This was a bug in the early implementation. The PC classes do not need setStateManager permission. I suggest: EXC_CannotSetStateManager=A SecurityException was thrown when calling \ jdoReplaceStateManager on persistence capable class instance. In order to set \ the state manager, you must grant \ javax.jdo.spi.JDOPermission("setStateManager") to the codeBase containing \ the state manager implementation.  EXC_PersistentInAnotherPersistenceManager=Invalid attempt to make persistent an object that is owned by a different PersistenceManager.  EXC_NotNeededByRI=Method {0} is not needed in the reference implementation and should not have been invoked. Index: runtime20/src/java/org/apache/jdo/impl/pm/Bundle.properties =================================================================== --- runtime20/src/java/org/apache/jdo/impl/pm/Bundle.properties    (revision 231187) +++ runtime20/src/java/org/apache/jdo/impl/pm/Bundle.properties    (working copy) @@ -52,7 +52,7 @@  EXC_CannotAddShutdownHook=A SecurityException was thrown when trying \  to add a JVM shudown hook. In order to register a shutdown hook, \  you must grant java.lang.RuntimePermission("shutdownHooks") to the \ -codeBases containing the JDO Reference Implementation (jdo-ri.jar). +codeBases containing the persistence manager factory implementation.  #  # PersistenceManagerImpl @@ -60,7 +60,7 @@  EXC_CannotGetRuntimeJavaModelFactory=A SecurityException was thrown when trying \  to get the singleton RuntimeJavaModelFactory instance. In order to get runtime \  metadata, you must grant javax.jdo.spi.JDOPermission("getMetadata") to the \ -codeBases containing the JDO Reference Implementation (jdo.jar and jdo-ri.jar). +codeBases containing the persistence manager implementation. Singular codeBase. Looks good. Craig  EXC_ActiveTransaction=Cannot close PersistenceManager while transaction is still active.  EXC_WrongSCOType=Tracked SCO instances of type {0} are not supported.  EXC_CannotConstructSCO=Exception during construction of type {0}. Index: core20/src/java/org/apache/jdo/util/Bundle.properties =================================================================== --- core20/src/java/org/apache/jdo/util/Bundle.properties    (revision 231187) +++ core20/src/java/org/apache/jdo/util/Bundle.properties    (working copy) @@ -46,6 +46,6 @@  EXC_LoggerSetupSecurityException=A SecurityException was thrown when trying \  to read the logging configuration file ''{0}''. In order to configure JDK 1.4 \  logging, you must grant java.util.logging.LoggingPermission("control") to the \ -codeBase containing the JDO Reference Implementation (jdo-ri.jar). +codeBase containing the JDO logging utility classes.  EXC_LoggerSetupIOException=A IOException was thrown when trying to read the \  logging configuration file ''{0}''. Index: query20/src/java/org/apache/jdo/impl/jdoql/Bundle.properties =================================================================== --- query20/src/java/org/apache/jdo/impl/jdoql/Bundle.properties    (revision 231187) +++ query20/src/java/org/apache/jdo/impl/jdoql/Bundle.properties    (working copy) @@ -164,7 +164,7 @@  make field ''{0}'' in class ''{1}'' accessible in order to access its value \  while executing a query.  In order to execute queries on transient instances, \  you must grant java.lang.reflect.ReflectPermission("suppressAccessChecks") to \ -the codeBase containing the JDO Reference Implementation (jdori.jar). +the codeBase containing the JDOQL implementation.  EXC_InstanceBoundToDifferentPM=Instance ''{0}'' not bound to the PersistenceManager of the query  #NOI18N  ERR_CollectionFieldExpected=Collection field expected; field ''{0}'' of class ''{1}'' has type ''{2}''. Craig Russell Architect, Sun Java Enterprise System http://java.sun.com/products/jdo 408 276-5638 mailto:[EMAIL PROTECTED] P.S. A good JDO? O, Gasp!

smime.p7s
Description: S/MIME cryptographic signature