Derek Hulley 138d1780cb Merged V2.0 to HEAD
5456: (From WCM_DEPLOY)

There were many pure conflicts on license headers, one conflict due to CR-LF and
some other smaller issues to resolve:
-----------------------------------------
Resolved (line endings not cr-lf):
   root\projects\repository\config\alfresco\public-services-context.xml

Reverted:
   root\projects\web-client\source\web\images\icons\ajax_anim.gif

Reverted or Resolved (License text conflicts):
   svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\JndiTest.java
   svn resolved root\projects\jndi-client\source\java\org\alfresco\jndi\AVMFileDirContext.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\AVMBulkLoader.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilter.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilterInfoBean.java
   svn revert -R root\projects\catalina-virtual\source\java\org\alfresco\mbeans
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\context\AVMStandardContext.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappClassLoader.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappLoader.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMResourceBinding.java
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostConfig.java
      - why the change in method naming convention?
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHost.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\DefaultAVMResourceBinding.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValveTest.java
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValve.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostMatch.java

Modified:
   root\projects\web-client\source\java\org\alfresco\web\ui\wcm\component\UIDeployWebsite.java (Kevin to check line 330)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-12 01:41:14 +00:00

129 lines
3.7 KiB
Java

/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing" */
package org.alfresco.repo.remote;
import java.io.IOException;
import java.io.InputStream;
import org.alfresco.service.cmr.remote.AVMRemoteTransport;
/**
* Wrapper around AVMRemote stream reading.
* @author britt
*/
public class AVMRemoteInputStream extends InputStream
{
/**
* The AVMRemote reference.
*/
private AVMRemoteTransport fAVMRemote;
/**
* The client ticket holder.
*/
private ClientTicketHolder fTicketHolder;
/**
* The handle to the input stream.
*/
private String fHandle;
/**
* Construct one.
* @param handle The handle returned by getInputStream();
* @param remote The AVMRemote instance.
*/
public AVMRemoteInputStream(String handle, AVMRemoteTransport remote,
ClientTicketHolder ticketHolder)
{
fHandle = handle;
fAVMRemote = remote;
fTicketHolder = ticketHolder;
}
/**
* Read in a single byte.
* @return The byte as 0-255 or -1 for eof.
*/
@Override
public int read() throws IOException
{
try
{
byte [] buff = fAVMRemote.readInput(fTicketHolder.getTicket(), fHandle, 1);
if (buff.length == 0)
{
return -1;
}
return ((int)buff[0]) & 0xff;
}
catch (Exception e)
{
throw new IOException("Remote I/O Error.");
}
}
/**
* Read a buffer of bytes.
* @param b The buffer into which to put the bytes.
* @param off The offset into the buffer.
* @param len The number of bytes to read.
* @return The actual number of bytes read or -1 on eof.
*/
@Override
public int read(byte[] b, int off, int len) throws IOException
{
try
{
byte [] buff = fAVMRemote.readInput(fTicketHolder.getTicket(), fHandle, len);
if (buff.length == 0)
{
return -1;
}
System.arraycopy(buff, 0, b, off, buff.length);
return buff.length;
}
catch (Exception e)
{
throw new IOException("Remote I/O Error.");
}
}
/**
* Close the underlying AVMRemote handle.
*/
@Override
public void close() throws IOException
{
try
{
fAVMRemote.closeInputHandle(fTicketHolder.getTicket(), fHandle);
}
catch (Exception e)
{
throw new IOException("Remote Error closing input stream.");
}
}
}