You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by mg...@apache.org on 2012/06/12 15:41:58 UTC
svn commit: r1349347 - in /cayenne/main/trunk/framework:
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access...
Author: mgentry
Date: Tue Jun 12 13:41:57 2012
New Revision: 1349347
URL: http://svn.apache.org/viewvc?rev=1349347&view=rev
Log:
Added missing @Deprecated annotations from methods which only had @deprecated in the JavaDoc section.
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/BaseContext.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContext.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataNode.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCacheFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/QueryCacheFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/WebApplicationContextFilter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/ContainerPoolFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/PoolManager.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactoryChain.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/AshwoodEntitySorter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntitySorter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/ClientChannel.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/service/HessianServlet.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Util.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/SerializableEntity.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLDecoder.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLEncoder.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLMappingDescriptor.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLSerializable.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLUtil.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/MockObjectContext.java
cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java
cayenne/main/trunk/framework/cayenne-wocompat-unpublished/src/main/java/org/apache/cayenne/wocompat/parser/SimpleCharStream.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/BaseContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/BaseContext.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/BaseContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/BaseContext.java Tue Jun 12 13:41:57 2012
@@ -276,6 +276,7 @@ public abstract class BaseContext implem
* internal code has been refactored to avoid using this method all
* together.
*/
+ @Deprecated
public Persistent localObject(ObjectId id, Object prototype) {
if (id == null) {
@@ -680,6 +681,7 @@ public abstract class BaseContext implem
* @deprecated since 3.1 use {@link #deleteObjects(Object...)} method instead. This
* method is redundant.
*/
+ @Deprecated
public void deleteObject(Object object) {
deleteObjects(object);
}
@@ -712,4 +714,4 @@ public abstract class BaseContext implem
action.performDelete((Persistent) object);
}
}
-}
\ No newline at end of file
+}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContext.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContext.java Tue Jun 12 13:41:57 2012
@@ -78,6 +78,7 @@ public interface ObjectContext extends S
* internal code has been refactored to avoid using this method all
* together.
*/
+ @Deprecated
Persistent localObject(ObjectId id, Object prototype);
/**
@@ -117,6 +118,7 @@ public interface ObjectContext extends S
* @deprecated since 3.1 use {@link #deleteObjects(Object...)} method instead. This
* method is redundant.
*/
+ @Deprecated
void deleteObject(Object object) throws DeleteDenyException;
/**
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java Tue Jun 12 13:41:57 2012
@@ -121,6 +121,7 @@ public class DataDomain implements Query
*
* @deprecated since 3.1 BatchQueryBuilderFactory is injected into JdbcAdapter.
*/
+ @Deprecated
private BatchQueryBuilderFactory queryBuilderFactory;
/**
@@ -392,6 +393,7 @@ public class DataDomain implements Query
*
* @deprecated since 3.1 use a more consistently named {@link #addDataMap(DataMap)}.
*/
+ @Deprecated
public void addMap(DataMap map) {
addDataMap(map);
}
@@ -406,6 +408,7 @@ public class DataDomain implements Query
*
* @deprecated since 3.1 use a more consistently named {@link #getDataMap(String)}.
*/
+ @Deprecated
public DataMap getMap(String mapName) {
return getEntityResolver().getDataMap(mapName);
}
@@ -423,6 +426,7 @@ public class DataDomain implements Query
*
* @deprecated since 3.1 use a more consistently named {@link #removeDataMap(String)}.
*/
+ @Deprecated
public void removeMap(String mapName) {
removeDataMap(mapName);
}
@@ -600,6 +604,7 @@ public class DataDomain implements Query
*
* @deprecated since 3.1, use a more consistently named {@link #getDataNode(String)}.
*/
+ @Deprecated
public DataNode getNode(String nodeName) {
return getDataNode(nodeName);
}
@@ -924,6 +929,7 @@ public class DataDomain implements Query
*
* @deprecated since 3.1 BatchQueryBuilderFactory is injected into JdbcAdapter.
*/
+ @Deprecated
public void setQueryBuilderFactory(BatchQueryBuilderFactory queryBuilderFactory) {
this.queryBuilderFactory = queryBuilderFactory;
}
@@ -932,6 +938,7 @@ public class DataDomain implements Query
* @return factory for creating QueryBuilders. Might be null
* @deprecated since 3.1 BatchQueryBuilderFactory is injected into JdbcAdapter.
*/
+ @Deprecated
public BatchQueryBuilderFactory getQueryBuilderFactory() {
return queryBuilderFactory;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataNode.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataNode.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataNode.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataNode.java Tue Jun 12 13:41:57 2012
@@ -326,6 +326,7 @@ public class DataNode implements QueryEn
* @deprecated since 3.1 does nothing as pool shutdown is performed by the DI
* container.
*/
+ @Deprecated
public void shutdown() {
// noop
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java Tue Jun 12 13:41:57 2012
@@ -88,6 +88,7 @@ public class IncrementalFaultList<E> imp
/**
* @deprecated since 3.1 use {@link #IncrementalFaultList(DataContext, Query, int)}.
*/
+ @Deprecated
public IncrementalFaultList(DataContext dataContext, Query query) {
this(dataContext, query, 10000);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java Tue Jun 12 13:41:57 2012
@@ -42,6 +42,7 @@ public abstract class BatchQueryBuilder
/**
* @deprecated since 3.1 unused
*/
+ @Deprecated
public BatchQueryBuilder() {
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java Tue Jun 12 13:41:57 2012
@@ -77,6 +77,7 @@ public class AshwoodEntitySorter impleme
* @deprecated since 3.1. Use {@link #AshwoodEntitySorter()} constructor together with
* {@link #setDataMaps(Collection)} instead.
*/
+ @Deprecated
public AshwoodEntitySorter(Collection<DataMap> dataMaps) {
this();
setDataMaps(dataMaps);
@@ -190,6 +191,7 @@ public class AshwoodEntitySorter impleme
* @since 1.1
* @deprecated since 3.1, {@link #setEntityResolver(EntityResolver)} is used instead.
*/
+ @Deprecated
public void setDataMaps(Collection<DataMap> dataMaps) {
setEntityResolver(new EntityResolver(dataMaps != null
? dataMaps
@@ -289,7 +291,8 @@ public class AshwoodEntitySorter impleme
Persistent masterCandidate = persistent.get(j);
for (Object master : masters) {
- if (masterCandidate.equals(master)) {
+// if (masterCandidate.equals(master)) {
+ if (masterCandidate == master) {
objectDependencyGraph.putArc(
masterCandidate,
current,
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheFactory.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheFactory.java Tue Jun 12 13:41:57 2012
@@ -25,6 +25,7 @@ import java.util.Map;
* @deprecated since 3.1 MapQueryCacheFactory and QueryCacheFactory are unused. Analog of
* MapQueryCacheFactory is DI-friendly {@link MapQueryCacheProvider}.
*/
+@Deprecated
public class MapQueryCacheFactory implements QueryCacheFactory {
public static final String CACHE_SIZE_PROPERTY = "cayenne.MapQueryCacheFactory.cacheSize";
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCacheFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCacheFactory.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCacheFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCacheFactory.java Tue Jun 12 13:41:57 2012
@@ -27,6 +27,7 @@ import java.util.Map;
* @since 3.0
* @deprecated since 3.1 OSQueryCacheFactory and QueryCacheFactory are unused.
*/
+@Deprecated
public class OSQueryCacheFactory implements QueryCacheFactory {
/**
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/QueryCacheFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/QueryCacheFactory.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/QueryCacheFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/QueryCacheFactory.java Tue Jun 12 13:41:57 2012
@@ -29,6 +29,7 @@ import org.apache.cayenne.di.Provider;
* @deprecated since 3.1 QueryCacheFactory is unused and replaced by corresponding
* {@link Provider} implementation for various types of QueryCache.
*/
+@Deprecated
public interface QueryCacheFactory {
/**
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/WebApplicationContextFilter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/WebApplicationContextFilter.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/WebApplicationContextFilter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/WebApplicationContextFilter.java Tue Jun 12 13:41:57 2012
@@ -33,6 +33,7 @@ import org.apache.commons.logging.LogFac
* @since 1.2
* @deprecated since 3.0 {@link CayenneFilter} should be used.
*/
+@Deprecated
public class WebApplicationContextFilter extends CayenneFilter {
private Log logger;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java Tue Jun 12 13:41:57 2012
@@ -57,6 +57,7 @@ public class XMLDataChannelDescriptorLoa
* the password on the spot. For one thing this can be used in the Modeler
* and no password may be available.
*/
+ @Deprecated
private static String passwordFromURL(URL url) {
InputStream inputStream = null;
String password = null;
@@ -79,6 +80,7 @@ public class XMLDataChannelDescriptorLoa
* the password on the spot. For one thing this can be used in the Modeler
* and no password may be available.
*/
+ @Deprecated
private static String passwordFromInputStream(InputStream inputStream) {
BufferedReader bufferedReader = null;
String password = null;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/ContainerPoolFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/ContainerPoolFactory.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/ContainerPoolFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/ContainerPoolFactory.java Tue Jun 12 13:41:57 2012
@@ -93,6 +93,7 @@ import javax.naming.spi.ObjectFactory;
* and should use their container's preferred approach to map a DataSource
* instead.
*/
+@Deprecated
public class ContainerPoolFactory implements ObjectFactory {
/**
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/PoolManager.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/PoolManager.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/PoolManager.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/PoolManager.java Tue Jun 12 13:41:57 2012
@@ -179,6 +179,7 @@ public class PoolManager implements Scop
* @deprecated since 3.1 replaced with {@link #shutdown()} method for naming
* consistency.
*/
+ @Deprecated
public void dispose() throws SQLException {
shutdown();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactory.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactory.java Tue Jun 12 13:41:57 2012
@@ -32,6 +32,7 @@ import java.sql.SQLException;
* {@link org.apache.cayenne.configuration.server.DbAdapterFactory} configured via
* dependency injection.
*/
+@Deprecated
public interface DbAdapterFactory {
/**
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactoryChain.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactoryChain.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactoryChain.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactoryChain.java Tue Jun 12 13:41:57 2012
@@ -34,6 +34,7 @@ import java.util.List;
* {@link org.apache.cayenne.configuration.server.DbAdapterFactory} configured via
* dependency injection.
*/
+@Deprecated
class DbAdapterFactoryChain implements DbAdapterFactory {
List<DbAdapterFactory> factories;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java Tue Jun 12 13:41:57 2012
@@ -171,6 +171,7 @@ class OracleSQLTemplateAction extends SQ
/**
* @deprecated
*/
+ @Deprecated
public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
return delegate.getBigDecimal(columnIndex, scale);
}
@@ -182,6 +183,7 @@ class OracleSQLTemplateAction extends SQ
/**
* @deprecated
*/
+ @Deprecated
public BigDecimal getBigDecimal(String columnName, int scale) throws SQLException {
return delegate.getBigDecimal(columnName, scale);
}
@@ -400,6 +402,7 @@ class OracleSQLTemplateAction extends SQ
/**
* @deprecated
*/
+ @Deprecated
public InputStream getUnicodeStream(int columnIndex) throws SQLException {
return delegate.getUnicodeStream(columnIndex);
}
@@ -407,6 +410,7 @@ class OracleSQLTemplateAction extends SQ
/**
* @deprecated
*/
+ @Deprecated
public InputStream getUnicodeStream(String columnName) throws SQLException {
return delegate.getUnicodeStream(columnName);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/AshwoodEntitySorter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/AshwoodEntitySorter.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/AshwoodEntitySorter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/AshwoodEntitySorter.java Tue Jun 12 13:41:57 2012
@@ -24,6 +24,7 @@ import java.util.Collection;
* @deprecated since 3.1 moved to "org.apache.cayenne.ashwood" package.
* @since 1.1
*/
+@Deprecated
public class AshwoodEntitySorter extends org.apache.cayenne.ashwood.AshwoodEntitySorter {
public AshwoodEntitySorter() {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java Tue Jun 12 13:41:57 2012
@@ -308,6 +308,7 @@ public class DataMap implements Serializ
* @deprecated since 3.1, as {@link XMLSerializable} objects should only save XML
* segments. Saving full XML files is responsibilty of the callers.
*/
+ @Deprecated
public void encodeAsXML(PrintWriter pw) {
XMLEncoder encoder = new XMLEncoder(pw, "\t");
encoder.println("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java Tue Jun 12 13:41:57 2012
@@ -657,6 +657,7 @@ public class EntityResolver implements M
*
* @deprecated since 3.1 use {@link #lookupInheritanceTree(String)}.
*/
+ @Deprecated
public EntityInheritanceTree lookupInheritanceTree(ObjEntity entity) {
return lookupInheritanceTree(entity.getName());
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntitySorter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntitySorter.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntitySorter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntitySorter.java Tue Jun 12 13:41:57 2012
@@ -35,6 +35,7 @@ public interface EntitySorter {
* @deprecated since 3.1 {@link #setEntityResolver(EntityResolver)} is used, and this
* method is never called.
*/
+ @Deprecated
void setDataMaps(Collection<DataMap> dataMaps);
/**
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/ClientChannel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/ClientChannel.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/ClientChannel.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/ClientChannel.java Tue Jun 12 13:41:57 2012
@@ -68,6 +68,7 @@ public class ClientChannel implements Da
* @deprecated since 3.1 use
* {@link #ClientChannel(ClientConnection, boolean, EventManager, boolean)}
*/
+ @Deprecated
public ClientChannel(ClientConnection connection) {
this(connection, false);
}
@@ -76,6 +77,7 @@ public class ClientChannel implements Da
* @deprecated since 3.1 use
* {@link #ClientChannel(ClientConnection, boolean, EventManager, boolean)}
*/
+ @Deprecated
public ClientChannel(ClientConnection connection, boolean channelEventsEnabled) {
this(connection, channelEventsEnabled, new DefaultEventManager(2));
}
@@ -84,6 +86,7 @@ public class ClientChannel implements Da
* @deprecated since 3.1 use
* {@link #ClientChannel(ClientConnection, boolean, EventManager, boolean)}
*/
+ @Deprecated
public ClientChannel(ClientConnection connection, boolean channelEventsEnabled,
EventManager eventManager) throws CayenneRuntimeException {
this(connection, channelEventsEnabled, eventManager, false);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/service/HessianServlet.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/service/HessianServlet.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/service/HessianServlet.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/service/HessianServlet.java Tue Jun 12 13:41:57 2012
@@ -36,6 +36,7 @@ import org.apache.commons.logging.LogFac
* @deprecated since 3.1 use {@link ROPHessianServlet}.
* @since 1.2
*/
+@Deprecated
public class HessianServlet extends ROPHessianServlet {
private Log logger;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java Tue Jun 12 13:41:57 2012
@@ -58,6 +58,7 @@ public class DeepMergeOperation {
/**
* @deprecated since 3.1 - unused as the object is now stateless
*/
+ @Deprecated
public void reset() {
// noop
}
@@ -65,6 +66,7 @@ public class DeepMergeOperation {
/**
* @deprecated since 3.1 use {@link #merge(Persistent)}.
*/
+ @Deprecated
public Object merge(Object object, ClassDescriptor descriptor) {
if (!(object instanceof Persistent)) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Util.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Util.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Util.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Util.java Tue Jun 12 13:41:57 2012
@@ -130,6 +130,7 @@ public class Util {
*
* @deprecated since 3.1 this method is not used by Cayenne
*/
+ @Deprecated
public static boolean copy(File source, File destination) {
BufferedInputStream fin = null;
BufferedOutputStream fout = null;
@@ -169,6 +170,7 @@ public class Util {
*
* @deprecated since 3.1 this method is not used by Cayenne.
*/
+ @Deprecated
public static boolean copy(URL from, File to) {
BufferedInputStream urlin = null;
BufferedOutputStream fout = null;
@@ -211,6 +213,7 @@ public class Util {
*
* @deprecated since 3.1 this method is unused by Cayenne.
*/
+ @Deprecated
public static void copyPipe(InputStream in, OutputStream out, int bufSizeHint)
throws IOException {
int read = -1;
@@ -227,6 +230,7 @@ public class Util {
*
* @deprecated since 3.1 this method is unused by Cayenne.
*/
+ @Deprecated
public static boolean delete(String filePath, boolean recursive) {
File file = new File(filePath);
if (!file.exists()) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/SerializableEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/SerializableEntity.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/SerializableEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/SerializableEntity.java Tue Jun 12 13:41:57 2012
@@ -37,6 +37,7 @@ import org.w3c.dom.Element;
* implement XML serialization of persistent objects based JAXB, XStream or
* other similar frameworks.
*/
+@Deprecated
class SerializableEntity implements XMLSerializable {
Element descriptor;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLDecoder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLDecoder.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLDecoder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLDecoder.java Tue Jun 12 13:41:57 2012
@@ -52,6 +52,7 @@ import org.xml.sax.InputSource;
* implement XML serialization of persistent objects based JAXB, XStream or
* other similar frameworks.
*/
+@Deprecated
public class XMLDecoder {
static final Map<String, Class<?>> classMapping = new HashMap<String, Class<?>>();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLEncoder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLEncoder.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLEncoder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLEncoder.java Tue Jun 12 13:41:57 2012
@@ -48,6 +48,7 @@ import org.w3c.dom.Node;
* implement XML serialization of persistent objects based JAXB, XStream or
* other similar frameworks.
*/
+@Deprecated
public class XMLEncoder {
private XMLMappingDescriptor mappingDescriptor;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLMappingDescriptor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLMappingDescriptor.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLMappingDescriptor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLMappingDescriptor.java Tue Jun 12 13:41:57 2012
@@ -46,6 +46,7 @@ import org.w3c.dom.NamedNodeMap;
* implement XML serialization of persistent objects based JAXB, XStream or
* other similar frameworks.
*/
+@Deprecated
final class XMLMappingDescriptor {
private SerializableEntity rootEntity;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLSerializable.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLSerializable.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLSerializable.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLSerializable.java Tue Jun 12 13:41:57 2012
@@ -30,6 +30,7 @@ package org.apache.cayenne.xml;
* implement XML serialization of persistent objects based JAXB, XStream or
* other similar frameworks.
*/
+@Deprecated
public interface XMLSerializable {
/**
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLUtil.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLUtil.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLUtil.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLUtil.java Tue Jun 12 13:41:57 2012
@@ -45,6 +45,7 @@ import org.w3c.dom.NodeList;
* implement XML serialization of persistent objects based JAXB, XStream or
* other similar frameworks.
*/
+@Deprecated
class XMLUtil {
// note that per CAY-792, to be locale-safe the format must not contain literal parts
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/MockObjectContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/MockObjectContext.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/MockObjectContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/MockObjectContext.java Tue Jun 12 13:41:57 2012
@@ -56,6 +56,7 @@ public class MockObjectContext implement
/**
* @deprecated since 3.1
*/
+ @Deprecated
public Persistent localObject(ObjectId id, Object prototype) {
return null;
}
@@ -100,6 +101,7 @@ public class MockObjectContext implement
/**
* @deprecated since 3.1
*/
+ @Deprecated
public void deleteObject(Object object) {
}
Modified: cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java Tue Jun 12 13:41:57 2012
@@ -54,6 +54,7 @@ public class NamePatternMatcher {
* @deprecated since 3.0 still used by AntDataPortDelegate, which itself should
* probably be deprecated
*/
+ @Deprecated
List<?> filter(List<?> items) {
if (items == null || items.isEmpty()) {
return items;
@@ -87,6 +88,7 @@ public class NamePatternMatcher {
* @deprecated since 3.0. still used by AntDataPortDelegate, which itself should
* probably be deprecated
*/
+ @Deprecated
private boolean passedIncludeFilter(CayenneMapEntry item) {
if (itemIncludeFilters.length == 0) {
return true;
@@ -108,6 +110,7 @@ public class NamePatternMatcher {
*
* @deprecated since 3.0
*/
+ @Deprecated
private boolean passedExcludeFilter(CayenneMapEntry item) {
if (itemExcludeFilters.length == 0) {
return true;
Modified: cayenne/main/trunk/framework/cayenne-wocompat-unpublished/src/main/java/org/apache/cayenne/wocompat/parser/SimpleCharStream.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-wocompat-unpublished/src/main/java/org/apache/cayenne/wocompat/parser/SimpleCharStream.java?rev=1349347&r1=1349346&r2=1349347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-wocompat-unpublished/src/main/java/org/apache/cayenne/wocompat/parser/SimpleCharStream.java (original)
+++ cayenne/main/trunk/framework/cayenne-wocompat-unpublished/src/main/java/org/apache/cayenne/wocompat/parser/SimpleCharStream.java Tue Jun 12 13:41:57 2012
@@ -218,7 +218,7 @@ public class SimpleCharStream
* @deprecated
* @see #getEndColumn
*/
-
+ @Deprecated
public int getColumn() {
return bufcolumn[bufpos];
}
@@ -227,7 +227,7 @@ public class SimpleCharStream
* @deprecated
* @see #getEndLine
*/
-
+ @Deprecated
public int getLine() {
return bufline[bufpos];
}