You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pc...@apache.org on 2006/07/14 01:45:02 UTC
svn commit: r421741 [2/15] - in /incubator/openjpa/trunk:
openjpa-kernel-5/src/main/java/org/apache/openjpa/enhance/
openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/
openjpa-kernel/src/main/java/org/apache/openjpa/ant/ openjpa-kernel/src/...
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/AutoDetachValue.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/AutoDetachValue.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/AutoDetachValue.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/AutoDetachValue.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,8 +20,8 @@
import serp.util.Strings;
/**
- * <p>Value type used to represent auto detach flags. Separate to
- * optimize translation of Strings to bit flags.</p>
+ * Value type used to represent auto detach flags. Separate to
+ * optimize translation of Strings to bit flags.
*
* @author Steve Kim
* @nojavadoc
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/BrokerFactoryValue.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/BrokerFactoryValue.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/BrokerFactoryValue.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/BrokerFactoryValue.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,10 +19,10 @@
import org.apache.openjpa.lib.conf.PluginValue;
/**
- * <p>Value type used to represent the {@link BrokerFactory}. This type is
+ * Value type used to represent the {@link BrokerFactory}. This type is
* defined separately so that it can be used both in the global configuration
- * and in {@link org.apache.openjpa.kernel.Bootstrap} with the same
- * encapsulated configuration.</p>
+ * and in {@link org.apache.openjpa.kernel.Bootstrap} with the same
+ * encapsulated configuration.
*
* @author Abe White
* @nojavadoc
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Compatibility.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Compatibility.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Compatibility.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Compatibility.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,7 @@
package org.apache.openjpa.conf;
/**
- * <p>Struct encompassing backwards-compatibility options.</p>
+ * Struct encompassing backwards-compatibility options.
*/
public class Compatibility {
@@ -29,7 +29,7 @@
/**
* Whether to require exact identity value types when creating object
- * ids from a class and value. Defaults to false.
+ * ids from a class and value. Defaults to false.
*/
public boolean getStrictIdentityValues() {
return _strictIdValues;
@@ -37,7 +37,7 @@
/**
* Whether to require exact identity value types when creating object
- * ids from a class and value. Defaults to false.
+ * ids from a class and value. Defaults to false.
*/
public void setStrictIdentityValues(boolean strictVals) {
_strictIdValues = strictVals;
@@ -63,9 +63,9 @@
/**
* Whether to return hollow instances to broker lookups with a
- * <code>validate</code> parameter of false. OpenJPA versions prior to
+ * <code>validate</code> parameter of false. OpenJPA versions prior to
* 4.0 did not return hollow instances without special configuration
- * (the <code>ObjectLookupMode</code>). Beginning with 4.0, hollow
+ * (the <code>ObjectLookupMode</code>). Beginning with 4.0, hollow
* objects are the default.
*/
public boolean getValidateFalseReturnsHollow() {
@@ -74,9 +74,9 @@
/**
* Whether to return hollow instances to broker lookups with a
- * <code>validate</code> parameter of false. OpenJPA versions prior to
+ * <code>validate</code> parameter of false. OpenJPA versions prior to
* 4.0 did not return hollow instances without special configuration
- * (the <code>ObjectLookupMode</code>). Beginning with 4.0, hollow
+ * (the <code>ObjectLookupMode</code>). Beginning with 4.0, hollow
* objects are the default.
*/
public void setValidateFalseReturnsHollow(boolean hollow) {
@@ -86,7 +86,7 @@
/**
* Whether to check the datastore for the existence of a nontransactional
* cached object in broker lookups with a <code>validate</code> parameter
- * of true. OpenJPA versions prior to 4.0 checked the datastore.
+ * of true. OpenJPA versions prior to 4.0 checked the datastore.
*/
public boolean getValidateTrueChecksStore() {
return _checkStore;
@@ -95,7 +95,7 @@
/**
* Whether to check the datastore for the existence of a nontransactional
* cached object in broker lookups with a <code>validate</code> parameter
- * of true. OpenJPA versions prior to 4.0 checked the datastore.
+ * of true. OpenJPA versions prior to 4.0 checked the datastore.
*/
public void setValidateTrueChecksStore(boolean check) {
_checkStore = check;
@@ -103,7 +103,7 @@
/**
* Whether to copy identity objects before returning them to client code.
- * Versions of OpenJPA prior to 3.0 always copied identity objects. Also,
+ * Versions of OpenJPA prior to 3.0 always copied identity objects. Also,
* you should configure OpenJPA to copy identity objects if you mutate them
* after use.
*/
@@ -113,7 +113,7 @@
/**
* Whether to copy identity objects before returning them to client code.
- * Versions of OpenJPA prior to 3.0 always copied identity objects. Also,
+ * Versions of OpenJPA prior to 3.0 always copied identity objects. Also,
* you should configure OpenJPA to copy identity objects if you mutate them
* after use.
*/
@@ -130,8 +130,8 @@
}
/**
- * Whether to close the broker when the managed transaction commits.
- * Versions of OpenJPA prior to 3.0 did not close the broker.
+ * Whether to close the broker when the managed transaction commits.
+ * Versions of OpenJPA prior to 3.0 did not close the broker.
*/
public void setCloseOnManagedCommit(boolean close) {
_closeOnCommit = close;
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/DetachOptions.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/DetachOptions.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/DetachOptions.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/DetachOptions.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,7 +18,7 @@
import org.apache.openjpa.kernel.DetachState;
/**
- * <p>Detach options.</p>
+ * Detach options.
*
* @author Abe White
* @nojavadoc
@@ -53,7 +53,7 @@
}
/**
- * For auto-configuration of the detached state field. Accepts values
+ * For auto-configuration of the detached state field. Accepts values
* "true", "false", or "transient".
*/
public void setDetachedStateField(String val) {
@@ -90,7 +90,7 @@
* Whether to use a detached state manager on types that allow it.
* Types that do not use detached state or that declare a custom detached
* state field to maintain serialization compatibility will never use
- * a detached state manager. Defaults to true.
+ * a detached state manager. Defaults to true.
*/
public boolean getDetachedStateManager() {
return _manager;
@@ -100,14 +100,14 @@
* Whether to use a detached state manager on types that allow it.
* Types that do not use detached state or that declare a custom detached
* state field to maintain serialization compatibility will never use
- * a detached state manager. Defaults to true.
+ * a detached state manager. Defaults to true.
*/
public void setDetachedStateManager(boolean val) {
_manager = val;
}
/**
- * Whether to allow access to unloaded detached fields. This setting only
+ * Whether to allow access to unloaded detached fields. This setting only
* applies to instances with detached state managers.
*/
public boolean getAccessUnloaded() {
@@ -115,7 +115,7 @@
}
/**
- * Whether to allow access to unloaded detached fields. This setting only
+ * Whether to allow access to unloaded detached fields. This setting only
* applies to instances with detached state managers.
*/
public void setAccessUnloaded(boolean val) {
@@ -145,7 +145,7 @@
}
/**
- * Public to allow reflection.
+ * Public to allow reflection.
*/
public static class All
extends DetachOptions {
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -44,17 +44,16 @@
import org.apache.openjpa.util.ProxyManager;
/**
- * <p>Defines the properties necessary to configure runtime properties and
- * connect to a data source. There is a 1-1 relation between a configuration
- * and a {@link BrokerFactory}.</p>
- * <p/>
- * <p>All setter methods that take primitive parameters also have wrapper
- * setter with the appropriate primitive wrapper. This is so the interface
- * can be in accordance with the J2EE Connector Architecture.</p>
+ * Defines the properties necessary to configure runtime properties and
+ * connect to a data source. There is a 1-1 relation between a configuration
+ * and a {@link BrokerFactory}.
+ * All setter methods that take primitive parameters also have wrapper
+ * setter with the appropriate primitive wrapper. This is so the interface
+ * can be in accordance with the J2EE Connector Architecture.
*
* @author Marc Prud'hommeaux
* @author Abe White
- * @see Configuration
+ * @see Configuration
*/
public interface OpenJPAConfiguration
extends Configuration {
@@ -203,7 +202,7 @@
"org.apache.openjpa.option.JDBCConnection";
/**
- * Return the set of option strings supported by this runtime. This set
+ * Return the set of option strings supported by this runtime. This set
* is mutable.
*/
public Collection supportedOptions();
@@ -219,7 +218,7 @@
* spec environments. This should be invoked before any configuration
* options are set, as it will mutate various values.
* You can only assign the specification once, though it is not fatal
- * to attempt to do so multiple times. Attempts to set to null will
+ * to attempt to do so multiple times. Attempts to set to null will
* be ignored.
*/
public boolean setSpecification(String spec);
@@ -293,7 +292,7 @@
/**
* The data cache manager manages this configuration's cache instances.
- * The cache manager is created if it has not been set. Once the cache
+ * The cache manager is created if it has not been set. Once the cache
* manager has been set/created, all changes to caching configuration
* must proceed through the cache manager.
*
@@ -593,7 +592,7 @@
public MetaDataFactory newMetaDataFactoryInstance();
/**
- * The metadata repository of managed class information. If no
+ * The metadata repository of managed class information. If no
* repository has been set, creates one.
*
* @since 3.0
@@ -690,24 +689,22 @@
public void setConnectionFactoryProperties(String props);
/**
- * The mode of the connection factory in use. Available options are:
+ * The mode of the connection factory in use. Available options are:
* <ul>
* <li>local: OpenJPA controls the connections.</li>
* <li>managed: Connections are automatically enlisted in
* the current global transaction by an application server.</li>
- * </ul>
- * Defaults to local.
+ * </ul> Defaults to local.
*/
public String getConnectionFactoryMode();
/**
- * The mode of the connection factory in use. Available options are:
+ * The mode of the connection factory in use. Available options are:
* <ul>
* <li>local: OpenJPA controls the connections.</li>
* <li>managed: Connections are automatically enlisted in
* the current global transaction by an application server.</li>
- * </ul>
- * Defaults to local.
+ * </ul> Defaults to local.
*/
public void setConnectionFactoryMode(String mode);
@@ -900,7 +897,7 @@
/**
* A comma-separated list of events which trigger auto-detachment
- * in place of managed states. Possible values are:
+ * in place of managed states. Possible values are:
* <ul>
* <li><code>commit</code>: When the current transaction commits.</li>
* <li><code>close</code>: When the broker closes.</li>
@@ -912,7 +909,7 @@
/**
* A comma-separated list of events which trigger auto-detachment
- * in place of managed states. Possible values are:
+ * in place of managed states. Possible values are:
* <ul>
* <li><code>commit</code>: When the current transaction commits.</li>
* <li><code>close</code>: When the broker closes.</li>
@@ -998,13 +995,13 @@
/**
* Get the size of the batch that will be pre-selected when accessing
- * elements in a query or relationship. Use -1 to prefetch all results.
+ * elements in a query or relationship. Use -1 to prefetch all results.
*/
public int getFetchBatchSize();
/**
* Set the size of the batch that will be pre-selected when accessing
- * elements in a query or relationship. Use -1 to prefetch all results.
+ * elements in a query or relationship. Use -1 to prefetch all results.
*/
public void setFetchBatchSize(int size);
@@ -1181,7 +1178,7 @@
/**
* Specifies the behavior of the broker with respect to data store
- * connections. Possible values are:
+ * connections. Possible values are:
* <ul>
* <li><code>always</code>: Each broker obtains a single connection and
* uses it until the broker is closed.</li>
@@ -1189,8 +1186,8 @@
* transaction begins (optimistic or datastore), and is released
* when the transaction completes.</li>
* <li><code>on-demand</code>: Connections are obtained only when needed.
- * This is the default mode. It is equivalent to the previous option
- * when datastore transactions are used. For optimistic transactions,
+ * This is the default mode. It is equivalent to the previous option
+ * when datastore transactions are used. For optimistic transactions,
* though, it means that a connection will be retained only for
* the duration of the data store commit process.</li>
* </ul>
@@ -1201,7 +1198,7 @@
/**
* Specifies the behavior of the broker with respect to data store
- * connections. Possible values are:
+ * connections. Possible values are:
* <ul>
* <li><code>always</code>: Each broker obtains a single connection and
* uses it until the broker is closed.</li>
@@ -1209,8 +1206,8 @@
* transaction begins (optimistic or datastore), and is released
* when the transaction completes.</li>
* <li><code>on-demand</code>: Connections are obtained only when needed.
- * This is the default mode. It is equivalent to the previous option
- * when datastore transactions are used. For optimistic transactions,
+ * This is the default mode. It is equivalent to the previous option
+ * when datastore transactions are used. For optimistic transactions,
* though, it means that a connection will be retained only for
* the duration of the data store commit process.</li>
* </ul>
@@ -1254,13 +1251,13 @@
public void setFilterListeners(String listeners);
/**
- * Return the query filter listeners. If none have been set explicitly,
+ * Return the query filter listeners. If none have been set explicitly,
* this method instantiates the listeners from the set plugin list.
*/
public FilterListener[] getFilterListenerInstances();
/**
- * Set the query filter listeners. Overrides the list of listener classes.
+ * Set the query filter listeners. Overrides the list of listener classes.
*/
public void setFilterListeners(FilterListener[] listeners);
@@ -1277,14 +1274,13 @@
public void setAggregateListeners(String listeners);
/**
- * Return the query function listeners. If none have been set explicitly,
+ * Return the query function listeners. If none have been set explicitly,
* this method instantiates the listeners from the set plugin list.
*/
public AggregateListener[] getAggregateListenerInstances();
/**
- * Set the query function listeners. Overrides the list of listener
- * classes.
+ * Set the query function listeners. Overrides the list of listener classes.
*/
public void setAggregateListeners(AggregateListener[] listeners);
@@ -1299,38 +1295,34 @@
public boolean getRetryClassRegistration();
/**
- * Whether to warn and defer registration instead of throwing an
- * exception when a registered persistent class cannot be processed.
- * Should only be set to true in complex classloader topologies.
- * Defaults to <code>false</code>.
+ * Whether to warn and defer registration instead of throwing an
+ * exception when a registered persistent class cannot be processed.
+ * Should only be set to true in complex classloader topologies.
+ * Defaults to <code>false</code>.
*
- * @since 3.2.3
+ * @since 3.2.3
*/
public void setRetryClassRegistration (boolean warn);
-
/**
- * Wrapper for JCA usage of {@link #setRetryClassRegistration(boolean)}.
+ * Wrapper for JCA usage of {@link #setRetryClassRegistration(boolean)}.
*
- * @since 3.2.3
+ * @since 3.2.3
*/
public void setRetryClassRegistration (Boolean warn);
-
/**
- * Backwards compatibility options.
+ * Backwards compatibility options.
*/
public String getCompatibility ();
-
/**
- * Backwards compatibility options.
+ * Backwards compatibility options.
*/
public void setCompatibility (String compatibility);
-
/**
- * Backwards compatibility options.
+ * Backwards compatibility options.
*/
public Compatibility getCompatibilityInstance ();
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -56,14 +56,13 @@
import org.apache.openjpa.util.ProxyManager;
/**
- * <p>Implementation of the {@link OpenJPAConfiguration} interface.</p>
- * <p/>
- * <p>On construction, the class will attempt to locate a default properties
+ * Implementation of the {@link OpenJPAConfiguration} interface.
+ * On construction, the class will attempt to locate a default properties
* file called <code>org.apache.openjpa.properties</code> located at any top level token
- * of the CLASSPATH. See the {@link ConfigurationImpl} class description
- * for details.</p>
+ * of the CLASSPATH. See the {@link ConfigurationImpl} class description
+ * for details.
*
- * @see ConfigurationImpl
+ * @see ConfigurationImpl
* @author Marc Prud'hommeaux
* @author Abe White
*/
@@ -144,7 +143,7 @@
private String spec = null;
/**
- * Default constructor. Attempts to load default properties.
+ * Default constructor. Attempts to load default properties.
*/
public OpenJPAConfigurationImpl() {
this(true);
@@ -153,7 +152,7 @@
/**
* Constructor.
*
- * @param loadDefaults whether to attempt to load the default
+ * @param loadDefaults whether to attempt to load the default
* <code>org.apache.openjpa.properties</code> resource
*/
public OpenJPAConfigurationImpl(boolean loadDefaults) {
@@ -163,8 +162,8 @@
/**
* Constructor.
*
- * @param derivations whether to apply product derivations
- * @param loadDefaults whether to attempt to load the default
+ * @param derivations whether to apply product derivations
+ * @param loadDefaults whether to attempt to load the default
* <code>org.apache.openjpa.properties</code> resource
*/
public OpenJPAConfigurationImpl(boolean derivations, boolean loadDefaults) {
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/ProductDerivation.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/ProductDerivation.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/ProductDerivation.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/ProductDerivation.java Thu Jul 13 16:44:20 2006
@@ -1,68 +1,68 @@
-/*
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.openjpa.conf;
-
-import org.apache.openjpa.lib.conf.Configuration;
-import org.apache.openjpa.lib.conf.ConfigurationProvider;
-
-/**
- * Hooks for deriving products with additional functionality.
- * All implementations of this interface will have a chance to mutate
- * a {@link Configuration} both before and after the user-specified
- * configuration data is loaded. The order in which the
- * derivations are evaluated is determined by the specificity of the
- * derivation type.
- *
- * @since 4.1
- */
-public interface ProductDerivation {
-
- public static final int TYPE_SPEC = 0;
- public static final int TYPE_PRODUCT = 1;
- public static final int TYPE_STORE = 2;
- public static final int TYPE_SPEC_STORE = 3;
- public static final int TYPE_PRODUCT_STORE = 4;
- public static final int TYPE_FEATURE = 5;
-
- /**
- * Return the type of derivation.
- */
- public int getType();
-
- /**
- * Provides the instance with a callback to mutate the initial properties
- * of the {@link ConfigurationProvider}. This is primarily to alter or
- * add properties that determine what type of configuration is constructed,
- * and therefore is typically used at runtime only.
- */
- public void beforeConfigurationConstruct(ConfigurationProvider cp);
-
- /**
- * Provides the instance with the opportunity to mutate
- * <code>conf</code> before the user configuration is applied.
- */
- public void beforeConfigurationLoad(OpenJPAConfiguration conf);
-
- /**
- * Called after the specification has been set.
- */
- public void afterSpecificationSet(OpenJPAConfiguration conf);
-
- /**
- * Called after the configuration has been closed.
- */
- public void afterClose(OpenJPAConfiguration conf);
-}
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openjpa.conf;
+
+import org.apache.openjpa.lib.conf.Configuration;
+import org.apache.openjpa.lib.conf.ConfigurationProvider;
+
+/**
+ * Hooks for deriving products with additional functionality.
+ * All implementations of this interface will have a chance to mutate
+ * a {@link Configuration} both before and after the user-specified
+ * configuration data is loaded. The order in which the
+ * derivations are evaluated is determined by the specificity of the
+ * derivation type.
+ *
+ * @since 4.1
+ */
+public interface ProductDerivation {
+
+ public static final int TYPE_SPEC = 0;
+ public static final int TYPE_PRODUCT = 1;
+ public static final int TYPE_STORE = 2;
+ public static final int TYPE_SPEC_STORE = 3;
+ public static final int TYPE_PRODUCT_STORE = 4;
+ public static final int TYPE_FEATURE = 5;
+
+ /**
+ * Return the type of derivation.
+ */
+ public int getType();
+
+ /**
+ * Provides the instance with a callback to mutate the initial properties
+ * of the {@link ConfigurationProvider}. This is primarily to alter or
+ * add properties that determine what type of configuration is constructed,
+ * and therefore is typically used at runtime only.
+ */
+ public void beforeConfigurationConstruct(ConfigurationProvider cp);
+
+ /**
+ * Provides the instance with the opportunity to mutate
+ * <code>conf</code> before the user configuration is applied.
+ */
+ public void beforeConfigurationLoad(OpenJPAConfiguration conf);
+
+ /**
+ * Called after the specification has been set.
+ */
+ public void afterSpecificationSet(OpenJPAConfiguration conf);
+
+ /**
+ * Called after the configuration has been closed.
+ */
+ public void afterClose(OpenJPAConfiguration conf);
+}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/ProductDerivations.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/ProductDerivations.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/ProductDerivations.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/ProductDerivations.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,7 +24,7 @@
import org.apache.openjpa.lib.util.Services;
/**
- * <p>Utilities for running product derivations.</p>
+ * Utilities for running product derivations.
*
* @author Abe White
* @nojavadoc
@@ -51,7 +51,7 @@
/**
* Apply {@link ProductDerivation#beforeConfigurationConstruct} callbacks
- * to the the given instance. Exceptions are swallowed.
+ * to the the given instance. Exceptions are swallowed.
*/
public static void beforeConfigurationConstruct(ConfigurationProvider cp) {
for (int i = 0; i < _derivations.length; i++) {
@@ -67,7 +67,7 @@
/**
* Apply {@link ProductDerivation#beforeConfigurationLoad} callbacks
- * to the the given instance. Exceptions are swallowed.
+ * to the the given instance. Exceptions are swallowed.
*/
public static void beforeConfigurationLoad(OpenJPAConfiguration conf) {
for (int i = 0; i < _derivations.length; i++) {
@@ -83,7 +83,7 @@
/**
* Apply {@link ProductDerivation#afterSpecificationSet} callbacks
- * to the the given instance. Exceptions are swallowed.
+ * to the the given instance. Exceptions are swallowed.
*/
public static void afterSpecificationSet(OpenJPAConfiguration conf) {
for (int i = 0; i < _derivations.length; i++) {
@@ -99,7 +99,7 @@
/**
* Apply {@link ProductDerivation#afterClose} callbacks
- * to the the given instance. Exceptions are swallowed.
+ * to the the given instance. Exceptions are swallowed.
*/
public static void afterClose(OpenJPAConfigurationImpl impl) {
for (int i = 0; i < _derivations.length; i++) {
@@ -114,7 +114,7 @@
}
/**
- * Compare {@link ProductDerivation}s.
+ * Compare {@link ProductDerivation}s.
*/
private static class ProductDerivationComparator
implements Comparator {
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/RemoteCommitProviderValue.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/RemoteCommitProviderValue.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/RemoteCommitProviderValue.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/RemoteCommitProviderValue.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,9 +23,9 @@
import org.apache.openjpa.lib.util.Options;
/**
- * <p>Value type used to represent a {@link RemoteCommitProvider}. This
+ * Value type used to represent a {@link RemoteCommitProvider}. This
* plugin allows users to specify whether to transmit the ids of added objects
- * in the remote commit events distributed.</p>
+ * in the remote commit events distributed.
*
* @author Abe White
* @nojavadoc
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/SeqValue.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/SeqValue.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/SeqValue.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/SeqValue.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,9 +20,9 @@
import org.apache.openjpa.meta.SequenceMetaData;
/**
- * <p>Value type used to represent a sequence. This type is
+ * Value type used to represent a sequence. This type is
* defined separately so that it can be used both in the global configuration
- * and in class metadata with the same encapsulated configuration.</p>
+ * and in class metadata with the same encapsulated configuration.
*
* @author Abe White
* @nojavadoc
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -282,9 +282,9 @@
}
/**
- * This method is part of the {@link RemoteCommitListener} interface. If
+ * This method is part of the {@link RemoteCommitListener} interface. If
* your cache subclass relies on OpenJPA for clustering support, make it
- * implement <code>RemoteCommitListener</code>. This method will take
+ * implement <code>RemoteCommitListener</code>. This method will take
* care of invalidating entries from remote commits.
*/
public void afterCommit(RemoteCommitEvent event) {
@@ -320,7 +320,7 @@
/**
* Return <code>true</code> if updates to data already in the
* cache (either in {@link #commit} or the {@link #update})
- * should be put back into the cache. Returns false by default.
+ * should be put back into the cache. Returns false by default.
*/
protected boolean recacheUpdates() {
return false;
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractQueryCache.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractQueryCache.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractQueryCache.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractQueryCache.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -182,9 +182,9 @@
}
/**
- * This method is part of the {@link RemoteCommitListener} interface. If
+ * This method is part of the {@link RemoteCommitListener} interface. If
* your cache subclass relies on OpenJPA for clustering support, make it
- * implement <code>RemoteCommitListener</code>. This method will take
+ * implement <code>RemoteCommitListener</code>. This method will take
* care of invalidating entries from remote commits, by delegating to
* {@link #onTypesChanged}.
*/
@@ -237,7 +237,7 @@
}
/**
- * Return a threadsafe view of the keys in this cache. This collection
+ * Return a threadsafe view of the keys in this cache. This collection
* must be iterable without risk of concurrent modification exceptions.
* It does not have to implement contains() efficiently or use set
* semantics.
@@ -311,9 +311,9 @@
}
/**
- * Individual query results will be registered as types changed
- * listeners. We want such query results to be gc'd once
- * the only reference is held by the list of expiration listeners.
+ * Individual query results will be registered as types changed
+ * listeners. We want such query results to be gc'd once
+ * the only reference is held by the list of expiration listeners.
*/
protected Collection newListenerCollection() {
//### use concurrent
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/Caches.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/Caches.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/Caches.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/Caches.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,8 +27,7 @@
/**
* Utility to build up a set of classes from their class names
* when operating outside the context of a persistence manager.
- * The set classes can be null, in which case a new Set will be
- * created.
+ * The set classes can be null, in which case a new Set will be created.
*/
static Set addTypesByName(OpenJPAConfiguration conf,
Collection classNames, Set classes) {
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentDataCache.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentDataCache.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentDataCache.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentDataCache.java Thu Jul 13 16:44:20 2006
@@ -1,140 +1,140 @@
-/*
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.openjpa.datacache;
-
-import org.apache.openjpa.event.RemoteCommitListener;
-import org.apache.openjpa.util.CacheMap;
-
-/**
- * A {@link DataCache} implementation that is optimized for concurrent
- * access. When the cache fills up, values to remove from cache are chosen
- * randomly. Due to race conditions, it is possible that a get call might not
- * return a cached instance if that instance is being transferred between
- * internal datastructures.
- *
- * @since 4.0
- */
-public class ConcurrentDataCache
- extends AbstractDataCache
- implements RemoteCommitListener {
-
- private final CacheMap _cache = newCacheMap();
-
- /**
- * Returns the underlying {@link CacheMap} that this cache is using.
- * This is not an unmodifiable view on the map, so care should be taken
- * with this reference. Implementations should probably not modify the
- * contents of the cache, but should only use this reference to
- * obtain cache metrics.
- */
- public CacheMap getCacheMap() {
- return _cache;
- }
-
- /**
- * Sets the maximum number of unpinned objects to keep hard
- * references to. If the map contains more unpinned objects than
- * <code>size</code>, then this method will result in the cache
- * flushing old values.
- */
- public void setCacheSize(int size) {
- _cache.setCacheSize(size);
- }
-
- /**
- * Returns the maximum number of unpinned objects to keep hard
- * references to.
- */
- public int getCacheSize() {
- return _cache.getCacheSize();
- }
-
- /**
- * Sets the maximum number of unpinned objects to keep soft
- * references to. If the map contains more soft references than
- * <code>size</code>, then this method will result in the cache
- * flushing values.
- */
- public void setSoftReferenceSize(int size) {
- _cache.setSoftReferenceSize(size);
- }
-
- /**
- * Returns the maximum number of unpinned objects to keep soft
- * references to. Defaults to <code>-1</code>.
- */
- public int getSoftReferenceSize() {
- return _cache.getSoftReferenceSize();
- }
-
- public void initialize(DataCacheManager mgr) {
- super.initialize(mgr);
- conf.getRemoteCommitEventManager().addListener(this);
- }
-
- public void writeLock() {
- _cache.writeLock();
- }
-
- public void writeUnlock() {
- _cache.writeUnlock();
- }
-
- /**
- * Return the map to use as an internal cache; entry expirations must
- * invoke {@link AbstractDataCache#keyRemoved}.
- */
- protected CacheMap newCacheMap() {
- return new CacheMap() {
- protected void entryRemoved(Object key, Object value,
- boolean expired) {
- keyRemoved(key, expired);
- }
- };
- }
-
- protected DataCachePCData getInternal(Object key) {
- return (DataCachePCData) _cache.get(key);
- }
-
- protected DataCachePCData putInternal(Object key, DataCachePCData pc) {
- return (DataCachePCData) _cache.put(key, pc);
- }
-
- protected DataCachePCData removeInternal(Object key) {
- return (DataCachePCData) _cache.remove(key);
- }
-
- protected void removeAllInternal(Class cls, boolean subs) {
- // we could keep a histogram of the counts of contained classes and
- // only clear if we have the class, but that still wouldn't support subs
- // well, would involve synching, and won't yield much benefit when we're
- // used as a primary cache
- _cache.clear();
- }
-
- protected void clearInternal() {
- _cache.clear();
- }
-
- protected boolean pinInternal(Object key) {
- return _cache.pin(key);
- }
-
- protected boolean unpinInternal(Object key) {
- return _cache.unpin (key);
- }
-}
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openjpa.datacache;
+
+import org.apache.openjpa.event.RemoteCommitListener;
+import org.apache.openjpa.util.CacheMap;
+
+/**
+ * A {@link DataCache} implementation that is optimized for concurrent
+ * access. When the cache fills up, values to remove from cache are chosen
+ * randomly. Due to race conditions, it is possible that a get call might not
+ * return a cached instance if that instance is being transferred between
+ * internal datastructures.
+ *
+ * @since 4.0
+ */
+public class ConcurrentDataCache
+ extends AbstractDataCache
+ implements RemoteCommitListener {
+
+ private final CacheMap _cache = newCacheMap();
+
+ /**
+ * Returns the underlying {@link CacheMap} that this cache is using.
+ * This is not an unmodifiable view on the map, so care should be taken
+ * with this reference. Implementations should probably not modify the
+ * contents of the cache, but should only use this reference to
+ * obtain cache metrics.
+ */
+ public CacheMap getCacheMap() {
+ return _cache;
+ }
+
+ /**
+ * Sets the maximum number of unpinned objects to keep hard
+ * references to. If the map contains more unpinned objects than
+ * <code>size</code>, then this method will result in the cache
+ * flushing old values.
+ */
+ public void setCacheSize(int size) {
+ _cache.setCacheSize(size);
+ }
+
+ /**
+ * Returns the maximum number of unpinned objects to keep hard
+ * references to.
+ */
+ public int getCacheSize() {
+ return _cache.getCacheSize();
+ }
+
+ /**
+ * Sets the maximum number of unpinned objects to keep soft
+ * references to. If the map contains more soft references than
+ * <code>size</code>, then this method will result in the cache
+ * flushing values.
+ */
+ public void setSoftReferenceSize(int size) {
+ _cache.setSoftReferenceSize(size);
+ }
+
+ /**
+ * Returns the maximum number of unpinned objects to keep soft
+ * references to. Defaults to <code>-1</code>.
+ */
+ public int getSoftReferenceSize() {
+ return _cache.getSoftReferenceSize();
+ }
+
+ public void initialize(DataCacheManager mgr) {
+ super.initialize(mgr);
+ conf.getRemoteCommitEventManager().addListener(this);
+ }
+
+ public void writeLock() {
+ _cache.writeLock();
+ }
+
+ public void writeUnlock() {
+ _cache.writeUnlock();
+ }
+
+ /**
+ * Return the map to use as an internal cache; entry expirations must
+ * invoke {@link AbstractDataCache#keyRemoved}.
+ */
+ protected CacheMap newCacheMap() {
+ return new CacheMap() {
+ protected void entryRemoved(Object key, Object value,
+ boolean expired) {
+ keyRemoved(key, expired);
+ }
+ };
+ }
+
+ protected DataCachePCData getInternal(Object key) {
+ return (DataCachePCData) _cache.get(key);
+ }
+
+ protected DataCachePCData putInternal(Object key, DataCachePCData pc) {
+ return (DataCachePCData) _cache.put(key, pc);
+ }
+
+ protected DataCachePCData removeInternal(Object key) {
+ return (DataCachePCData) _cache.remove(key);
+ }
+
+ protected void removeAllInternal(Class cls, boolean subs) {
+ // we could keep a histogram of the counts of contained classes and
+ // only clear if we have the class, but that still wouldn't support subs
+ // well, would involve synching, and won't yield much benefit when we're
+ // used as a primary cache
+ _cache.clear();
+ }
+
+ protected void clearInternal() {
+ _cache.clear();
+ }
+
+ protected boolean pinInternal(Object key) {
+ return _cache.pin(key);
+ }
+
+ protected boolean unpinInternal(Object key) {
+ return _cache.unpin (key);
+ }
+}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentQueryCache.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentQueryCache.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentQueryCache.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentQueryCache.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,8 +22,8 @@
/**
* A {@link QueryCache} implementation that is optimized for concurrent
- * access. When the cache fill up, values to remove from the cache are chosen
- * randomly. Due to race conditions, it is possible that a get call might not
+ * access. When the cache fill up, values to remove from the cache are chosen
+ * randomly. Due to race conditions, it is possible that a get call might not
* retur a cached instance if that instance is being transferred between
* internal datastructures.
*
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCache.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCache.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCache.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCache.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,15 +22,14 @@
import org.apache.openjpa.lib.util.Closeable;
/**
- * <p>Interface that must be implemented by any level 2 cache used by
+ * Interface that must be implemented by any level 2 cache used by
* OpenJPA. Most data caches will choose to implement the
* {@link org.apache.openjpa.lib.conf.Configurable} interface as well so that
- * they will be given the system configuration just after construction.</p>
- * <p/>
- * <p>Implementations should take care not to return timed out data.</p>
+ * they will be given the system configuration just after construction.
+ * Implementations should take care not to return timed out data.
*
- * @see AbstractDataCache
- * @see DataCachePCData#isTimedOut
+ * @see AbstractDataCache
+ * @see DataCachePCData#isTimedOut
* @author Patrick Linskey
* @author Abe White
*/
@@ -51,8 +50,7 @@
public String getName();
/**
- * Sets a string name to be used to identify this cache to
- * end-user needs.
+ * Sets a string name to be used to identify this cache to end-user needs.
*
* @since 2.5.0
*/
@@ -65,39 +63,34 @@
public void initialize(DataCacheManager manager);
/**
- * <p>Perform a batch update of the cache. Add all {@link DataCachePCData}
+ * Perform a batch update of the cache. Add all {@link DataCachePCData}
* objects in <code>additions</code> and in
* <code>newUpdates</code>, make the appropriate modifications to
* all DataCachePCDatas in <code>existingUpdates</code>, and delete all
- * OIDs in <code>deletes</code>.</p>
- * <p/>
- * <p>All changes made to cached data must be made via this
+ * OIDs in <code>deletes</code>.
+ * All changes made to cached data must be made via this
* method. It is this method that is responsible for performing
- * any side-effects that should happen on meaningful cache
- * changes.</p>
- * <p/>
- * <p>Implementations should bear in mind that the
+ * any side-effects that should happen on meaningful cache changes.
+ * Implementations should bear in mind that the
* <code>deletes</code> collection may contain oids that are also
* in the <code>additions</code> map. This is possible because it
* is valid for a user to delete an object with a particular oid
- * and then add that object in the same batch.</p>
+ * and then add that object in the same batch.
*
- * @param additions A collection of {@link DataCachePCData} objects.
+ * @param additions A collection of {@link DataCachePCData} objects.
* These represent data that have been newly created,
* and thus must be added to the cache.
- * @param newUpdates A collection of {@link DataCachePCData} objects.
+ * @param newUpdates A collection of {@link DataCachePCData} objects.
* These represent data that have been modified but
- * were not originally in the cache, and thus
- * must be added to the cache.
- * @param existingUpdates A collection of {@link DataCachePCData} objects.
+ * were not originally in the cache, and thus must be added to the cache.
+ * @param existingUpdates A collection of {@link DataCachePCData} objects.
* These represent data that have been modified and
* were originally loaded from the cache. It is
* up to the cache implementation to decide if
* these values must be re-enlisted in the cache.
* Some caches may return live data from {@link #get}
- * invocations, in which case these values need
- * not be re-enlisted.
- * @param deletes A collection of object IDs that have been deleted
+ * invocations, in which case these values need not be re-enlisted.
+ * @param deletes A collection of object IDs that have been deleted
* and must therefore be dropped from the cache.
*/
public void commit(Collection additions, Collection newUpdates,
@@ -116,7 +109,7 @@
public BitSet containsAll(Collection oids);
/**
- * Return the cached object for the given oid. Modifying the returned
+ * Return the cached object for the given oid. Modifying the returned
* object may or may not change the cached value; the {@link #update}
* method should be used to re-cache any changed objects.
*
@@ -137,18 +130,15 @@
public DataCachePCData put(DataCachePCData value);
/**
- * <p>Update the cached value for the given instance. This does
+ * Update the cached value for the given instance. This does
* <em>not</em> result in an update of other caches. Rather, it should
* only be used for loading clean data into the cache. Meaningful changes
- * to the state of the cache should be made via the {@link #commit}
- * method.</p>
- * <p/>
- * <p>A cache implementation may or may not return a live object
+ * to the state of the cache should be made via the {@link #commit} method.
+ * A cache implementation may or may not return a live object
* from {@link #get} invocations. If an object retrieved from a
* {@link #get} operation needs to be updated, this method can be
* invoked instead of invoking {@link #put}. The DataCache implementation
- * can then make optimizations based on how its {@link #get} method
- * works.</p>
+ * can then make optimizations based on how its {@link #get} method works.
*/
public void update(DataCachePCData value);
@@ -169,7 +159,7 @@
* Remove the values stored under the given oids.
*
* @return the indexes of the removed oids
- * @see #remove
+ * @see #remove
*/
public BitSet removeAll(Collection oids);
@@ -193,8 +183,7 @@
* affect the behavior of {@link #remove}.
*
* @return <code>true</code> if <code>oid</code>'s value was
- * pinned into the cache; <code>false</code> if the
- * oid is not in the cache.
+ * pinned into the cache; <code>false</code> if the oid is not in the cache.
*/
public boolean pin(Object oid);
@@ -202,7 +191,7 @@
* Pin all oids to the cache.
*
* @return the indexes of the pinned oids
- * @see #pin
+ * @see #pin
*/
public BitSet pinAll(Collection oids);
@@ -210,12 +199,11 @@
* Unpin the value stored under <code>oid</code> from the cache.
* This method reverses a previous invocation of {@link #pin}.
* This method does not remove anything from the cache; it merely
- * makes <code>oid</code>'s value a candidate for flushing from
- * the cache.
+ * makes <code>oid</code>'s value a candidate for flushing from the cache.
*
* @return <code>true</code> if <code>oid</code>'s value was
- * unpinned from the cache; <code>false</code> if the
- * oid is not in the cache.
+ * unpinned from the cache; <code>false</code> if the
+ * oid is not in the cache.
*/
public boolean unpin(Object oid);
@@ -223,7 +211,7 @@
* Unpin all oids from the cache.
*
* @return the indexes of the unpinned oids
- * @see #unpin
+ * @see #unpin
*/
public BitSet unpinAll(Collection oids);
@@ -252,7 +240,7 @@
public boolean removeExpirationListener(ExpirationListener listen);
/**
- * Free the resources used by this cache.
+ * Free the resources used by this cache.
*/
public void close ();
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManager.java Thu Jul 13 16:44:20 2006
@@ -1,74 +1,74 @@
-/*
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.openjpa.datacache;
-
-import org.apache.openjpa.conf.OpenJPAConfiguration;
-import org.apache.openjpa.lib.conf.ObjectValue;
-
-/**
- * <p>Manages the system's data and query caches. You can
- * retrieve the data cache manager from the {@link OpenJPAConfiguration}.</p>
- *
- * @author Abe White
- * @author Patrick Linskey
- */
-public interface DataCacheManager {
-
- /**
- * Initialize the manager, supplying the cache configuration.
- */
- public void initialize(OpenJPAConfiguration conf, ObjectValue dataCache,
- ObjectValue queryCache);
-
- /**
- * Return the system-wide data cache, or null if caching is not enabled.
- */
- public DataCache getSystemDataCache();
-
- /**
- * Return the named data cache, or null if it does not exist.
- */
- public DataCache getDataCache(String name);
-
- /**
- * Return the named data cache. If the given name is null, the default
- * data cache is returned.
- *
- * @param create if true, the cache will be created if it does
- * not already exist
- */
- public DataCache getDataCache(String name, boolean create);
-
- /**
- * Return the system query cache, or null if not configured.
- */
- public QueryCache getSystemQueryCache();
-
- /**
- * Return the PCData generator if configured.
- */
- public DataCachePCDataGenerator getPCDataGenerator();
-
- /**
- * Return the runnable which schedules evictions.
- */
- public DataCacheScheduler getDataCacheScheduler();
-
- /**
- * Close all caches.
- */
- public void close ();
-}
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openjpa.datacache;
+
+import org.apache.openjpa.conf.OpenJPAConfiguration;
+import org.apache.openjpa.lib.conf.ObjectValue;
+
+/**
+ * Manages the system's data and query caches. You can
+ * retrieve the data cache manager from the {@link OpenJPAConfiguration}.
+ *
+ * @author Abe White
+ * @author Patrick Linskey
+ */
+public interface DataCacheManager {
+
+ /**
+ * Initialize the manager, supplying the cache configuration.
+ */
+ public void initialize(OpenJPAConfiguration conf, ObjectValue dataCache,
+ ObjectValue queryCache);
+
+ /**
+ * Return the system-wide data cache, or null if caching is not enabled.
+ */
+ public DataCache getSystemDataCache();
+
+ /**
+ * Return the named data cache, or null if it does not exist.
+ */
+ public DataCache getDataCache(String name);
+
+ /**
+ * Return the named data cache. If the given name is null, the default
+ * data cache is returned.
+ *
+ * @param create if true, the cache will be created if it does
+ * not already exist
+ */
+ public DataCache getDataCache(String name, boolean create);
+
+ /**
+ * Return the system query cache, or null if not configured.
+ */
+ public QueryCache getSystemQueryCache();
+
+ /**
+ * Return the PCData generator if configured.
+ */
+ public DataCachePCDataGenerator getPCDataGenerator();
+
+ /**
+ * Return the runnable which schedules evictions.
+ */
+ public DataCacheScheduler getDataCacheScheduler();
+
+ /**
+ * Close all caches.
+ */
+ public void close ();
+}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,7 +21,7 @@
import org.apache.openjpa.util.ImplHelper;
/**
- * <p>Default data cache manager.</p>
+ * Default data cache manager.
*
* @author Abe White
* @author Patrick Linskey
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCData.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCData.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCData.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCData.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCDataGenerator.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCDataGenerator.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCDataGenerator.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCDataGenerator.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -36,9 +36,9 @@
import serp.bytecode.JumpInstruction;
/**
- * <p>A {@link PCDataGenerator} instance which generates properly
- * synchronized instances suitable for use in the cache. In addition,
- * proper timed behavior is added.</p>
+ * A {@link PCDataGenerator} instance which generates properly
+ * synchronized instances suitable for use in the cache. In addition,
+ * proper timed behavior is added.
*
* @author Steve Kim
* @since 3.3.0
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCDataImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCDataImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCDataImpl.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,7 +27,7 @@
import org.apache.openjpa.meta.ValueMetaData;
/**
- * Specialized {@link PCData} implementation for data caching. This
+ * Specialized {@link PCData} implementation for data caching. This
* implementation is properly synchronized.
*
* @author Patrick Linskey
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheScheduler.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheScheduler.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheScheduler.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheScheduler.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -32,15 +32,12 @@
import serp.util.Strings;
/**
- * <p>Cron-style cache eviction. Understands schedules based on cron
- * format:<p>
+ * Cron-style cache eviction. Understands schedules based on cron format:
* <code>minute hour mday month wday</code>
- * <p/>
- * <p>For example:</p>
+ * For example:
* <code>15,30 6,19 2,10 1 2 </code>
- * <p/>
- * <p>Would run at 15 and 30 past the 6AM and 7PM, on the 2nd and 10th
- * of January when its a Monday</p>.
+ * Would run at 15 and 30 past the 6AM and 7PM, on the 2nd and 10th
+ * of January when its a Monday.
*
* @author Steve Kim
*/
@@ -63,14 +60,14 @@
}
/**
- * The interval time in minutes between cache checks. Defaults to 2.
+ * The interval time in minutes between cache checks. Defaults to 2.
*/
public int getInterval() {
return _interval;
}
/**
- * The interval time in minutes between cache checks. Defaults to 2.
+ * The interval time in minutes between cache checks. Defaults to 2.
*/
public void setInterval(int interval) {
_interval = interval;
@@ -88,7 +85,7 @@
}
/**
- * Schedule the given cache for eviction. Starts the scheduling thread
+ * Schedule the given cache for eviction. Starts the scheduling thread
* if not started.
*/
public synchronized void scheduleEviction(DataCache cache, String times) {
@@ -159,7 +156,7 @@
}
/**
- * Simple class which represents the given time schedule.
+ * Simple class which represents the given time schedule.
*/
private static class Schedule {
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -41,7 +41,7 @@
import org.apache.openjpa.meta.MetaDataRepository;
/**
- * <p>StoreManager proxy that delegates to a data cache when possible.</p>
+ * StoreManager proxy that delegates to a data cache when possible.
*
* @author Patrick Linskey
* @nojavadoc
@@ -50,9 +50,9 @@
extends DelegatingStoreManager {
// all the state managers changed in this transaction
- private Collection _inserts = null; // statemanagers
- private Map _updates = null; // statemanager -> fmd set
- private Collection _deletes = null; // statemanagers
+ private Collection _inserts = null; // statemanagers
+ private Map _updates = null; // statemanager -> fmd set
+ private Collection _deletes = null; // statemanagers
// the owning context
private StoreContext _ctx = null;
@@ -63,7 +63,7 @@
/**
* Constructor.
*
- * @param sm the store manager to delegate to
+ * @param sm the store manager to delegate to
*/
public DataCacheStoreManager(StoreManager sm) {
super(sm);
@@ -255,8 +255,7 @@
/**
* Transforms a collection of {@link PCDataHolder}s that might contain
- * stale instances into a collection of up-to-date
- * {@link DataCachePCData}s.
+ * stale instances into a collection of up-to-date {@link DataCachePCData}s.
*/
private void transformToVersionSafePCDatas(DataCache cache,
List holders) {
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingDataCache.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingDataCache.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingDataCache.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingDataCache.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,9 +22,9 @@
import org.apache.openjpa.util.RuntimeExceptionTranslator;
/**
- * <p>Delegating data cache that can also perform exception translation for
- * use in facades. This cache allows its delegate to be null, in which
- * case it returns default values for all operations.</p>
+ * Delegating data cache that can also perform exception translation for
+ * use in facades. This cache allows its delegate to be null, in which
+ * case it returns default values for all operations.
*
* @author Abe White
* @nojavadoc
@@ -39,7 +39,7 @@
private final RuntimeExceptionTranslator _trans;
/**
- * Constructor. Supply delegate.
+ * Constructor. Supply delegate.
*/
public DelegatingDataCache(DataCache cache) {
this(cache, null);
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingQueryCache.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingQueryCache.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingQueryCache.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingQueryCache.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,9 +19,9 @@
import org.apache.openjpa.util.RuntimeExceptionTranslator;
/**
- * <p>Delegating query cache that can also perform exception translation for
- * use in facades. This cache allows its delegate to be null, in which case
- * it returns default values or all methods.</p>
+ * Delegating query cache that can also perform exception translation for
+ * use in facades. This cache allows its delegate to be null, in which case
+ * it returns default values or all methods.
*
* @author Abe White
* @since 4.0
@@ -35,7 +35,7 @@
private final RuntimeExceptionTranslator _trans;
/**
- * Constructor. Supply delegate.
+ * Constructor. Supply delegate.
*/
public DelegatingQueryCache(QueryCache cache) {
this(cache, null);
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ExpirationEvent.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ExpirationEvent.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ExpirationEvent.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ExpirationEvent.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,9 +18,9 @@
import java.util.EventObject;
/**
- * <p>An event indicating the expiration of an object from the data cache,
+ * An event indicating the expiration of an object from the data cache,
* or an expiration of a result list from the query cache.
- * The source of the event will be the cache.</p>
+ * The source of the event will be the cache.
*
* @since 3.0
* @author Abe White
@@ -34,9 +34,9 @@
/**
* Constructor.
*
- * @param source the data or query cache
- * @param key the expired object oid or query key
- * @param expired <code>true</code> if the object was expired
+ * @param source the data or query cache
+ * @param key the expired object oid or query key
+ * @param expired <code>true</code> if the object was expired
* naturally; else <code>false</code>.
*/
public ExpirationEvent(Object source, Object key, boolean expired) {
@@ -53,8 +53,8 @@
}
/**
- * Return whether the expired object was expired naturally, or if
- * the object was explicitly removed.
+ * Return whether the expired object was expired naturally, or if
+ * the object was explicitly removed.
*/
public boolean getExpired() {
return _expired;
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ExpirationListener.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ExpirationListener.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ExpirationListener.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ExpirationListener.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,7 @@
package org.apache.openjpa.datacache;
/**
- * <p>An entity that wishes to be notified when cache keys expire.</p>
+ * An entity that wishes to be notified when cache keys expire.
*
* @author Abe White
* @since 3.0
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCache.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCache.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCache.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCache.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,11 +20,11 @@
import org.apache.openjpa.lib.util.Closeable;
/**
- * <p>Interface that must be implemented by any level 2 query cache
+ * Interface that must be implemented by any level 2 query cache
* used by OpenJPA. These methods should be threadsafe.
* Most query cache implementations will probably implement
* {@link org.apache.openjpa.lib.conf.Configurable} to receive a handle to the
- * system configuration on construction.</p>
+ * system configuration on construction.
*
* @since 2.5
* @author Patrick Linskey
@@ -41,18 +41,17 @@
public void initialize(DataCacheManager manager);
/**
- * <p>Return a list of oids for the given query key. This is an
- * unmodifiable list.</p>
+ * Return a list of oids for the given query key. This is an
+ * unmodifiable list.
*
- * @return The query results matching the given key, or null
- * if none
+ * @return The query results matching the given key, or null if none
*/
public QueryResult get(QueryKey qk);
/**
- * <p>Set the list of OIDs for the given query key. A reference
+ * Set the list of OIDs for the given query key. A reference
* to the given list will be stored in the query cache, so the
- * list should not be modified after invoking this method.</p>
+ * list should not be modified after invoking this method.
*
* @return The previously cached value, or <code>null</code> if
* the key was not previously cached. See {@link Map#put}
@@ -61,13 +60,12 @@
public QueryResult put(QueryKey qk, QueryResult oids);
/**
- * <p>Remove the value stored under the given query key.</p>
- * <p/>
- * <p>This method is typically not invoked directly from outside
+ * Remove the value stored under the given query key.
+ * This method is typically not invoked directly from outside
* the <code>QueryCache</code> class. Instead, the cache should
- * be updated by implementing {@link
+ * be updated by implementing {@link
* org.apache.openjpa.event.RemoteCommitListener},
- * which will result in all queries that may be invalid being dropped.</p>
+ * which will result in all queries that may be invalid being dropped.
*
* @return The previously cached value, or <code>null</code> if
* the key was not previously cached. See {@link Map#remove}
@@ -76,7 +74,7 @@
public QueryResult remove(QueryKey qk);
/**
- * <p>Remove all data from this cache.</p>
+ * Remove all data from this cache.
*/
public void clear();
@@ -90,8 +88,7 @@
* behavior of {@link #remove} or {@link #onTypesChanged}.
*
* @return <code>true</code> if <code>key</code>'s value was
- * pinned into the cache; <code>false</code> if the
- * key is not in the cache.
+ * pinned into the cache; <code>false</code> if the key is not in the cache.
*/
public boolean pin(QueryKey qk);
@@ -99,12 +96,11 @@
* Unpin the value stored under <code>key</code> into the cache.
* This method reverses a previous invocation of {@link #pin}.
* This method does not remove anything from the cache; it merely
- * makes <code>key</code>'s value a candidate for flushing from
- * the cache.
+ * makes <code>key</code>'s value a candidate for flushing from the cache.
*
* @return <code>true</code> if <code>key</code>'s value was
- * unpinned from the cache; <code>false</code> if the
- * key is not in the cache.
+ * unpinned from the cache; <code>false</code> if the
+ * key is not in the cache.
*/
public boolean unpin(QueryKey qk);
@@ -133,7 +129,7 @@
public boolean removeTypesChangedListener(TypesChangedListener listen);
/**
- * Free the resources used by this cache.
+ * Free the resources used by this cache.
*/
public void close ();
}