Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

realized immediately after committing that the id belongs at the generic Configuration level, not at the OpenJPAConfiguration level. 

git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@475087 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Patrick Linskey 2006-11-15 00:45:09 +00:00
parent bda2015398
commit a5f3ae42bf
5 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java
View File

@ -1383,22 +1383,4 @@ public interface OpenJPAConfiguration
* configuration.
*/
public StoreFacadeTypeRegistry getStoreFacadeTypeRegistry();
/**
* An environment-specific identifier for this configuration. This
* might correspond to a JPA persistence-unit name, or to some other
* more-unique value available in the current environment.
*
* @since 0.9.7
*/
public String getId();
/**
* An environment-specific identifier for this configuration. This
* might correspond to a JPA persistence-unit name, or to some other
* more-unique value available in the current environment.
*
* @since 0.9.7
*/
public void setId(String id);
}

12
openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
View File

@ -127,7 +127,6 @@ public class OpenJPAConfigurationImpl
public ObjectValue orphanedKeyPlugin;
public ObjectValue compatibilityPlugin;
public QueryCompilationCacheValue queryCompilationCachePlugin;
public StringValue id;
// custom values
public BrokerFactoryValue brokerFactoryPlugin;
@ -467,8 +466,6 @@ public class OpenJPAConfigurationImpl
"getQueryCompilationCacheInstance");
addValue(queryCompilationCachePlugin);
addString("Id");
// initialize supported options that some runtimes may not support
supportedOptions.add(OPTION_NONTRANS_READ);
supportedOptions.add(OPTION_OPTIMISTIC);
@ -1408,15 +1405,6 @@ public class OpenJPAConfigurationImpl
return _storeFacadeRegistry;
}
public String getId() {
return id.get();
}
public void setId(String id) {
assertNotReadOnly();
this.id.set(id);
}
public void instantiateAll() {
super.instantiateAll();
getMetaDataRepositoryInstance();

9
openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties
View File

@ -557,15 +557,6 @@ QueryCompilationCache-displayorder: 50
QueryCompilationCache-expert: true
QueryCompilationCache-interface: java.util.Map
Id-name: Configuration ID
Id-desc: An environment-specific identifier for this configuration. This \
might correspond to a JPA persistence-unit name, or to some other \
more-unique value available in the current environment.
Id-type: General
Id-cat: Persistence
Id-displayorder: 50
Id-expert: true
no-named-cf: use a DataSource bound to JNDI
diff-specs: Attempt to configure for multiple specifications. Was configured \
for "{0}". Attempt to now configure for "{1}". This attempt will be \

19
openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configuration.java
View File

@ -115,6 +115,25 @@ public interface Configuration
*/
public Log getConfigurationLog();
/**
* An environment-specific identifier for this configuration. This
* might correspond to a JPA persistence-unit name, or to some other
* more-unique value available in the current environment.
*
* @since 0.9.7
*/
public String getId();
/**
* An environment-specific identifier for this configuration. This
* might correspond to a JPA persistence-unit name, or to some other
* more-unique value available in the current environment.
*
* @since 0.9.7
*/
public void setId(String id);
/**
* Return the {@link Value} for the given property, or null if none.
*/

12
openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java
View File

@ -101,6 +101,7 @@ public class ConfigurationImpl
(ConfigurationImpl.class);
public ObjectValue logFactoryPlugin;
public StringValue id;
private String _product = null;
private boolean _readOnly = false;
@ -146,6 +147,8 @@ public class ConfigurationImpl
logFactoryPlugin.setString(aliases[0]);
logFactoryPlugin.setInstantiatingGetter("getLogFactory");
id = addString("Id");
if (loadGlobals)
loadGlobals();
}
@ -209,6 +212,15 @@ public class ConfigurationImpl
return getLogFactory().getLog(category);
}
public String getId() {
return id.get();
}
public void setId(String id) {
assertNotReadOnly();
this.id.set(id);
}
/**
* Returns the logging channel <code>openjpa.Runtime</code> by default.
*/