Author: markt
Date: Thu Nov 5 01:18:05 2009
New Revision: 832954
URL: http://svn.apache.org/viewvc?rev=832954&view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48132
Patch provided by sebb
Modified:
tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/trunk/java/org/apache/juli/FileHandler.java
tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java
tomcat/trunk/java/org/apache/juli/logging/LogConfigurationException.java
tomcat/trunk/java/org/apache/naming/EjbRef.java
tomcat/trunk/java/org/apache/naming/HandlerRef.java
tomcat/trunk/java/org/apache/naming/NamingEntry.java
tomcat/trunk/java/org/apache/naming/ResourceEnvRef.java
tomcat/trunk/java/org/apache/naming/ResourceLinkRef.java
tomcat/trunk/java/org/apache/naming/ResourceRef.java
tomcat/trunk/java/org/apache/naming/ServiceRef.java
tomcat/trunk/java/org/apache/naming/TransactionRef.java
tomcat/trunk/java/org/apache/naming/resources/CacheEntry.java
tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java
tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java
tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java
Modified: tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java Thu Nov 5 01:18:05
2009
@@ -120,6 +120,7 @@
this.setName("AsyncFileHandlerWriter-"+System.identityHashCode(this));
}
+ @Override
public void run() {
while (run) {
try {
Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Thu Nov 5
01:18:05 2009
@@ -74,6 +74,7 @@
*
* @param logger The logger to be added
*/
+ @Override
public synchronized boolean addLogger(final Logger logger) {
final String loggerName = logger.getName();
@@ -170,6 +171,7 @@
*
* @param name The name of the logger to retrieve
*/
+ @Override
public synchronized Logger getLogger(final String name) {
ClassLoader classLoader = Thread.currentThread()
.getContextClassLoader();
@@ -181,6 +183,7 @@
* Get an enumeration of the logger names currently defined in the
* classloader local configuration.
*/
+ @Override
public synchronized Enumeration<String> getLoggerNames() {
ClassLoader classLoader = Thread.currentThread()
.getContextClassLoader();
@@ -194,6 +197,7 @@
*
* @param name The property name
*/
+ @Override
public String getProperty(String name) {
ClassLoader classLoader = Thread.currentThread()
.getContextClassLoader();
@@ -230,6 +234,7 @@
}
+ @Override
public void readConfiguration()
throws IOException, SecurityException {
@@ -239,6 +244,7 @@
}
+ @Override
public void readConfiguration(InputStream is)
throws IOException, SecurityException {
Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/FileHandler.java Thu Nov 5 01:18:05 2009
@@ -111,6 +111,7 @@
*
* @param record description of the log event
*/
+ @Override
public void publish(LogRecord record) {
if (!isLoggable(record)) {
@@ -161,6 +162,7 @@
/**
* Close the currently open log file (if any).
*/
+ @Override
public void close() {
closeWriter();
}
@@ -185,6 +187,7 @@
/**
* Flush the writer.
*/
+ @Override
public void flush() {
try {
Modified: tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java (original)
+++ tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java Thu Nov 5
01:18:05 2009
@@ -49,6 +49,7 @@
public static final int LOG_LEVEL_ERROR = 1000;
public static final int LOG_LEVEL_FATAL = 1000;
+ @Override
public String format(LogRecord record) {
Throwable t=record.getThrown();
int level=record.getLevel().intValue();
Modified:
tomcat/trunk/java/org/apache/juli/logging/LogConfigurationException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/LogConfigurationException.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/logging/LogConfigurationException.java
(original)
+++ tomcat/trunk/java/org/apache/juli/logging/LogConfigurationException.java
Thu Nov 5 01:18:05 2009
@@ -82,6 +82,7 @@
/**
* Return the underlying cause of this exception (if any).
*/
+ @Override
public Throwable getCause() {
return (this.cause);
Modified: tomcat/trunk/java/org/apache/naming/EjbRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/EjbRef.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/EjbRef.java (original)
+++ tomcat/trunk/java/org/apache/naming/EjbRef.java Thu Nov 5 01:18:05 2009
@@ -117,6 +117,7 @@
* Retrieves the class name of the factory of the object to which this
* reference refers.
*/
+ @Override
public String getFactoryClassName() {
String factory = super.getFactoryClassName();
if (factory != null) {
Modified: tomcat/trunk/java/org/apache/naming/HandlerRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/HandlerRef.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/HandlerRef.java (original)
+++ tomcat/trunk/java/org/apache/naming/HandlerRef.java Thu Nov 5 01:18:05 2009
@@ -136,6 +136,7 @@
* Retrieves the class name of the factory of the object to which this
* reference refers.
*/
+ @Override
public String getFactoryClassName() {
String factory = super.getFactoryClassName();
if (factory != null) {
@@ -157,6 +158,7 @@
/**
* Return a String rendering of this object.
*/
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder("HandlerRef[");
Modified: tomcat/trunk/java/org/apache/naming/NamingEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingEntry.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/NamingEntry.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingEntry.java Thu Nov 5 01:18:05
2009
@@ -64,6 +64,7 @@
// --------------------------------------------------------- Object Methods
+ @Override
public boolean equals(Object obj) {
if ((obj != null) && (obj instanceof NamingEntry)) {
return name.equals(((NamingEntry) obj).name);
@@ -73,6 +74,7 @@
}
+ @Override
public int hashCode() {
return name.hashCode();
}
Modified: tomcat/trunk/java/org/apache/naming/ResourceEnvRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/ResourceEnvRef.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/ResourceEnvRef.java (original)
+++ tomcat/trunk/java/org/apache/naming/ResourceEnvRef.java Thu Nov 5 01:18:05
2009
@@ -78,6 +78,7 @@
* Retrieves the class name of the factory of the object to which this
* reference refers.
*/
+ @Override
public String getFactoryClassName() {
String factory = super.getFactoryClassName();
if (factory != null) {
Modified: tomcat/trunk/java/org/apache/naming/ResourceLinkRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/ResourceLinkRef.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/ResourceLinkRef.java (original)
+++ tomcat/trunk/java/org/apache/naming/ResourceLinkRef.java Thu Nov 5
01:18:05 2009
@@ -90,6 +90,7 @@
* Retrieves the class name of the factory of the object to which this
* reference refers.
*/
+ @Override
public String getFactoryClassName() {
String factory = super.getFactoryClassName();
if (factory != null) {
Modified: tomcat/trunk/java/org/apache/naming/ResourceRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/ResourceRef.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/ResourceRef.java (original)
+++ tomcat/trunk/java/org/apache/naming/ResourceRef.java Thu Nov 5 01:18:05
2009
@@ -117,6 +117,7 @@
* Retrieves the class name of the factory of the object to which this
* reference refers.
*/
+ @Override
public String getFactoryClassName() {
String factory = super.getFactoryClassName();
if (factory != null) {
@@ -138,6 +139,7 @@
/**
* Return a String rendering of this object.
*/
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder("ResourceRef[");
Modified: tomcat/trunk/java/org/apache/naming/ServiceRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/ServiceRef.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/ServiceRef.java (original)
+++ tomcat/trunk/java/org/apache/naming/ServiceRef.java Thu Nov 5 01:18:05 2009
@@ -165,6 +165,7 @@
* Retrieves the class name of the factory of the object to which this
* reference refers.
*/
+ @Override
public String getFactoryClassName() {
String factory = super.getFactoryClassName();
if (factory != null) {
@@ -186,6 +187,7 @@
/**
* Return a String rendering of this object.
*/
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder("ServiceRef[");
Modified: tomcat/trunk/java/org/apache/naming/TransactionRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/TransactionRef.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/TransactionRef.java (original)
+++ tomcat/trunk/java/org/apache/naming/TransactionRef.java Thu Nov 5 01:18:05
2009
@@ -74,6 +74,7 @@
* Retrieves the class name of the factory of the object to which this
* reference refers.
*/
+ @Override
public String getFactoryClassName() {
String factory = super.getFactoryClassName();
if (factory != null) {
Modified: tomcat/trunk/java/org/apache/naming/resources/CacheEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/CacheEntry.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/CacheEntry.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/CacheEntry.java Thu Nov 5
01:18:05 2009
@@ -56,6 +56,7 @@
}
+ @Override
public String toString() {
return ("Cache entry: " + name + "\n"
+ "Exists: " + exists + "\n"
Modified:
tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
Thu Nov 5 01:18:05 2009
@@ -127,6 +127,7 @@
*
* @throws IOException Object not found
*/
+ @Override
public void connect()
throws IOException {
@@ -173,6 +174,7 @@
/**
* Return the content length value.
*/
+ @Override
public int getContentLength() {
return getHeaderFieldInt(ResourceAttributes.CONTENT_LENGTH, -1);
}
@@ -181,6 +183,7 @@
/**
* Return the content type value.
*/
+ @Override
public String getContentType() {
return getHeaderField(ResourceAttributes.CONTENT_TYPE);
}
@@ -189,6 +192,7 @@
/**
* Return the last modified date.
*/
+ @Override
public long getDate() {
return date;
}
@@ -197,6 +201,7 @@
/**
* Return the last modified date.
*/
+ @Override
public long getLastModified() {
if (!connected) {
@@ -239,6 +244,7 @@
/**
* Returns an unmodifiable Map of the header fields.
*/
+ @Override
public Map<String,List<String>> getHeaderFields() {
if (!connected) {
@@ -282,6 +288,7 @@
/**
* Returns the name of the specified header field.
*/
+ @Override
public String getHeaderField(String name) {
if (!connected) {
@@ -318,6 +325,7 @@
/**
* Get object content.
*/
+ @Override
public Object getContent()
throws IOException {
@@ -339,6 +347,7 @@
/**
* Get object content.
*/
+ @Override
public Object getContent(Class[] classes)
throws IOException {
@@ -357,6 +366,7 @@
/**
* Get input stream.
*/
+ @Override
public InputStream getInputStream()
throws IOException {
@@ -381,6 +391,7 @@
/**
* Get the Permission for this URL
*/
+ @Override
public Permission getPermission() {
return permission;
Modified:
tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java
(original)
+++
tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java
Thu Nov 5 01:18:05 2009
@@ -83,6 +83,7 @@
* Opens a connection to the object referenced by the <code>URL</code>
* argument.
*/
+ @Override
protected URLConnection openConnection(URL u)
throws IOException {
DirContext currentContext = this.context;
@@ -98,6 +99,7 @@
/**
* Override as part of the fix for 36534, to ensure toString is correct.
*/
+ @Override
protected String toExternalForm(URL u) {
// pre-compute length of StringBuilder
int len = u.getProtocol().length() + 1;
Modified: tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Thu Nov
5 01:18:05 2009
@@ -119,6 +119,7 @@
* @exception IllegalArgumentException if this would create a
* malformed URL
*/
+ @Override
public void setDocBase(String docBase) {
// Validate the format of the proposed document root
@@ -166,6 +167,7 @@
/**
* Release any resources allocated for this directory context.
*/
+ @Override
public void release() {
super.release();
}
@@ -177,6 +179,7 @@
*
* @param path The path to the desired resource
*/
+ @Override
protected String doGetRealPath(String path) {
File file = new File(getDocBase(), path);
return file.getAbsolutePath();
@@ -192,6 +195,7 @@
* @return the object bound to name
* @exception NamingException if a naming exception is encountered
*/
+ @Override
protected Object doLookup(String name)
throws NamingException {
Object result = null;
@@ -229,6 +233,7 @@
* exist
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public void unbind(String name)
throws NamingException {
@@ -256,6 +261,7 @@
* @exception NameAlreadyBoundException if newName is already bound
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public void rename(String oldName, String newName)
throws NamingException {
@@ -285,6 +291,7 @@
* this context. Each element of the enumeration is of type NameClassPair.
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public NamingEnumeration<NameClassPair> list(String name)
throws NamingException {
@@ -312,6 +319,7 @@
* Each element of the enumeration is of type Binding.
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public NamingEnumeration<Binding> listBindings(String name)
throws NamingException {
@@ -352,6 +360,7 @@
* @exception NotContextException if the name is bound but does not name
* a context, or does not name a context of the appropriate type
*/
+ @Override
public void destroySubcontext(String name)
throws NamingException {
unbind(name);
@@ -368,6 +377,7 @@
* (if any).
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public Object lookupLink(String name)
throws NamingException {
// Note : Links are not supported
@@ -392,6 +402,7 @@
* not have the notion of a full name
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public String getNameInNamespace()
throws NamingException {
return docBase;
@@ -413,6 +424,7 @@
* indicates that none should be retrieved
* @exception NamingException if a naming exception is encountered
*/
+ @Override
protected Attributes doGetAttributes(String name, String[] attrIds)
throws NamingException {
@@ -442,6 +454,7 @@
* completed successfully
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public void modifyAttributes(String name, int mod_op, Attributes attrs)
throws NamingException {
@@ -462,6 +475,7 @@
* completed successfully
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public void modifyAttributes(String name, ModificationItem[] mods)
throws NamingException {
@@ -483,6 +497,7 @@
* of the binding are not supplied
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public void bind(String name, Object obj, Attributes attrs)
throws NamingException {
@@ -516,6 +531,7 @@
* of the binding are not supplied
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public void rebind(String name, Object obj, Attributes attrs)
throws NamingException {
@@ -592,6 +608,7 @@
* the mandatory attributes required for creation
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public DirContext createSubcontext(String name, Attributes attrs)
throws NamingException {
@@ -620,6 +637,7 @@
* @exception OperationNotSupportedException if schema not supported
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public DirContext getSchema(String name)
throws NamingException {
throw new OperationNotSupportedException();
@@ -637,6 +655,7 @@
* @exception OperationNotSupportedException if schema not supported
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public DirContext getSchemaClassDefinition(String name)
throws NamingException {
throw new OperationNotSupportedException();
@@ -660,6 +679,7 @@
* context named by name.
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public NamingEnumeration<SearchResult> search(String name,
Attributes matchingAttributes, String[] attributesToReturn)
throws NamingException {
@@ -682,6 +702,7 @@
* context named by name.
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public NamingEnumeration<SearchResult> search(String name,
Attributes matchingAttributes) throws NamingException {
return null;
@@ -707,6 +728,7 @@
* contain invalid settings
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public NamingEnumeration<SearchResult> search(String name, String filter,
SearchControls cons)
throws NamingException {
@@ -738,6 +760,7 @@
* represents an invalid search filter
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public NamingEnumeration<SearchResult> search(String name,
String filterExpr, Object[] filterArgs, SearchControls cons)
throws NamingException {
@@ -906,6 +929,7 @@
*
* @return InputStream
*/
+ @Override
public InputStream streamContent()
throws IOException {
if (binaryContent == null) {
@@ -956,6 +980,7 @@
/**
* Is collection.
*/
+ @Override
public boolean isCollection() {
if (!accessed) {
collection = file.isDirectory();
@@ -970,6 +995,7 @@
*
* @return content length value
*/
+ @Override
public long getContentLength() {
if (contentLength != -1L)
return contentLength;
@@ -983,6 +1009,7 @@
*
* @return creation time value
*/
+ @Override
public long getCreation() {
if (creation != -1L)
return creation;
@@ -996,6 +1023,7 @@
*
* @return Creation date value
*/
+ @Override
public Date getCreationDate() {
if (creation == -1L) {
creation = getCreation();
@@ -1009,6 +1037,7 @@
*
* @return lastModified time value
*/
+ @Override
public long getLastModified() {
if (lastModified != -1L)
return lastModified;
@@ -1022,6 +1051,7 @@
*
* @return LastModified date value
*/
+ @Override
public Date getLastModifiedDate() {
if (lastModified == -1L) {
lastModified = getLastModified();
@@ -1035,6 +1065,7 @@
*
* @return Name value
*/
+ @Override
public String getName() {
if (name == null)
name = file.getName();
@@ -1047,6 +1078,7 @@
*
* @return String resource type
*/
+ @Override
public String getResourceType() {
if (!accessed) {
collection = file.isDirectory();
@@ -1061,6 +1093,7 @@
*
* @return String the file's canonical path
*/
+ @Override
public String getCanonicalPath() {
if (canonicalPath == null) {
try {
Modified:
tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java
(original)
+++
tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java
Thu Nov 5 01:18:05 2009
@@ -31,10 +31,14 @@
public class ImmutableNameNotFoundException
extends NameNotFoundException {
+ @Override
public void appendRemainingComponent(String name) {}
+ @Override
public void appendRemainingName(Name name) {}
+ @Override
public void setRemainingName(Name name) {}
public void setResolverName(Name name) {}
+ @Override
public void setRootCause(Throwable e) {}
}
Modified: tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java Thu
Nov 5 01:18:05 2009
@@ -976,6 +976,7 @@
/**
* Clone the attributes object (WARNING: fake cloning).
*/
+ @Override
public Object clone() {
return this;
}
Modified: tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java?rev=832954&r1=832953&r2=832954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java Thu Nov 5
01:18:05 2009
@@ -115,6 +115,7 @@
* @exception IllegalArgumentException if this would create a
* malformed URL
*/
+ @Override
public void setDocBase(String docBase) {
// Validate the format of the proposed document root
@@ -151,6 +152,7 @@
/**
* Release any resources allocated for this directory context.
*/
+ @Override
public void release() {
entries = null;
@@ -173,6 +175,7 @@
*
* @param path The path to the desired resource
*/
+ @Override
protected String doGetRealPath(String path) {
return null;
}
@@ -188,6 +191,7 @@
* @return the object bound to name
* @exception NamingException if a naming exception is encountered
*/
+ @Override
protected Object doLookup(String name)
throws NamingException {
return lookup(new CompositeName(name));
@@ -204,6 +208,7 @@
* @return the object bound to name
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public Object lookup(Name name)
throws NamingException {
if (name.isEmpty())
@@ -234,6 +239,7 @@
* exist
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public void unbind(String name)
throws NamingException {
throw new OperationNotSupportedException();
@@ -251,6 +257,7 @@
* @exception NameAlreadyBoundException if newName is already bound
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public void rename(String oldName, String newName)
throws NamingException {
throw new OperationNotSupportedException();
@@ -270,6 +277,7 @@
* this context. Each element of the enumeration is of type NameClassPair.
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public NamingEnumeration<NameClassPair> list(String name)
throws NamingException {
return list(new CompositeName(name));
@@ -289,6 +297,7 @@
* this context. Each element of the enumeration is of type NameClassPair.
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public NamingEnumeration<NameClassPair> list(Name name)
throws NamingException {
if (name.isEmpty())
@@ -314,6 +323,7 @@
* Each element of the enumeration is of type Binding.
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public NamingEnumeration<Binding> listBindings(String name)
throws NamingException {
return listBindings(new CompositeName(name));
@@ -333,6 +343,7 @@
* Each element of the enumeration is of type Binding.
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public NamingEnumeration<Binding> listBindings(Name name)
throws NamingException {
if (name.isEmpty())
@@ -372,6 +383,7 @@
* @exception NotContextException if the name is bound but does not name
* a context, or does not name a context of the appropriate type
*/
+ @Override
public void destroySubcontext(String name)
throws NamingException {
throw new OperationNotSupportedException();
@@ -388,6 +400,7 @@
* (if any).
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public Object lookupLink(String name)
throws NamingException {
// Note : Links are not supported
@@ -412,6 +425,7 @@
* not have the notion of a full name
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public String getNameInNamespace()
throws NamingException {
return docBase;
@@ -433,6 +447,7 @@
* indicates that none should be retrieved
* @exception NamingException if a naming exception is encountered
*/
+ @Override
protected Attributes doGetAttributes(String name, String[] attrIds)
throws NamingException {
return getAttributes(new CompositeName(name), attrIds);
@@ -447,6 +462,7 @@
* @param name the name of the object from which to retrieve attributes
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public Attributes getAttributes(Name name, String[] attrIds)
throws NamingException {
@@ -488,6 +504,7 @@
* completed successfully
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public void modifyAttributes(String name, int mod_op, Attributes attrs)
throws NamingException {
throw new OperationNotSupportedException();
@@ -508,6 +525,7 @@
* completed successfully
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public void modifyAttributes(String name, ModificationItem[] mods)
throws NamingException {
throw new OperationNotSupportedException();
@@ -529,6 +547,7 @@
* of the binding are not supplied
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public void bind(String name, Object obj, Attributes attrs)
throws NamingException {
throw new OperationNotSupportedException();
@@ -553,6 +572,7 @@
* of the binding are not supplied
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public void rebind(String name, Object obj, Attributes attrs)
throws NamingException {
throw new OperationNotSupportedException();
@@ -576,6 +596,7 @@
* the mandatory attributes required for creation
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public DirContext createSubcontext(String name, Attributes attrs)
throws NamingException {
throw new OperationNotSupportedException();
@@ -595,6 +616,7 @@
* @exception OperationNotSupportedException if schema not supported
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public DirContext getSchema(String name)
throws NamingException {
throw new OperationNotSupportedException();
@@ -612,6 +634,7 @@
* @exception OperationNotSupportedException if schema not supported
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public DirContext getSchemaClassDefinition(String name)
throws NamingException {
throw new OperationNotSupportedException();
@@ -635,6 +658,7 @@
* context named by name.
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public NamingEnumeration<SearchResult> search(String name,
Attributes matchingAttributes, String[] attributesToReturn)
throws NamingException {
@@ -657,6 +681,7 @@
* context named by name.
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public NamingEnumeration<SearchResult> search(String name,
Attributes matchingAttributes) throws NamingException {
throw new OperationNotSupportedException();
@@ -682,6 +707,7 @@
* contain invalid settings
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public NamingEnumeration<SearchResult> search(String name, String filter,
SearchControls cons)
throws NamingException {
@@ -713,6 +739,7 @@
* represents an invalid search filter
* @exception NamingException if a naming exception is encountered
*/
+ @Override
public NamingEnumeration<SearchResult> search(String name, String
filterExpr,
Object[] filterArgs, SearchControls cons)
throws NamingException {
@@ -947,6 +974,7 @@
*
* @return InputStream
*/
+ @Override
public InputStream streamContent()
throws IOException {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
