You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by jo...@apache.org on 2014/03/21 15:30:29 UTC
svn commit: r1579945 - in /cayenne/main/trunk:
cayenne-di/src/main/java/org/apache/cayenne/di/
cayenne-server/src/main/java/org/apache/cayenne/
cayenne-server/src/main/java/org/apache/cayenne/access/
cayenne-server/src/main/java/org/apache/cayenne/acce...
Author: johnthuss
Date: Fri Mar 21 14:30:28 2014
New Revision: 1579945
URL: http://svn.apache.org/r1579945
Log:
Javadoc fixes for problems found by java 8's javadoc utility
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/AdhocObjectFactory.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/Binder.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/MapBuilder.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/Cayenne.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/DataObject.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/ObjectContext.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/PersistentObject.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/QueryResult.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BindDirective.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BindNotEqualDirective.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLConditionTranslator.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QueryAssemblerHelper.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/cache/QueryCache.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/Constants.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleQualifierTranslator.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/ejbql/EJBQLExpressionVisitor.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/event/EventBridge.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseAnd.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseLeftShift.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseRightShift.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/PatternMatchNode.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/map/ObjRelationship.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/map/SyntheticPKObjAttribute.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/query/SQLSelect.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/query/UpdateBatchQuery.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/remote/RemoteService.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/remote/service/BaseRemoteService.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionManager.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/HashCodeBuilder.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/MemoryBlob.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/MemoryClob.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/XMLEncoder.java
cayenne/main/trunk/docs/doc/pom.xml
Modified: cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/AdhocObjectFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/AdhocObjectFactory.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/AdhocObjectFactory.java (original)
+++ cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/AdhocObjectFactory.java Fri Mar 21 14:30:28 2014
@@ -34,7 +34,7 @@ public interface AdhocObjectFactory {
/**
* Returns a Java class loaded using ClassLoader returned from
- * {@link #getClassLoader(String)} for a given class name.
+ * {@link ClassLoaderManager#getClassLoader(String)} for a given class name.
*
* @since 3.2
*/
Modified: cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/Binder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/Binder.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/Binder.java (original)
+++ cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/Binder.java Fri Mar 21 14:30:28 2014
@@ -44,7 +44,7 @@ public interface Binder {
<T> BindingBuilder<T> bind(Key<T> key);
/**
- * Starts a binding of a java.util.Map<String, ?> distinguished by its binding name.
+ * Starts a binding of a java.util.Map<String, ?> distinguished by its binding name.
* Map binding should continue using returned MapBuilder. This is somewhat equivalent
* of using "bind(Map.class, bindingName)", however returned MapBuilder provides extra
* DI capabilities.
@@ -52,7 +52,7 @@ public interface Binder {
<T> MapBuilder<T> bindMap(String bindingName);
/**
- * Starts a binding of a java.util.List<?> distinguished by its binding name. List
+ * Starts a binding of a java.util.List<?> distinguished by its binding name. List
* binding should continue using returned ListBuilder. This is somewhat equivalent of
* using "bind(List.class, bindingName)", however returned ListBuilder provides extra
* DI capabilities.
Modified: cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/MapBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/MapBuilder.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/MapBuilder.java (original)
+++ cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/MapBuilder.java Fri Mar 21 14:30:28 2014
@@ -23,8 +23,7 @@ import java.util.Map;
import org.apache.cayenne.di.DIRuntimeException;
/**
- * A binding builder for map configurations. Creates a parameterized map of type <String,
- * T>.
+ * A binding builder for map configurations. Creates a parameterized map of type <String, T>.
*
* @param <T> A type of the map values.
* @since 3.1
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/Cayenne.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/Cayenne.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/Cayenne.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/Cayenne.java Fri Mar 21 14:30:28 2014
@@ -102,7 +102,7 @@ public class Cayenne {
* traverse object relationships until the final object is found. If a null
* object found while traversing path, null is returned. If a list is
* encountered in the middle of the path, CayenneRuntimeException is thrown.
- * Unlike {@link #readPropertyDirectly(String)}, this method will resolve an
+ * Unlike {@link DataObject#readPropertyDirectly(String)}, this method will resolve an
* object if it is HOLLOW.
* <p>
* Examples:
@@ -129,7 +129,7 @@ public class Cayenne {
* <br>
* </li>
* <li>Read to-many relationship in the middle of the path:<br>
- * <code>List<String> names = (List<String>)Cayenne.readNestedProperty(artist, "paintingArray.paintingName");</code>
+ * <code>List<String> names = (List<String>)Cayenne.readNestedProperty(artist, "paintingArray.paintingName");</code>
* <br>
* <br>
* </li>
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java Fri Mar 21 14:30:28 2014
@@ -98,7 +98,7 @@ public class CayenneDataObject extends P
* <br>
* </li>
* <li>Read to-many relationship in the middle of the path:<br>
- * <code>List<String> names = (List<String>)artist.readNestedProperty("paintingArray.paintingName");</code>
+ * <code>List<String> names = (List<String>)artist.readNestedProperty("paintingArray.paintingName");</code>
* <br>
* <br>
* </li>
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java Fri Mar 21 14:30:28 2014
@@ -55,7 +55,7 @@ public class CayenneException extends Ex
/**
* Constructs an <code>CayenneException</code> with the specified detail message.
*
- * @param message the detail message.
+ * @param messageFormat the detail message format string.
*/
public CayenneException(String messageFormat, Object... messageArgs) {
super(String.format(messageFormat, messageArgs));
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/DataObject.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/DataObject.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/DataObject.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/DataObject.java Fri Mar 21 14:30:28 2014
@@ -76,7 +76,7 @@ public interface DataObject extends Pers
* <br>
* </li>
* <li>Read to-many relationship in the middle of the path:<br>
- * <code>List<String> names = (List<String>)artist.readNestedProperty("paintingArray.paintingName");</code>
+ * <code>List<String> names = (List<String>)artist.readNestedProperty("paintingArray.paintingName");</code>
* <br>
* <br>
* </li>
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/ObjectContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/ObjectContext.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/ObjectContext.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/ObjectContext.java Fri Mar 21 14:30:28 2014
@@ -156,7 +156,7 @@ public interface ObjectContext extends D
/**
* Resets all uncommitted changes made to the objects in this ObjectContext.
- * Same as {@link #rollbackChanges()()}, but rollback is local to this
+ * Same as {@link #rollbackChanges()}, but rollback is local to this
* context and no cascading changes undoing occurs.
*/
void rollbackChangesLocally();
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/PersistentObject.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/PersistentObject.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/PersistentObject.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/PersistentObject.java Fri Mar 21 14:30:28 2014
@@ -27,7 +27,7 @@ import org.apache.cayenne.reflect.ToMany
/**
* A convenience base superclass for concrete Persistent objects. Provides implementation
* of properties declared in Persistent interface.
- * <h4>POJO Note</h4>
+ * <h1>POJO Note</h1>
* <p>
* If having PersistentObject as a superclass presents a problem in an application, source
* code of this class can be copied verbatim to a custom class generation template.
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java Fri Mar 21 14:30:28 2014
@@ -463,7 +463,7 @@ public class DataContext extends BaseCon
* Instantiates a new object and registers it with this context. Object
* class is determined from the mapped entity. Object class must have a
* default constructor.
- * <p/>
+ * <p>
* <i>Note: in most cases {@link #newObject(Class)} method should be used,
* however this method is helpful when generic persistent classes are
* used.</i>
@@ -502,7 +502,7 @@ public class DataContext extends BaseCon
* Registers a transient object with the context, recursively registering
* all transient persistent objects attached to this object via
* relationships.
- * <p/>
+ * <p>
* <i>Note that since 3.0 this method takes Object as an argument instead of
* a {@link DataObject}.</i>
*
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java Fri Mar 21 14:30:28 2014
@@ -258,7 +258,7 @@ public class DataDomain implements Query
* Returns <code>true</code> if DataContexts produced by this DataDomain are
* using shared DataRowStore. Returns <code>false</code> if each DataContext
* would work with its own DataRowStore. Note that this setting can be
- * overwritten per DataContext. See {@link #createDataContext(boolean)}.
+ * overwritten per DataContext.
*/
public boolean isSharedCacheEnabled() {
return sharedCacheEnabled;
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/QueryResult.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/QueryResult.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/QueryResult.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/QueryResult.java Fri Mar 21 14:30:28 2014
@@ -67,7 +67,7 @@ public class QueryResult extends Default
}
/**
- * Returns the first update count for the query. This is a shortcut for <code>(Integer)getUpdates(query).get(0)<code>, kind of like Google's "I'm feeling lucky".
+ * Returns the first update count for the query. This is a shortcut for <code>(Integer)getUpdates(query).get(0)</code>, kind of like Google's "I'm feeling lucky".
* Returns -1 if no update count is found for the query.
*/
public int getFirstUpdateCount(Query query) {
@@ -124,7 +124,7 @@ public class QueryResult extends Default
}
/**
- * Returns the first results for the query. This is a shortcut for <code>(List)getRows(query).get(0)<code>, kind of like Google's "I'm feeling lucky".
+ * Returns the first results for the query. This is a shortcut for <code>(List)getRows(query).get(0)</code>, kind of like Google's "I'm feeling lucky".
*/
public List getFirstRows(Query query) {
List allResults = getResults(query);
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BindDirective.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BindDirective.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BindDirective.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BindDirective.java Fri Mar 21 14:30:28 2014
@@ -49,8 +49,8 @@ import org.apache.velocity.runtime.parse
* <strong>Binding literal parameter value:</strong>
* </p>
* <p>
- * <code>"WHERE SOME_COLUMN > #bind($xyz)"</code> produces
- * <code>"WHERE SOME_COLUMN > ?"</code> and also places the value of the "xyz" parameter
+ * <code>"WHERE SOME_COLUMN > #bind($xyz)"</code> produces
+ * <code>"WHERE SOME_COLUMN > ?"</code> and also places the value of the "xyz" parameter
* in the context "bindings" collection.
* </p>
* <p>
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BindNotEqualDirective.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BindNotEqualDirective.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BindNotEqualDirective.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BindNotEqualDirective.java Fri Mar 21 14:30:28 2014
@@ -25,7 +25,7 @@ import java.io.Writer;
import org.apache.velocity.context.InternalContextAdapter;
/**
- * A custom Velocity directive to create a PreparedStatement parameter text for "<>?".
+ * A custom Velocity directive to create a PreparedStatement parameter text for "<>?".
* If null value is encountered, generated text will look like "IS NOT NULL". Usage in
* Velocity template is "WHERE SOME_COLUMN #bindNotEqual($xyz)".
*
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java Fri Mar 21 14:30:28 2014
@@ -52,7 +52,7 @@ public class DistinctResultIterator<T> i
/**
* Creates new DistinctResultIterator wrapping another ResultIterator.
*
- * @param wrappedIterator
+ * @param delegate
* @param defaultEntity
* an entity needed to build ObjectIds for distinct comparison.
*/
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLConditionTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLConditionTranslator.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLConditionTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLConditionTranslator.java Fri Mar 21 14:30:28 2014
@@ -358,7 +358,7 @@ public class EJBQLConditionTranslator ex
/**
* Checks expression for containing null input parameter. For that, we'll
- * append IS NULL or IS NOT NULL instead of =null or <>null
+ * append IS NULL or IS NOT NULL instead of =null or <>null
*
* @return whether replacement was done and there's no need for normal
* expression processing
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QueryAssemblerHelper.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QueryAssemblerHelper.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QueryAssemblerHelper.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QueryAssemblerHelper.java Fri Mar 21 14:30:28 2014
@@ -99,11 +99,11 @@ public abstract class QueryAssemblerHelp
protected abstract void doAppendPart() throws IOException;
/**
- * Outputs the standard JDBC (database agnostic) expression for supplying
+ * <p>Outputs the standard JDBC (database agnostic) expression for supplying
* the escape character to the database server when supplying a LIKE clause.
* This has been factored-out because some database adaptors handle LIKE
* differently and they need access to this common method in order not to
- * repeat this code. </p>
+ * repeat this code.
* <p>
* If there is no escape character defined then this method will not output
* anything. An escape character of 0 will mean no escape character.
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/cache/QueryCache.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/cache/QueryCache.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/cache/QueryCache.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/cache/QueryCache.java Fri Mar 21 14:30:28 2014
@@ -45,7 +45,7 @@ public interface QueryCache {
* Returns a cached query result for the given QueryMetadata. If the result is not
* cached or is expired, cache will use provided factory to rebuild the value and
* store it in the cache. A corollary is that this method never returns null.
- * <p/>
+ * <p>
* Compared to {@link #get(QueryMetadata)}, this method allows the cache to do
* appropriate synchronization when refreshing the entry, preventing multiple threads
* from running the same query when a missing entry is requested by multiple threads
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/Constants.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/Constants.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/Constants.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/Constants.java Fri Mar 21 14:30:28 2014
@@ -29,48 +29,48 @@ public interface Constants {
// DI "collections"
/**
- * A DI container key for the Map<String, String> storing properties used by built-in
+ * A DI container key for the Map<String, String> storing properties used by built-in
* Cayenne service.
*/
public static final String PROPERTIES_MAP = "cayenne.properties";
/**
- * A DI container key for the List<DbAdapterDetector> that contains objects that can
+ * A DI container key for the List<DbAdapterDetector> that contains objects that can
* discover the type of current database and install the correct DbAdapter in runtime.
*/
public static final String SERVER_ADAPTER_DETECTORS_LIST = "cayenne.server.adapter_detectors";
/**
- * A DI container key for the List<DataChannelFilter> storing DataDomain filters.
+ * A DI container key for the List<DataChannelFilter> storing DataDomain filters.
*/
public static final String SERVER_DOMAIN_FILTERS_LIST = "cayenne.server.domain_filters";
/**
- * A DI container key for the List<String> storing locations of the one of more
+ * A DI container key for the List<String> storing locations of the one of more
* project configuration files.
*/
public static final String SERVER_PROJECT_LOCATIONS_LIST = "cayenne.server.project_locations";
/**
- * A DI container key for the List<ExtendedType> storing default adapter-agnostic
+ * A DI container key for the List<ExtendedType> storing default adapter-agnostic
* ExtendedTypes.
*/
public static final String SERVER_DEFAULT_TYPES_LIST = "cayenne.server.default_types";
/**
- * A DI container key for the List<ExtendedType> storing a user-provided
+ * A DI container key for the List<ExtendedType> storing a user-provided
* ExtendedTypes.
*/
public static final String SERVER_USER_TYPES_LIST = "cayenne.server.user_types";
/**
- * A DI container key for the List<ExtendedTypeFactory> storing default and
+ * A DI container key for the List<ExtendedTypeFactory> storing default and
* user-provided ExtendedTypeFactories.
*/
public static final String SERVER_TYPE_FACTORIES_LIST = "cayenne.server.type_factories";
/**
- * A server-side DI container key for the Map<String, String> storing event bridge
+ * A server-side DI container key for the Map<String, String> storing event bridge
* properties passed to the ROP client on bootstrap.
*/
public static final String SERVER_ROP_EVENT_BRIDGE_PROPERTIES_MAP = "cayenne.server.rop_event_bridge_properties";
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java Fri Mar 21 14:30:28 2014
@@ -148,7 +148,7 @@ public class DataNodeDescriptor implemen
/**
* Returns extra DataNodeDescriptor parameters. This property is often used by custom
- * {@link DataSourceFactory} to configure a DataSource. E.g. JNDIDataSoirceFactory may
+ * {@link org.apache.cayenne.configuration.server.DataSourceFactory} to configure a DataSource. E.g. JNDIDataSourceFactory may
* treat parameters String as a JNDI location of the DataSource, etc.
*/
public String getParameters() {
@@ -157,7 +157,7 @@ public class DataNodeDescriptor implemen
/**
* Sets extra DataNodeDescriptor parameters. This property is often used by custom
- * {@link DataSourceFactory} to configure a DataSource. E.g. JNDIDataSoirceFactory may
+ * {@link org.apache.cayenne.configuration.server.DataSourceFactory} to configure a DataSource. E.g. JNDIDataSourceFactory may
* treat parameters String as a JNDI location of the DataSource, etc.
*/
public void setParameters(String parameters) {
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java Fri Mar 21 14:30:28 2014
@@ -33,7 +33,7 @@ import org.apache.cayenne.tx.Transaction
* An object representing Cayenne server-stack that connects directly to the
* database via JDBC. This is an entry point for user applications to access
* Cayenne, which encapsulates the dependency injection internals. The term
- * "server" is used as opposed to ROP "client" (see {@link ClientRuntime}). Any
+ * "server" is used as opposed to ROP "client" (see {@link CayenneRuntime}). Any
* application, desktop, server, etc. that has a direct JDBC connection should
* be using this runtime.
*
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java Fri Mar 21 14:30:28 2014
@@ -62,8 +62,8 @@ import org.apache.cayenne.resource.Resou
* <p>
* Foreign key constraints are supported by InnoDB engine and NOT supported by
* MyISAM engine. This adapter by default assumes MyISAM, so
- * {@link org.apache.cayenne.dba.JdbcAdapter#supportsFkConstraints()} will
- * return false. Users can manually change this by calling
+ * <code>supportsFkConstraints</code> will
+ * be false. Users can manually change this by calling
* <em>setSupportsFkConstraints(true)</em> or better by using an
* {@link org.apache.cayenne.dba.AutoAdapter}, i.e. not entering the adapter
* name at all for the DataNode, letting Cayenne guess it in runtime. In the
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleQualifierTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleQualifierTranslator.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleQualifierTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleQualifierTranslator.java Fri Mar 21 14:30:28 2014
@@ -34,7 +34,7 @@ import org.apache.commons.collections.Tr
/**
* Oracle qualifier translator. In particular, trims INs with more than 1000 elements to
- * an OR-set of INs with <= 1000 elements
+ * an OR-set of INs with <= 1000 elements
*/
public class OracleQualifierTranslator extends TrimmingQualifierTranslator {
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java Fri Mar 21 14:30:28 2014
@@ -37,7 +37,7 @@ import org.apache.cayenne.query.SQLActio
import org.apache.cayenne.resource.ResourceLocator;
/**
- * Cayenne DbAdapter implementation for <a href="http://www.microsoft.com/sql/"Microsoft
+ * <p>Cayenne DbAdapter implementation for <a href="http://www.microsoft.com/sql/">Microsoft
* SQL Server </a> engine. </p> <h3>Microsoft Driver Settings</h3>
* <p>
* Sample connection settings to use with MS SQL Server are shown below:
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/ejbql/EJBQLExpressionVisitor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/ejbql/EJBQLExpressionVisitor.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/ejbql/EJBQLExpressionVisitor.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/ejbql/EJBQLExpressionVisitor.java Fri Mar 21 14:30:28 2014
@@ -137,9 +137,9 @@ public interface EJBQLExpressionVisitor
boolean visitFromItem(EJBQLFromItem expression, int finishedChildIndex);
/**
- * Called on visiting ">=" expression and also after visiting every expression child.
+ * Called on visiting ">=" expression and also after visiting every expression child.
*
- * @param expression an ">=" node being visited.
+ * @param expression an ">=" node being visited.
* @param finishedChildIndex "-1" when the expression node is visited for the first
* time, before its children; otherwise this is an index of a child just
* visited.
@@ -147,9 +147,9 @@ public interface EJBQLExpressionVisitor
boolean visitGreaterOrEqual(EJBQLExpression expression, int finishedChildIndex);
/**
- * Called on visiting ">=" expression and also after visiting every expression child.
+ * Called on visiting ">=" expression and also after visiting every expression child.
*
- * @param expression an ">=" node being visited.
+ * @param expression an ">=" node being visited.
* @param finishedChildIndex "-1" when the expression node is visited for the first
* time, before its children; otherwise this is an index of a child just
* visited.
@@ -179,9 +179,9 @@ public interface EJBQLExpressionVisitor
boolean visitLength(EJBQLExpression expression, int finishedChildIndex);
/**
- * Called on visiting "<=" expression and also after visiting every expression child.
+ * Called on visiting "<=" expression and also after visiting every expression child.
*
- * @param expression an "<=" node being visited.
+ * @param expression an "<=" node being visited.
* @param finishedChildIndex "-1" when the expression node is visited for the first
* time, before its children; otherwise this is an index of a child just
* visited.
@@ -189,9 +189,9 @@ public interface EJBQLExpressionVisitor
boolean visitLessOrEqual(EJBQLExpression expression, int finishedChildIndex);
/**
- * Called on visiting "<" expression and also after visiting every expression child.
+ * Called on visiting "<" expression and also after visiting every expression child.
*
- * @param expression an "<" node being visited.
+ * @param expression an "<" node being visited.
* @param finishedChildIndex "-1" when the expression node is visited for the first
* time, before its children; otherwise this is an index of a child just
* visited.
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/event/EventBridge.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/event/EventBridge.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/event/EventBridge.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/event/EventBridge.java Fri Mar 21 14:30:28 2014
@@ -28,7 +28,7 @@ import java.util.HashSet;
import org.apache.cayenne.util.Util;
/**
- * An object that passes events between a local EventManager and some other event dispatch
+ * <p>An object that passes events between a local EventManager and some other event dispatch
* mechanism. The most common example is sending local events to remote JVMs and receiving
* remote events dispatched by those VMs. EventBridge makes possible to connect a network
* of regular EventManagers in a single "virtual" distributed EventManager.
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseAnd.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseAnd.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseAnd.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseAnd.java Fri Mar 21 14:30:28 2014
@@ -25,7 +25,7 @@ import org.apache.cayenne.exp.Expression
import org.apache.cayenne.util.ConversionUtil;
/**
- * Bitwise conjunction (AND or '&') expression
+ * Bitwise conjunction (AND or '&') expression
*
* @since 3.1
*/
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseLeftShift.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseLeftShift.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseLeftShift.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseLeftShift.java Fri Mar 21 14:30:28 2014
@@ -25,7 +25,7 @@ import org.apache.cayenne.exp.Expression
import org.apache.cayenne.util.ConversionUtil;
/**
- * Bitwise left shift '<<' operation.
+ * Bitwise left shift '<<' operation.
*
* @since 3.2
*/
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseRightShift.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseRightShift.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseRightShift.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseRightShift.java Fri Mar 21 14:30:28 2014
@@ -25,7 +25,7 @@ import org.apache.cayenne.exp.Expression
import org.apache.cayenne.util.ConversionUtil;
/**
- * Bitwise right shift '>>' operation.
+ * Bitwise right shift '>>' operation.
*
* @since 3.2
*/
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/PatternMatchNode.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/PatternMatchNode.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/PatternMatchNode.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/PatternMatchNode.java Fri Mar 21 14:30:28 2014
@@ -51,7 +51,7 @@ public abstract class PatternMatchNode e
/**
* <p>This method will return an escape character for the like
* clause. The escape character will eventually end up in the
- * query as <code>...(t0.foo LIKE ? {escape '|'}) where the
+ * query as <code>...(t0.foo LIKE ? {escape '|'})</code> where the
* pipe symbol is the escape character.</p>
*
* <p>Note that having no escape character is represented as
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/map/ObjRelationship.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/map/ObjRelationship.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/map/ObjRelationship.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/map/ObjRelationship.java Fri Mar 21 14:30:28 2014
@@ -58,7 +58,7 @@ public class ObjRelationship extends Rel
/**
* Db-relationships path that is set but not yet parsed (turned into
- * List<DbRelationship>) Used during map loading
+ * List<DbRelationship>) Used during map loading
*/
String deferredPath;
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/map/SyntheticPKObjAttribute.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/map/SyntheticPKObjAttribute.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/map/SyntheticPKObjAttribute.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/map/SyntheticPKObjAttribute.java Fri Mar 21 14:30:28 2014
@@ -20,7 +20,7 @@ package org.apache.cayenne.map;
/**
- * A "synthetic" server-side ObjAttribute used to describe unmapped PK>.
+ * A "synthetic" server-side ObjAttribute used to describe unmapped PK.
*
* @since 3.0
*/
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/query/SQLSelect.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/query/SQLSelect.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/query/SQLSelect.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/query/SQLSelect.java Fri Mar 21 14:30:28 2014
@@ -274,7 +274,7 @@ public class SQLSelect<T> extends Indire
* names in uppercase) is portable across database engines that can have
* varying default capitalization. Default (null) value indicates that
* column names provided in result set are used unchanged.
- * <p/>
+ * <p>
* Note that while a non-default setting is useful for queries that do not
* rely on a #result directive to describe columns, it works for all
* SQLTemplates the same way.
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java Fri Mar 21 14:30:28 2014
@@ -620,7 +620,7 @@ public class SQLTemplate extends Abstrac
* Cayenne column mapping strategy (e.g. all column names in uppercase) is portable
* across database engines that can have varying default capitalization. Default
* (null) value indicates that column names provided in result set are used unchanged.
- * <p/>
+ * <p>
* Note that while a non-default setting is useful for queries that do not rely on a
* #result directive to describe columns, it works for all SQLTemplates the same way.
*
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/query/UpdateBatchQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/query/UpdateBatchQuery.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/query/UpdateBatchQuery.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/query/UpdateBatchQuery.java Fri Mar 21 14:30:28 2014
@@ -58,7 +58,7 @@ public class UpdateBatchQuery extends Ba
* DbAttributes used in the WHERE clause.
* @param nullQualifierNames
* DbAttribute names in the WHERE clause that have null values.
- * @param updatedAttribute
+ * @param updatedAttributes
* DbAttributes describing updated columns.
* @param batchCapacity
* Estimated size of the batch.
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/remote/RemoteService.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/remote/RemoteService.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/remote/RemoteService.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/remote/RemoteService.java Fri Mar 21 14:30:28 2014
@@ -26,7 +26,7 @@ import java.rmi.RemoteException;
* Interface of a Cayenne remote service.
*
* @since 1.2
- * @see org.apache.cayenne.remote.hessian.service.HessianServlet
+ * @see org.apache.cayenne.configuration.rop.server.ROPHessianServlet
*/
public interface RemoteService extends Remote {
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/remote/service/BaseRemoteService.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/remote/service/BaseRemoteService.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/remote/service/BaseRemoteService.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/remote/service/BaseRemoteService.java Fri Mar 21 14:30:28 2014
@@ -172,7 +172,7 @@ public abstract class BaseRemoteService
* Creates a server-side channel that will handle all client requests. For shared
* sessions the same channel instance is reused for the entire group of clients. For
* dedicated sessions, one channel per client is created.
- * <p/>
+ * <p>
* This implementation returns {@link ClientServerChannel} instance wrapping a
* DataContext. Subclasses may override the method to customize channel creation. For
* instance they may wrap channel in the custom interceptors to handle transactions or
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionManager.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionManager.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionManager.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionManager.java Fri Mar 21 14:30:28 2014
@@ -31,7 +31,7 @@ public interface TransactionManager {
/**
* Starts a new transaction (or joins an existing one) calling
- * {@link TransactionalOperation#perform(CayenneRuntime)}, and then
+ * {@link org.apache.cayenne.tx.TransactionalOperation#perform()}, and then
* committing or rolling back the transaction. Frees the user
*/
<T> T performInTransaction(TransactionalOperation<T> op);
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/HashCodeBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/HashCodeBuilder.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/HashCodeBuilder.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/HashCodeBuilder.java Fri Mar 21 14:30:28 2014
@@ -249,7 +249,7 @@ public class HashCodeBuilder {
* <p>
* This adds <code>iConstant * 1</code> to the <code>hashCode</code> and not a
* <code>1231</code> or <code>1237</code> as done in java.lang.Boolean. This is in
- * accordance with the <quote>Effective Java</quote> design.
+ * accordance with the <i>Effective Java</i> design.
* </p>
*
* @param value the boolean to add to the <code>hashCode</code>
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/MemoryBlob.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/MemoryBlob.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/MemoryBlob.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/MemoryBlob.java Fri Mar 21 14:30:28 2014
@@ -77,7 +77,7 @@ public class MemoryBlob implements Blob
* to <code>length</code> consecutive bytes starting at position <code>pos</code>.
* <p>
* The official specification is ambiguous in that it does not precisely indicate the
- * policy to be observed when pos > this.length() - length. One policy would be to
+ * policy to be observed when pos > this.length() - length. One policy would be to
* retrieve the octets from pos to this.length(). Another would be to throw an
* exception. This implementation observes the later policy.
*
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/MemoryClob.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/MemoryClob.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/MemoryClob.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/MemoryClob.java Fri Mar 21 14:30:28 2014
@@ -53,7 +53,7 @@ public class MemoryClob implements Clob
* internal character buffer is not much larger than required to represent the value.
*
* @param data the character sequence representing the Clob value
- * @throws SQLException if the argument is null
+ * @throws CayenneRuntimeException if the argument is null
*/
public MemoryClob(String data) {
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/XMLEncoder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/XMLEncoder.java?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/XMLEncoder.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/XMLEncoder.java Fri Mar 21 14:30:28 2014
@@ -97,8 +97,8 @@ public class XMLEncoder {
/**
* Prints an XML attribute. The value is trimmed (so leading and following spaces are
- * lost) and then encoded to be a proper XML attribute value. E.g. "&" becomes
- * "&", etc.
+ * lost) and then encoded to be a proper XML attribute value. E.g. "&" becomes
+ * "&amp;", etc.
*
* @since 3.1
*/
Modified: cayenne/main/trunk/docs/doc/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/pom.xml?rev=1579945&r1=1579944&r2=1579945&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/pom.xml (original)
+++ cayenne/main/trunk/docs/doc/pom.xml Fri Mar 21 14:30:28 2014
@@ -193,6 +193,18 @@
<!-- this is relative to target/site/apidocs -->
<destDir>doc/api</destDir>
<stylesheet>java</stylesheet>
+ <additionalDependencies>
+ <additionalDependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups-all</artifactId>
+ <version>2.2.7</version>
+ </additionalDependency>
+ <additionalDependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ <version>2.4.3</version>
+ </additionalDependency>
+ </additionalDependencies>
</configuration>
<executions>
<execution>