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

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

@@ -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);
 }

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

@@ -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();

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

@@ -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 \

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

@@ -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.
      */

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

@@ -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.
      */