jakarta-jcs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r536904 [4/38] - in /jakarta/jcs/trunk: ./ auxiliary-builds/javagroups/ auxiliary-builds/javagroups/src/java/org/apache/jcs/auxiliary/javagroups/ auxiliary-builds/javagroups/src/test/org/apache/jcs/auxiliary/javagroups/ auxiliary-builds/jdk...
Date Thu, 10 May 2007 16:04:27 GMT
Modified: jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGReceiverConnection.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGReceiverConnection.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGReceiverConnection.java (original)
+++ jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGReceiverConnection.java Thu May 10 09:03:42 2007
@@ -1,139 +1,142 @@
-package org.apache.jcs.auxiliary.lateral.javagroups;
-
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.Serializable;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.jcs.auxiliary.lateral.LateralCacheInfo;
-import org.apache.jcs.auxiliary.lateral.LateralElementDescriptor;
-import org.apache.jcs.auxiliary.lateral.javagroups.behavior.ILateralCacheJGListener;
-import org.jgroups.Message;
-
-/**
- * Separate thread run when a command comes into the LateralJGReceiver.
- * 
- * @version $Id: LateralJGReceiverConnection.java,v 1.7 2002/02/15 04:33:37
- *          jtaylor Exp $
- */
-public class LateralJGReceiverConnection
-    implements Runnable
-{
-
-    private final static Log log = LogFactory.getLog( LateralJGReceiverConnection.class );
-
-    //private Channel javagroups;
-    private Message mes;
-
-    private ILateralCacheJGListener ilcl;
-
-    /**
-     * Constructor for the LateralJGReceiverConnection object
-     * 
-     * @param mes
-     *            The JGroups message
-     * @param ilcl
-     */
-    public LateralJGReceiverConnection( Message mes, ILateralCacheJGListener ilcl )
-    {
-        this.ilcl = ilcl;
-        this.mes = mes;
-    }
-
-    /**
-     * Main processing method for the LateralJGReceiverConnection object
-     * 
-     * @return
-     * @param led
-     */
-    public void run()
-    {
-        Object obj = null;
-        try
-        {
-            obj = mes.getObject();
-            LateralElementDescriptor led = (LateralElementDescriptor)obj;
-            if ( led == null )
-            {
-                log.warn( "LateralElementDescriptor is null! Can't do anything." );
-            }
-            else
-            {
-                if ( led.requesterId == LateralCacheInfo.listenerId )
-                {
-                    log.debug( "from self" );
-                }
-                else
-                {
-                    if ( log.isDebugEnabled() )
-                    {
-                        log.debug( "receiving LateralElementDescriptor from another, led = " + ", led = " + led
-                            + ", led.command = " + led.command + ", led.ce = " + led.ce + ", ilcl = " + ilcl );
-                    }
-                    if ( led.command == LateralElementDescriptor.UPDATE )
-                    {
-                        ilcl.handlePut( led.ce );
-                    }
-                    else if ( led.command == LateralElementDescriptor.REMOVE )
-                    {
-                        ilcl.handleRemove( led.ce.getCacheName(), led.ce.getKey() );
-                    }
-                    else if ( led.command == LateralElementDescriptor.GET )
-                    {
-                        /* Serializable obj = */getAndRespond( led.ce.getCacheName(), led.ce.getKey() );
-
-                    }
-                }
-            }
-
-        }
-        catch ( java.io.EOFException e )
-        {
-            log.info( "Caught java.io.EOFException closing connection." );
-        }
-        catch ( java.net.SocketException e )
-        {
-            log.info( "Caught java.net.SocketException closing connection." );
-        }
-        catch ( Exception e )
-        {
-            log.error( "Unexpected exception. obj = " + obj, e );
-        }
-    }
-
-    /**
-     * Send back the object if found.
-     * 
-     * @return The {3} value
-     * @param cacheName
-     * @param key
-     * @exception Exception
-     */
-    private Serializable getAndRespond( String cacheName, Serializable key )
-        throws Exception
-    {
-        Serializable obj = ilcl.handleGet( cacheName, key );
-
-        if ( log.isDebugEnabled() )
-        {
-            log.debug( "obj = " + obj );
-        }
-
-        return obj;
-    }
-}
+package org.apache.jcs.auxiliary.lateral.javagroups;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.Serializable;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jcs.auxiliary.lateral.LateralCacheInfo;
+import org.apache.jcs.auxiliary.lateral.LateralElementDescriptor;
+import org.apache.jcs.auxiliary.lateral.javagroups.behavior.ILateralCacheJGListener;
+import org.jgroups.Message;
+
+/**
+ * Separate thread run when a command comes into the LateralJGReceiver.
+ *
+ * @version $Id: LateralJGReceiverConnection.java,v 1.7 2002/02/15 04:33:37
+ *          jtaylor Exp $
+ */
+public class LateralJGReceiverConnection
+    implements Runnable
+{
+
+    private final static Log log = LogFactory.getLog( LateralJGReceiverConnection.class );
+
+    //private Channel javagroups;
+    private Message mes;
+
+    private ILateralCacheJGListener ilcl;
+
+    /**
+     * Constructor for the LateralJGReceiverConnection object
+     *
+     * @param mes
+     *            The JGroups message
+     * @param ilcl
+     */
+    public LateralJGReceiverConnection( Message mes, ILateralCacheJGListener ilcl )
+    {
+        this.ilcl = ilcl;
+        this.mes = mes;
+    }
+
+    /**
+     * Main processing method for the LateralJGReceiverConnection object
+     *
+     * @return
+     * @param led
+     */
+    public void run()
+    {
+        Object obj = null;
+        try
+        {
+            obj = mes.getObject();
+            LateralElementDescriptor led = (LateralElementDescriptor)obj;
+            if ( led == null )
+            {
+                log.warn( "LateralElementDescriptor is null! Can't do anything." );
+            }
+            else
+            {
+                if ( led.requesterId == LateralCacheInfo.listenerId )
+                {
+                    log.debug( "from self" );
+                }
+                else
+                {
+                    if ( log.isDebugEnabled() )
+                    {
+                        log.debug( "receiving LateralElementDescriptor from another, led = " + ", led = " + led
+                            + ", led.command = " + led.command + ", led.ce = " + led.ce + ", ilcl = " + ilcl );
+                    }
+                    if ( led.command == LateralElementDescriptor.UPDATE )
+                    {
+                        ilcl.handlePut( led.ce );
+                    }
+                    else if ( led.command == LateralElementDescriptor.REMOVE )
+                    {
+                        ilcl.handleRemove( led.ce.getCacheName(), led.ce.getKey() );
+                    }
+                    else if ( led.command == LateralElementDescriptor.GET )
+                    {
+                        /* Serializable obj = */getAndRespond( led.ce.getCacheName(), led.ce.getKey() );
+
+                    }
+                }
+            }
+
+        }
+        catch ( java.io.EOFException e )
+        {
+            log.info( "Caught java.io.EOFException closing connection." );
+        }
+        catch ( java.net.SocketException e )
+        {
+            log.info( "Caught java.net.SocketException closing connection." );
+        }
+        catch ( Exception e )
+        {
+            log.error( "Unexpected exception. obj = " + obj, e );
+        }
+    }
+
+    /**
+     * Send back the object if found.
+     *
+     * @return The {3} value
+     * @param cacheName
+     * @param key
+     * @exception Exception
+     */
+    private Serializable getAndRespond( String cacheName, Serializable key )
+        throws Exception
+    {
+        Serializable obj = ilcl.handleGet( cacheName, key );
+
+        if ( log.isDebugEnabled() )
+        {
+            log.debug( "obj = " + obj );
+        }
+
+        return obj;
+    }
+}

Modified: jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGSender.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGSender.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGSender.java (original)
+++ jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGSender.java Thu May 10 09:03:42 2007
@@ -1,309 +1,312 @@
-package org.apache.jcs.auxiliary.lateral.javagroups;
-
-/*
- * Copyright 2002-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.jcs.auxiliary.lateral.LateralCacheInfo;
-import org.apache.jcs.auxiliary.lateral.LateralElementDescriptor;
-import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheAttributes;
-import org.apache.jcs.auxiliary.lateral.javagroups.behavior.IJGConstants;
-import org.apache.jcs.engine.CacheElement;
-import org.apache.jcs.engine.behavior.ICacheElement;
-import org.jgroups.Channel;
-import org.jgroups.Message;
-import org.jgroups.blocks.GroupRequest;
-import org.jgroups.blocks.MethodCall;
-import org.jgroups.blocks.RpcDispatcher;
-import org.jgroups.util.RspList;
-
-/**
- * This class is based on the log4j SocketAppender class. I'm using a differnet
- * repair structure, so it is significant;y different.
- * 
- * @version $Id: LateralJGSender.java 240226 2005-08-26 12:47:59Z asmuts $
- */
-public class LateralJGSender
-    implements IJGConstants
-{
-    private final static Log log = LogFactory.getLog( LateralJGSender.class );
-
-    private ILateralCacheAttributes ilca;
-
-    int port = 1111;
-
-    private Channel javagroups;
-
-    private RpcDispatcher disp;
-
-    private JGConnectionHolder holder;
-
-    int counter = 0;
-
-    /**
-     * Constructor for the LateralJGSender object
-     * 
-     * @param lca
-     * @exception IOException
-     */
-    public LateralJGSender( ILateralCacheAttributes lca )
-        throws IOException
-    {
-        this.ilca = lca;
-        init();
-    }
-
-    /**
-     * Create holder.
-     * 
-     * @exception IOException
-     */
-    protected void init()
-        throws IOException
-    {
-
-        try
-        {
-            log.debug( "Attempting ccreate channel." );
-
-            holder = JGConnectionHolder.getInstance( ilca );
-            javagroups = holder.getChannel();
-
-            if ( javagroups == null )
-            {
-                throw new IOException( "javagroups is null" );
-            }
-
-        }
-        catch ( java.net.ConnectException e )
-        {
-            log.debug( "Remote host refused connection." );
-            throw e;
-        }
-        catch ( Exception e )
-        {
-            log.debug( "Could not connect to channel.", e );
-            throw new IOException( e.getMessage() );
-        }
-
-    }
-
-    // end constructor
-
-    /**
-     * Sends commands to the lateral cache listener.
-     * 
-     * @param led
-     * @exception IOException
-     */
-    public void send( LateralElementDescriptor led )
-        throws IOException
-    {
-        log.debug( "sending LateralElementDescriptor" );
-
-        if ( led == null )
-        {
-            return;
-        }
-
-        try
-        {
-
-            Message send_msg = new Message( null, null, led );
-
-            javagroups.send( send_msg );
-
-        }
-        catch ( Exception e )
-        {
-            log.error( "Detected problem with connection: " + e );
-            throw new IOException( e.getMessage() );
-        }
-
-    }
-
-    /**
-     * Sends commands to the lateral cache listener and gets a response.
-     * 
-     * @return
-     * @param led
-     * @exception IOException
-     */
-    public ICacheElement sendAndReceive( LateralElementDescriptor led )
-        throws IOException
-    {
-        ICacheElement ice = null;
-
-        log.debug( "SendAndReceive led" );
-
-        if ( led == null )
-        {
-            return null;
-        }
-
-        try
-        {
-
-            try
-            {
-
-                disp = holder.getDispatcher();
-                Object[] args = { led.ce.getCacheName(), led.ce.getKey() };
-                String[] sigs = { java.lang.String.class.getName(), java.io.Serializable.class.getName() };
-                MethodCall meth = new MethodCall( "handleGet", args, sigs );
-                RspList rsp_list = disp.callRemoteMethods( null, meth, GroupRequest.GET_ALL, 1000 );
-
-                log.debug( "rsp_list = " + rsp_list );
-                Vector vec = rsp_list.getResults();
-                log.debug( "rsp_list size = " + vec.size() );
-                Iterator it = vec.iterator();
-
-                while ( it.hasNext() )
-                {
-                    ice = (ICacheElement) it.next();
-                    if ( ice != null )
-                    {
-                        break;
-                    }
-                }
-
-            }
-            catch ( Exception e )
-            {
-                log.error( e );
-            }
-
-        }
-        catch ( Exception e )
-        {
-            log.error( "Detected problem with connection.", e );
-            throw new IOException( e.getMessage() );
-        }
-        //        }
-        return ice;
-    }// end sendAndReceive
-
-    // Service Methods //
-    /**
-     * Description of the Method
-     * 
-     * @param item
-     * @param requesterId
-     * @exception IOException
-     */
-    public void update( ICacheElement item, long requesterId )
-        throws IOException
-    {
-        LateralElementDescriptor led = new LateralElementDescriptor( item );
-        led.requesterId = requesterId;
-        led.command = LateralElementDescriptor.UPDATE;
-        send( led );
-    }
-
-    /**
-     * Description of the Method
-     * 
-     * @param cacheName
-     * @param key
-     * @exception IOException
-     */
-    public void remove( String cacheName, Serializable key )
-        throws IOException
-    {
-        remove( cacheName, key, LateralCacheInfo.listenerId );
-    }
-
-    /**
-     * Description of the Method
-     * 
-     * @param cacheName
-     * @param key
-     * @param requesterId
-     * @exception IOException
-     */
-    public void remove( String cacheName, Serializable key, long requesterId )
-        throws IOException
-    {
-        CacheElement ce = new CacheElement( cacheName, key, null );
-        LateralElementDescriptor led = new LateralElementDescriptor( ce );
-        led.requesterId = requesterId;
-        led.command = LateralElementDescriptor.REMOVE;
-        send( led );
-    }
-
-    /**
-     * Description of the Method
-     * 
-     * @exception IOException
-     */
-    public void release()
-        throws IOException
-    {
-        // nothing needs to be done
-    }
-
-    /**
-     * Closes connection used by all LateralJGSenders for this lateral
-     * conneciton. Dispose request should come into the facade and be sent to
-     * all lateral cache sevices. The lateral cache service will then call this
-     * method.
-     * 
-     * @param cache
-     * @exception IOException
-     */
-    public void dispose( String cache )
-        throws IOException
-    {
-
-    }
-
-    /**
-     * Description of the Method
-     * 
-     * @param cacheName
-     * @exception IOException
-     */
-    public void removeAll( String cacheName )
-        throws IOException
-    {
-        removeAll( cacheName, LateralCacheInfo.listenerId );
-    }
-
-    /**
-     * Description of the Method
-     * 
-     * @param cacheName
-     * @param requesterId
-     * @exception IOException
-     */
-    public void removeAll( String cacheName, long requesterId )
-        throws IOException
-    {
-        CacheElement ce = new CacheElement( cacheName, "ALL", null );
-        LateralElementDescriptor led = new LateralElementDescriptor( ce );
-        led.requesterId = requesterId;
-        led.command = LateralElementDescriptor.REMOVEALL;
-        send( led );
-    }
-
-}
-// end class
+package org.apache.jcs.auxiliary.lateral.javagroups;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.Vector;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jcs.auxiliary.lateral.LateralCacheInfo;
+import org.apache.jcs.auxiliary.lateral.LateralElementDescriptor;
+import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheAttributes;
+import org.apache.jcs.auxiliary.lateral.javagroups.behavior.IJGConstants;
+import org.apache.jcs.engine.CacheElement;
+import org.apache.jcs.engine.behavior.ICacheElement;
+import org.jgroups.Channel;
+import org.jgroups.Message;
+import org.jgroups.blocks.GroupRequest;
+import org.jgroups.blocks.MethodCall;
+import org.jgroups.blocks.RpcDispatcher;
+import org.jgroups.util.RspList;
+
+/**
+ * This class is based on the log4j SocketAppender class. I'm using a differnet
+ * repair structure, so it is significant;y different.
+ *
+ * @version $Id: LateralJGSender.java 240226 2005-08-26 12:47:59Z asmuts $
+ */
+public class LateralJGSender
+    implements IJGConstants
+{
+    private final static Log log = LogFactory.getLog( LateralJGSender.class );
+
+    private ILateralCacheAttributes ilca;
+
+    int port = 1111;
+
+    private Channel javagroups;
+
+    private RpcDispatcher disp;
+
+    private JGConnectionHolder holder;
+
+    int counter = 0;
+
+    /**
+     * Constructor for the LateralJGSender object
+     *
+     * @param lca
+     * @exception IOException
+     */
+    public LateralJGSender( ILateralCacheAttributes lca )
+        throws IOException
+    {
+        this.ilca = lca;
+        init();
+    }
+
+    /**
+     * Create holder.
+     *
+     * @exception IOException
+     */
+    protected void init()
+        throws IOException
+    {
+
+        try
+        {
+            log.debug( "Attempting ccreate channel." );
+
+            holder = JGConnectionHolder.getInstance( ilca );
+            javagroups = holder.getChannel();
+
+            if ( javagroups == null )
+            {
+                throw new IOException( "javagroups is null" );
+            }
+
+        }
+        catch ( java.net.ConnectException e )
+        {
+            log.debug( "Remote host refused connection." );
+            throw e;
+        }
+        catch ( Exception e )
+        {
+            log.debug( "Could not connect to channel.", e );
+            throw new IOException( e.getMessage() );
+        }
+
+    }
+
+    // end constructor
+
+    /**
+     * Sends commands to the lateral cache listener.
+     *
+     * @param led
+     * @exception IOException
+     */
+    public void send( LateralElementDescriptor led )
+        throws IOException
+    {
+        log.debug( "sending LateralElementDescriptor" );
+
+        if ( led == null )
+        {
+            return;
+        }
+
+        try
+        {
+
+            Message send_msg = new Message( null, null, led );
+
+            javagroups.send( send_msg );
+
+        }
+        catch ( Exception e )
+        {
+            log.error( "Detected problem with connection: " + e );
+            throw new IOException( e.getMessage() );
+        }
+
+    }
+
+    /**
+     * Sends commands to the lateral cache listener and gets a response.
+     *
+     * @return
+     * @param led
+     * @exception IOException
+     */
+    public ICacheElement sendAndReceive( LateralElementDescriptor led )
+        throws IOException
+    {
+        ICacheElement ice = null;
+
+        log.debug( "SendAndReceive led" );
+
+        if ( led == null )
+        {
+            return null;
+        }
+
+        try
+        {
+
+            try
+            {
+
+                disp = holder.getDispatcher();
+                Object[] args = { led.ce.getCacheName(), led.ce.getKey() };
+                String[] sigs = { java.lang.String.class.getName(), java.io.Serializable.class.getName() };
+                MethodCall meth = new MethodCall( "handleGet", args, sigs );
+                RspList rsp_list = disp.callRemoteMethods( null, meth, GroupRequest.GET_ALL, 1000 );
+
+                log.debug( "rsp_list = " + rsp_list );
+                Vector vec = rsp_list.getResults();
+                log.debug( "rsp_list size = " + vec.size() );
+                Iterator it = vec.iterator();
+
+                while ( it.hasNext() )
+                {
+                    ice = (ICacheElement) it.next();
+                    if ( ice != null )
+                    {
+                        break;
+                    }
+                }
+
+            }
+            catch ( Exception e )
+            {
+                log.error( e );
+            }
+
+        }
+        catch ( Exception e )
+        {
+            log.error( "Detected problem with connection.", e );
+            throw new IOException( e.getMessage() );
+        }
+        //        }
+        return ice;
+    }// end sendAndReceive
+
+    // Service Methods //
+    /**
+     * Description of the Method
+     *
+     * @param item
+     * @param requesterId
+     * @exception IOException
+     */
+    public void update( ICacheElement item, long requesterId )
+        throws IOException
+    {
+        LateralElementDescriptor led = new LateralElementDescriptor( item );
+        led.requesterId = requesterId;
+        led.command = LateralElementDescriptor.UPDATE;
+        send( led );
+    }
+
+    /**
+     * Description of the Method
+     *
+     * @param cacheName
+     * @param key
+     * @exception IOException
+     */
+    public void remove( String cacheName, Serializable key )
+        throws IOException
+    {
+        remove( cacheName, key, LateralCacheInfo.listenerId );
+    }
+
+    /**
+     * Description of the Method
+     *
+     * @param cacheName
+     * @param key
+     * @param requesterId
+     * @exception IOException
+     */
+    public void remove( String cacheName, Serializable key, long requesterId )
+        throws IOException
+    {
+        CacheElement ce = new CacheElement( cacheName, key, null );
+        LateralElementDescriptor led = new LateralElementDescriptor( ce );
+        led.requesterId = requesterId;
+        led.command = LateralElementDescriptor.REMOVE;
+        send( led );
+    }
+
+    /**
+     * Description of the Method
+     *
+     * @exception IOException
+     */
+    public void release()
+        throws IOException
+    {
+        // nothing needs to be done
+    }
+
+    /**
+     * Closes connection used by all LateralJGSenders for this lateral
+     * conneciton. Dispose request should come into the facade and be sent to
+     * all lateral cache sevices. The lateral cache service will then call this
+     * method.
+     *
+     * @param cache
+     * @exception IOException
+     */
+    public void dispose( String cache )
+        throws IOException
+    {
+
+    }
+
+    /**
+     * Description of the Method
+     *
+     * @param cacheName
+     * @exception IOException
+     */
+    public void removeAll( String cacheName )
+        throws IOException
+    {
+        removeAll( cacheName, LateralCacheInfo.listenerId );
+    }
+
+    /**
+     * Description of the Method
+     *
+     * @param cacheName
+     * @param requesterId
+     * @exception IOException
+     */
+    public void removeAll( String cacheName, long requesterId )
+        throws IOException
+    {
+        CacheElement ce = new CacheElement( cacheName, "ALL", null );
+        LateralElementDescriptor led = new LateralElementDescriptor( ce );
+        led.requesterId = requesterId;
+        led.command = LateralElementDescriptor.REMOVEALL;
+        send( led );
+    }
+
+}
+// end class

Modified: jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGService.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGService.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGService.java (original)
+++ jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGService.java Thu May 10 09:03:42 2007
@@ -1,289 +1,292 @@
-package org.apache.jcs.auxiliary.lateral.javagroups;
-
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Serializable;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.jcs.auxiliary.lateral.LateralCacheAttributes;
-import org.apache.jcs.auxiliary.lateral.LateralCacheInfo;
-import org.apache.jcs.auxiliary.lateral.LateralElementDescriptor;
-import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheAttributes;
-import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheObserver;
-import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheService;
-import org.apache.jcs.engine.CacheElement;
-import org.apache.jcs.engine.behavior.ICacheElement;
-import org.apache.jcs.engine.behavior.ICacheListener;
-
-/**
- * A lateral cache service implementation.
- * 
- * @version $Id: LateralJGService.java 240226 2005-08-26 12:47:59Z asmuts $
- */
-public class LateralJGService
-    implements ILateralCacheService, ILateralCacheObserver
-{
-    private final static Log log = LogFactory.getLog( LateralJGService.class );
-
-    private ILateralCacheAttributes ilca;
-
-    private LateralJGSender sender;
-
-    /**
-     * Constructor for the LateralJGService object
-     * 
-     * @param lca
-     * @exception IOException
-     */
-    public LateralJGService( ILateralCacheAttributes lca )
-        throws IOException
-    {
-        this.ilca = lca;
-        
-        try
-        {
-            log.debug( "creating sender" );
-
-            sender = new LateralJGSender( lca );
-
-            log.debug( "created sender" );
-        }
-        catch ( IOException e )
-        {
-
-            log.error( "Could not create sender to [" + lca.getJGChannelProperties() + "]", e );
-
-            throw e;
-        }
-    }
-
-    // -------------------------------------------------------- Service Methods
-
-    /**
-     * @param item
-     * @exception IOException
-     */
-    public void update( ICacheElement item )
-        throws IOException
-    {
-        update( item, LateralCacheInfo.listenerId );
-    }
-
-    /**
-     * @param item
-     * @param requesterId
-     * @exception IOException
-     */
-    public void update( ICacheElement item, long requesterId )
-        throws IOException
-    {
-        LateralElementDescriptor led = new LateralElementDescriptor( item );
-        led.requesterId = requesterId;
-        led.command = LateralElementDescriptor.UPDATE;
-        sender.send( led );
-    }
-
-    /**
-     * @param cacheName
-     * @param key
-     * @exception IOException
-     */
-    public void remove( String cacheName, Serializable key )
-        throws IOException
-    {
-        remove( cacheName, key, LateralCacheInfo.listenerId );
-    }
-
-    /**
-     * @param cacheName
-     * @param key
-     * @param requesterId
-     * @exception IOException
-     */
-    public void remove( String cacheName, Serializable key, long requesterId )
-        throws IOException
-    {
-        CacheElement ce = new CacheElement( cacheName, key, null );
-        LateralElementDescriptor led = new LateralElementDescriptor( ce );
-        led.requesterId = requesterId;
-        led.command = LateralElementDescriptor.REMOVE;
-        sender.send( led );
-    }
-
-    /**
-     * @exception IOException
-     */
-    public void release()
-        throws IOException
-    {
-        // nothing needs to be done
-    }
-
-    /**
-     * Will close the connection.
-     * 
-     * @param cache
-     * @exception IOException
-     */
-    public void dispose( String cache )
-        throws IOException
-    {
-        sender.dispose( cache );
-    }
-
-    /**
-     * @return
-     * @param cacheName
-     * @param key
-     * @exception IOException
-     */
-    public ICacheElement get( String cacheName, Serializable key )
-        throws IOException
-    {
-        //p( "get(cacheName,key,container)" );
-        CacheElement ce = new CacheElement( cacheName, key, null );
-        LateralElementDescriptor led = new LateralElementDescriptor( ce );
-        //led.requesterId = requesterId; // later
-        led.command = LateralElementDescriptor.GET;
-        return sender.sendAndReceive( led );
-        //return null;
-        // nothing needs to be done
-    }
-
-    /**
-     * @param cacheName
-     * @exception IOException
-     */
-    public void removeAll( String cacheName )
-        throws IOException
-    {
-        removeAll( cacheName, LateralCacheInfo.listenerId );
-    }
-
-    /**
-     * @param cacheName
-     * @param requesterId
-     * @exception IOException
-     */
-    public void removeAll( String cacheName, long requesterId )
-        throws IOException
-    {
-        CacheElement ce = new CacheElement( cacheName, "ALL", null );
-        LateralElementDescriptor led = new LateralElementDescriptor( ce );
-        led.requesterId = requesterId;
-        led.command = LateralElementDescriptor.REMOVEALL;
-        sender.send( led );
-    }
-
-    /**
-     * Gets the set of keys of objects currently in the group throws
-     * UnsupportedOperationException
-     */
-    public Set getGroupKeys( String cacheName, String group )
-    {
-        if ( true )
-        {
-            throw new UnsupportedOperationException( "Groups not implemented." );
-        }
-        return null;
-    }
-
-    /**
-     * @param args
-     */
-    public static void main( String args[] )
-    {
-        try
-        {
-            LateralJGSender sender = new LateralJGSender( new LateralCacheAttributes() );
-
-            // process user input till done
-            boolean notDone = true;
-            String message = null;
-            // wait to dispose
-            BufferedReader br = new BufferedReader( new InputStreamReader( System.in ) );
-
-            while ( notDone )
-            {
-                System.out.println( "enter mesage:" );
-                message = br.readLine();
-                CacheElement ce = new CacheElement( "test", "test", message );
-                LateralElementDescriptor led = new LateralElementDescriptor( ce );
-                sender.send( led );
-            }
-        }
-        catch ( Exception e )
-        {
-            System.out.println( e.toString() );
-        }
-    }
-
-    // ILateralCacheObserver methods, do nothing here since
-    // the connection is not registered, the udp service is
-    // is not registered.
-
-    /**
-     * @param cacheName
-     *            The feature to be added to the CacheListener attribute
-     * @param obj
-     *            The feature to be added to the CacheListener attribute
-     * @exception IOException
-     */
-    public void addCacheListener( String cacheName, ICacheListener obj )
-        throws IOException
-    {
-        // Empty
-    }
-
-    /**
-     * @param obj
-     *            The feature to be added to the CacheListener attribute
-     * @exception IOException
-     */
-    public void addCacheListener( ICacheListener obj )
-        throws IOException
-    {
-        // Empty
-    }
-
-    /**
-     * @param cacheName
-     * @param obj
-     * @exception IOException
-     */
-    public void removeCacheListener( String cacheName, ICacheListener obj )
-        throws IOException
-    {
-        // Empty
-    }
-
-    /**
-     * @param obj
-     * @exception IOException
-     */
-    public void removeCacheListener( ICacheListener obj )
-        throws IOException
-    {
-        // Empty
-    }
-
-}
+package org.apache.jcs.auxiliary.lateral.javagroups;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Serializable;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jcs.auxiliary.lateral.LateralCacheAttributes;
+import org.apache.jcs.auxiliary.lateral.LateralCacheInfo;
+import org.apache.jcs.auxiliary.lateral.LateralElementDescriptor;
+import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheAttributes;
+import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheObserver;
+import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheService;
+import org.apache.jcs.engine.CacheElement;
+import org.apache.jcs.engine.behavior.ICacheElement;
+import org.apache.jcs.engine.behavior.ICacheListener;
+
+/**
+ * A lateral cache service implementation.
+ *
+ * @version $Id: LateralJGService.java 240226 2005-08-26 12:47:59Z asmuts $
+ */
+public class LateralJGService
+    implements ILateralCacheService, ILateralCacheObserver
+{
+    private final static Log log = LogFactory.getLog( LateralJGService.class );
+
+    private ILateralCacheAttributes ilca;
+
+    private LateralJGSender sender;
+
+    /**
+     * Constructor for the LateralJGService object
+     *
+     * @param lca
+     * @exception IOException
+     */
+    public LateralJGService( ILateralCacheAttributes lca )
+        throws IOException
+    {
+        this.ilca = lca;
+
+        try
+        {
+            log.debug( "creating sender" );
+
+            sender = new LateralJGSender( lca );
+
+            log.debug( "created sender" );
+        }
+        catch ( IOException e )
+        {
+
+            log.error( "Could not create sender to [" + lca.getJGChannelProperties() + "]", e );
+
+            throw e;
+        }
+    }
+
+    // -------------------------------------------------------- Service Methods
+
+    /**
+     * @param item
+     * @exception IOException
+     */
+    public void update( ICacheElement item )
+        throws IOException
+    {
+        update( item, LateralCacheInfo.listenerId );
+    }
+
+    /**
+     * @param item
+     * @param requesterId
+     * @exception IOException
+     */
+    public void update( ICacheElement item, long requesterId )
+        throws IOException
+    {
+        LateralElementDescriptor led = new LateralElementDescriptor( item );
+        led.requesterId = requesterId;
+        led.command = LateralElementDescriptor.UPDATE;
+        sender.send( led );
+    }
+
+    /**
+     * @param cacheName
+     * @param key
+     * @exception IOException
+     */
+    public void remove( String cacheName, Serializable key )
+        throws IOException
+    {
+        remove( cacheName, key, LateralCacheInfo.listenerId );
+    }
+
+    /**
+     * @param cacheName
+     * @param key
+     * @param requesterId
+     * @exception IOException
+     */
+    public void remove( String cacheName, Serializable key, long requesterId )
+        throws IOException
+    {
+        CacheElement ce = new CacheElement( cacheName, key, null );
+        LateralElementDescriptor led = new LateralElementDescriptor( ce );
+        led.requesterId = requesterId;
+        led.command = LateralElementDescriptor.REMOVE;
+        sender.send( led );
+    }
+
+    /**
+     * @exception IOException
+     */
+    public void release()
+        throws IOException
+    {
+        // nothing needs to be done
+    }
+
+    /**
+     * Will close the connection.
+     *
+     * @param cache
+     * @exception IOException
+     */
+    public void dispose( String cache )
+        throws IOException
+    {
+        sender.dispose( cache );
+    }
+
+    /**
+     * @return
+     * @param cacheName
+     * @param key
+     * @exception IOException
+     */
+    public ICacheElement get( String cacheName, Serializable key )
+        throws IOException
+    {
+        //p( "get(cacheName,key,container)" );
+        CacheElement ce = new CacheElement( cacheName, key, null );
+        LateralElementDescriptor led = new LateralElementDescriptor( ce );
+        //led.requesterId = requesterId; // later
+        led.command = LateralElementDescriptor.GET;
+        return sender.sendAndReceive( led );
+        //return null;
+        // nothing needs to be done
+    }
+
+    /**
+     * @param cacheName
+     * @exception IOException
+     */
+    public void removeAll( String cacheName )
+        throws IOException
+    {
+        removeAll( cacheName, LateralCacheInfo.listenerId );
+    }
+
+    /**
+     * @param cacheName
+     * @param requesterId
+     * @exception IOException
+     */
+    public void removeAll( String cacheName, long requesterId )
+        throws IOException
+    {
+        CacheElement ce = new CacheElement( cacheName, "ALL", null );
+        LateralElementDescriptor led = new LateralElementDescriptor( ce );
+        led.requesterId = requesterId;
+        led.command = LateralElementDescriptor.REMOVEALL;
+        sender.send( led );
+    }
+
+    /**
+     * Gets the set of keys of objects currently in the group throws
+     * UnsupportedOperationException
+     */
+    public Set getGroupKeys( String cacheName, String group )
+    {
+        if ( true )
+        {
+            throw new UnsupportedOperationException( "Groups not implemented." );
+        }
+        return null;
+    }
+
+    /**
+     * @param args
+     */
+    public static void main( String args[] )
+    {
+        try
+        {
+            LateralJGSender sender = new LateralJGSender( new LateralCacheAttributes() );
+
+            // process user input till done
+            boolean notDone = true;
+            String message = null;
+            // wait to dispose
+            BufferedReader br = new BufferedReader( new InputStreamReader( System.in ) );
+
+            while ( notDone )
+            {
+                System.out.println( "enter mesage:" );
+                message = br.readLine();
+                CacheElement ce = new CacheElement( "test", "test", message );
+                LateralElementDescriptor led = new LateralElementDescriptor( ce );
+                sender.send( led );
+            }
+        }
+        catch ( Exception e )
+        {
+            System.out.println( e.toString() );
+        }
+    }
+
+    // ILateralCacheObserver methods, do nothing here since
+    // the connection is not registered, the udp service is
+    // is not registered.
+
+    /**
+     * @param cacheName
+     *            The feature to be added to the CacheListener attribute
+     * @param obj
+     *            The feature to be added to the CacheListener attribute
+     * @exception IOException
+     */
+    public void addCacheListener( String cacheName, ICacheListener obj )
+        throws IOException
+    {
+        // Empty
+    }
+
+    /**
+     * @param obj
+     *            The feature to be added to the CacheListener attribute
+     * @exception IOException
+     */
+    public void addCacheListener( ICacheListener obj )
+        throws IOException
+    {
+        // Empty
+    }
+
+    /**
+     * @param cacheName
+     * @param obj
+     * @exception IOException
+     */
+    public void removeCacheListener( String cacheName, ICacheListener obj )
+        throws IOException
+    {
+        // Empty
+    }
+
+    /**
+     * @param obj
+     * @exception IOException
+     */
+    public void removeCacheListener( ICacheListener obj )
+        throws IOException
+    {
+        // Empty
+    }
+
+}

Modified: jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/behavior/IJGConstants.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/behavior/IJGConstants.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/behavior/IJGConstants.java (original)
+++ jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/behavior/IJGConstants.java Thu May 10 09:03:42 2007
@@ -1,28 +1,31 @@
-package org.apache.jcs.auxiliary.lateral.javagroups.behavior;
-
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License") you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at 
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-public interface IJGConstants
-{
-
-    public static final String HANDLERNAME = "LATERAL_JG_CACHE";
-
-    public static final String DEFAULT_JG_GROUP_NAME = "JCS_CACHE";
-
-    public static final String RPC_JG_GROUP_NAME = "RPC_JCS_CACHE";
-
-}
+package org.apache.jcs.auxiliary.lateral.javagroups.behavior;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public interface IJGConstants
+{
+
+    public static final String HANDLERNAME = "LATERAL_JG_CACHE";
+
+    public static final String DEFAULT_JG_GROUP_NAME = "JCS_CACHE";
+
+    public static final String RPC_JG_GROUP_NAME = "RPC_JCS_CACHE";
+
+}

Modified: jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/behavior/ILateralCacheJGListener.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/behavior/ILateralCacheJGListener.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/behavior/ILateralCacheJGListener.java (original)
+++ jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/behavior/ILateralCacheJGListener.java Thu May 10 09:03:42 2007
@@ -1,40 +1,43 @@
-package org.apache.jcs.auxiliary.lateral.javagroups.behavior;
-
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.Serializable;
-import java.io.IOException;
-
-import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheListener;
-
-/**
- * Listens for lateral cache event notification.
- *  
- * @version $Id: ILateralCacheJGListener.java 224346 2005-06-04 02:01:59Z asmuts $
- */
-public interface ILateralCacheJGListener
-    extends ILateralCacheListener
-{
-
-    /** Description of the Method */
-    public void init();
-
-    /** Tries to get a requested item from the cache. */
-    public Serializable handleGet( String cacheName, Serializable key )
-        throws IOException;
-
-}
+package org.apache.jcs.auxiliary.lateral.javagroups.behavior;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.Serializable;
+import java.io.IOException;
+
+import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheListener;
+
+/**
+ * Listens for lateral cache event notification.
+ *
+ * @version $Id: ILateralCacheJGListener.java 224346 2005-06-04 02:01:59Z asmuts $
+ */
+public interface ILateralCacheJGListener
+    extends ILateralCacheListener
+{
+
+    /** Description of the Method */
+    public void init();
+
+    /** Tries to get a requested item from the cache. */
+    public Serializable handleGet( String cacheName, Serializable key )
+        throws IOException;
+
+}

Modified: jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/utils/JGRpcOpener.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/utils/JGRpcOpener.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/utils/JGRpcOpener.java (original)
+++ jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/utils/JGRpcOpener.java Thu May 10 09:03:42 2007
@@ -1,127 +1,130 @@
-package org.apache.jcs.auxiliary.lateral.javagroups.utils;
-
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheAttributes;
-import org.apache.jcs.auxiliary.lateral.javagroups.behavior.ILateralCacheJGListener;
-import org.jgroups.Channel;
-import org.jgroups.JChannel;
-import org.jgroups.blocks.RpcDispatcher;
-
-/**
- * Socket openere that will timeout on the initial connect rather than block
- * forever. Technique from core java II.
- * 
- * @version $Id: JGRpcOpener.java 234393 2005-08-22 00:12:06Z asmuts $
- */
-public class JGRpcOpener
-    implements Runnable
-{
-
-    private final static Log log = LogFactory.getLog( JGRpcOpener.class );
-
-    //private Socket socket;
-    private Channel rpcCh;
-
-    private RpcDispatcher disp;
-
-    private String groupName;
-
-    private ILateralCacheJGListener ilcl;
-
-    private ILateralCacheAttributes ilca;
-
-    /**
-     * Constructor for the SocketOpener object
-     * 
-     * @param ilcl
-     * @param ilca
-     * @param timeOut
-     * @param groupName
-     * @return
-     */
-    public static RpcDispatcher openSocket( ILateralCacheJGListener ilcl, ILateralCacheAttributes ilca, int timeOut,
-                                           String groupName )
-    {
-        JGRpcOpener opener = new JGRpcOpener( ilcl, ilca, groupName );
-        Thread t = new Thread( opener );
-        t.start();
-        try
-        {
-            t.join( timeOut );
-        }
-        catch ( InterruptedException ire )
-        {
-            log.error( ire );
-        }
-        return opener.getSocket();
-    }
-
-    /**
-     * Constructor for the SocketOpener object
-     * 
-     * @param ilcl
-     * @param ilca
-     * @param groupName
-     *  
-     */
-    public JGRpcOpener( ILateralCacheJGListener ilcl, ILateralCacheAttributes ilca, String groupName )
-    {
-        this.rpcCh = null;
-        this.ilcl = ilcl;
-        this.ilca = ilca;
-        this.groupName = groupName;
-    }
-
-    /** Main processing method for the SocketOpener object */
-    public void run()
-    {
-        try
-        {
-
-            //String props="UDP(mcast_addr=" + ilca.getUdpMulticastAddr() +
-            // ";mcast_port=" + ilca.getUdpMulticastPort()+
-            // "):PING:MERGE2(min_interval=5000;max_interval=10000):FD:STABLE:NAKACK:UNICAST:FLUSH:GMS:VIEW_ENFORCER:QUEUE";
-            rpcCh = new JChannel( ilca.getJGChannelProperties() );
-            rpcCh.setOpt( Channel.LOCAL, Boolean.FALSE );
-            disp = new RpcDispatcher( rpcCh, null, null, ilcl );
-            rpcCh.connect( groupName );
-
-            if ( log.isInfoEnabled() )
-            {
-                log.info( "Is Connected = " + rpcCh.isConnected() );
-            }
-
-        }
-        catch ( Exception e )
-        {
-            log.error( "Problem getting dispatcher.", e );
-        }
-    }
-
-    /**
-     * Gets the socket attribute of the SocketOpener object
-     * 
-     * @return
-     */
-    public RpcDispatcher getSocket()
-    {
-        return disp;
-    }
-}
+package org.apache.jcs.auxiliary.lateral.javagroups.utils;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheAttributes;
+import org.apache.jcs.auxiliary.lateral.javagroups.behavior.ILateralCacheJGListener;
+import org.jgroups.Channel;
+import org.jgroups.JChannel;
+import org.jgroups.blocks.RpcDispatcher;
+
+/**
+ * Socket openere that will timeout on the initial connect rather than block
+ * forever. Technique from core java II.
+ *
+ * @version $Id: JGRpcOpener.java 234393 2005-08-22 00:12:06Z asmuts $
+ */
+public class JGRpcOpener
+    implements Runnable
+{
+
+    private final static Log log = LogFactory.getLog( JGRpcOpener.class );
+
+    //private Socket socket;
+    private Channel rpcCh;
+
+    private RpcDispatcher disp;
+
+    private String groupName;
+
+    private ILateralCacheJGListener ilcl;
+
+    private ILateralCacheAttributes ilca;
+
+    /**
+     * Constructor for the SocketOpener object
+     *
+     * @param ilcl
+     * @param ilca
+     * @param timeOut
+     * @param groupName
+     * @return
+     */
+    public static RpcDispatcher openSocket( ILateralCacheJGListener ilcl, ILateralCacheAttributes ilca, int timeOut,
+                                           String groupName )
+    {
+        JGRpcOpener opener = new JGRpcOpener( ilcl, ilca, groupName );
+        Thread t = new Thread( opener );
+        t.start();
+        try
+        {
+            t.join( timeOut );
+        }
+        catch ( InterruptedException ire )
+        {
+            log.error( ire );
+        }
+        return opener.getSocket();
+    }
+
+    /**
+     * Constructor for the SocketOpener object
+     *
+     * @param ilcl
+     * @param ilca
+     * @param groupName
+     *
+     */
+    public JGRpcOpener( ILateralCacheJGListener ilcl, ILateralCacheAttributes ilca, String groupName )
+    {
+        this.rpcCh = null;
+        this.ilcl = ilcl;
+        this.ilca = ilca;
+        this.groupName = groupName;
+    }
+
+    /** Main processing method for the SocketOpener object */
+    public void run()
+    {
+        try
+        {
+
+            //String props="UDP(mcast_addr=" + ilca.getUdpMulticastAddr() +
+            // ";mcast_port=" + ilca.getUdpMulticastPort()+
+            // "):PING:MERGE2(min_interval=5000;max_interval=10000):FD:STABLE:NAKACK:UNICAST:FLUSH:GMS:VIEW_ENFORCER:QUEUE";
+            rpcCh = new JChannel( ilca.getJGChannelProperties() );
+            rpcCh.setOpt( Channel.LOCAL, Boolean.FALSE );
+            disp = new RpcDispatcher( rpcCh, null, null, ilcl );
+            rpcCh.connect( groupName );
+
+            if ( log.isInfoEnabled() )
+            {
+                log.info( "Is Connected = " + rpcCh.isConnected() );
+            }
+
+        }
+        catch ( Exception e )
+        {
+            log.error( "Problem getting dispatcher.", e );
+        }
+    }
+
+    /**
+     * Gets the socket attribute of the SocketOpener object
+     *
+     * @return
+     */
+    public RpcDispatcher getSocket()
+    {
+        return disp;
+    }
+}

Modified: jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/utils/JGSocketOpener.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/utils/JGSocketOpener.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/utils/JGSocketOpener.java (original)
+++ jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/utils/JGSocketOpener.java Thu May 10 09:03:42 2007
@@ -1,121 +1,124 @@
-package org.apache.jcs.auxiliary.lateral.javagroups.utils;
-
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheAttributes;
-import org.jgroups.Channel;
-import org.jgroups.ChannelFactory;
-import org.jgroups.JChannelFactory;
-
-/**
- * Socket openere that will timeout on the initial connect rather than block
- * forever.
- * 
- * @version $Id: JGSocketOpener.java 234393 2005-08-22 00:12:06Z asmuts $
- */
-public class JGSocketOpener
-    implements Runnable
-{
-
-    private final static Log log = LogFactory.getLog( JGSocketOpener.class );
-
-    private ILateralCacheAttributes lca;
-
-    private Channel javagroups;
-
-    private String groupName;
-
-    /**
-     * Constructor for the <code>SocketOpener</code> object.
-     * @param lca
-     * @param timeOut
-     * @param groupName
-     * @return
-     */
-    public static Channel openSocket( ILateralCacheAttributes lca, int timeOut, String groupName )
-    {
-        JGSocketOpener opener = new JGSocketOpener( lca, groupName );
-        Thread t = new Thread( opener );
-        t.start();
-        try
-        {
-            t.join( timeOut );
-        }
-        catch ( InterruptedException ire )
-        {
-            log.error( "Failed of connect in within timout of " + timeOut, ire );
-        }
-        return opener.getSocket();
-    }
-
-    /**
-     * Constructor for the SocketOpener object
-     * @param lca
-     * @param groupName
-     * 
-     * @param host
-     * @param port
-     */
-    public JGSocketOpener( ILateralCacheAttributes lca, String groupName )
-    {
-        this.javagroups = null;
-        this.lca = lca;
-        this.groupName = groupName;
-    }
-
-    /**
-     * Main processing method for the <code>SocketOpener</code> object.
-     */
-    public void run()
-    {
-        try
-        {
-
-            ChannelFactory factory = new JChannelFactory();
-
-            // Create a channel based on 'channelProperties' from the config
-            Channel channel = factory.createChannel( lca.getJGChannelProperties() );
-
-            javagroups = channel; //new JChannel( lca.getJGChannelProperties()
-                                  // );
-            // don't send local
-            javagroups.setOpt( Channel.LOCAL, Boolean.FALSE );
-
-            javagroups.connect( groupName );
-
-            if ( log.isInfoEnabled() )
-            {
-                log.info( "Is Connected = " + javagroups.isConnected() );
-            }
-
-        }
-        catch ( Exception e )
-        {
-            log.error( "Problem connecting to channel.", e );
-        }
-    }
-
-    /**
-     * Gets the socket attribute of the <code>SocketOpener</code> object.
-     */
-    public Channel getSocket()
-    {
-        return javagroups;
-    }
-}
+package org.apache.jcs.auxiliary.lateral.javagroups.utils;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheAttributes;
+import org.jgroups.Channel;
+import org.jgroups.ChannelFactory;
+import org.jgroups.JChannelFactory;
+
+/**
+ * Socket openere that will timeout on the initial connect rather than block
+ * forever.
+ *
+ * @version $Id: JGSocketOpener.java 234393 2005-08-22 00:12:06Z asmuts $
+ */
+public class JGSocketOpener
+    implements Runnable
+{
+
+    private final static Log log = LogFactory.getLog( JGSocketOpener.class );
+
+    private ILateralCacheAttributes lca;
+
+    private Channel javagroups;
+
+    private String groupName;
+
+    /**
+     * Constructor for the <code>SocketOpener</code> object.
+     * @param lca
+     * @param timeOut
+     * @param groupName
+     * @return
+     */
+    public static Channel openSocket( ILateralCacheAttributes lca, int timeOut, String groupName )
+    {
+        JGSocketOpener opener = new JGSocketOpener( lca, groupName );
+        Thread t = new Thread( opener );
+        t.start();
+        try
+        {
+            t.join( timeOut );
+        }
+        catch ( InterruptedException ire )
+        {
+            log.error( "Failed of connect in within timout of " + timeOut, ire );
+        }
+        return opener.getSocket();
+    }
+
+    /**
+     * Constructor for the SocketOpener object
+     * @param lca
+     * @param groupName
+     *
+     * @param host
+     * @param port
+     */
+    public JGSocketOpener( ILateralCacheAttributes lca, String groupName )
+    {
+        this.javagroups = null;
+        this.lca = lca;
+        this.groupName = groupName;
+    }
+
+    /**
+     * Main processing method for the <code>SocketOpener</code> object.
+     */
+    public void run()
+    {
+        try
+        {
+
+            ChannelFactory factory = new JChannelFactory();
+
+            // Create a channel based on 'channelProperties' from the config
+            Channel channel = factory.createChannel( lca.getJGChannelProperties() );
+
+            javagroups = channel; //new JChannel( lca.getJGChannelProperties()
+                                  // );
+            // don't send local
+            javagroups.setOpt( Channel.LOCAL, Boolean.FALSE );
+
+            javagroups.connect( groupName );
+
+            if ( log.isInfoEnabled() )
+            {
+                log.info( "Is Connected = " + javagroups.isConnected() );
+            }
+
+        }
+        catch ( Exception e )
+        {
+            log.error( "Problem connecting to channel.", e );
+        }
+    }
+
+    /**
+     * Gets the socket attribute of the <code>SocketOpener</code> object.
+     */
+    public Channel getSocket()
+    {
+        return javagroups;
+    }
+}

Modified: jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCache.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCache.java?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCache.java (original)
+++ jakarta/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCache.java Thu May 10 09:03:42 2007
@@ -1,19 +1,22 @@
 package org.apache.jcs.engine.memory.lru;
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 import java.io.IOException;

Modified: jakarta/jcs/trunk/auxiliary-builds/jdk14/src/test-conf/log4j.properties
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/auxiliary-builds/jdk14/src/test-conf/log4j.properties?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/auxiliary-builds/jdk14/src/test-conf/log4j.properties (original)
+++ jakarta/jcs/trunk/auxiliary-builds/jdk14/src/test-conf/log4j.properties Thu May 10 09:03:42 2007
@@ -1,24 +1,40 @@
-log4j.rootCategory=INFO, stdout, logfile
-
-log4j.category.org.apache.jcs=INFO
-log4j.category.org.apache.jcs.config=INFO
-log4j.category.org.apache.jcs.engine.CacheEventQueueFactory=DEBUG
-log4j.category.org.apache.jcs.auxiliary.disk=INFO
-log4j.category.org.apache.jcs.auxiliary.disk.bdbje=DEBUG
-log4j.category.org.apache.jcs.auxiliary.remote=INFO
-log4j.category.org.apache.jcs.auxiliary.lateral=INFO
-log4j.category.org.apache.jcs.utils.threadpool=INFO
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-log4j.appender.logfile=org.apache.log4j.RollingFileAppender
-log4j.appender.logfile.File=target/test-sandbox/logs/jcs.log
-log4j.appender.logfile.MaxFileSize=2MB
-# Keep three backup files
-log4j.appender.logfile.MaxBackupIndex=3
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-#Pattern to output : date priority [category] - <message>line_separator
-log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+log4j.rootCategory=INFO, stdout, logfile
+
+log4j.category.org.apache.jcs=INFO
+log4j.category.org.apache.jcs.config=INFO
+log4j.category.org.apache.jcs.engine.CacheEventQueueFactory=DEBUG
+log4j.category.org.apache.jcs.auxiliary.disk=INFO
+log4j.category.org.apache.jcs.auxiliary.disk.bdbje=DEBUG
+log4j.category.org.apache.jcs.auxiliary.remote=INFO
+log4j.category.org.apache.jcs.auxiliary.lateral=INFO
+log4j.category.org.apache.jcs.utils.threadpool=INFO
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
+
+log4j.appender.logfile=org.apache.log4j.RollingFileAppender
+log4j.appender.logfile.File=target/test-sandbox/logs/jcs.log
+log4j.appender.logfile.MaxFileSize=2MB
+# Keep three backup files
+log4j.appender.logfile.MaxBackupIndex=3
+log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
+# Pattern to output : date priority [category] - <message>line_separator
+log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - <%m>%n
+

Modified: jakarta/jcs/trunk/build-gump.xml
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/build-gump.xml?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/build-gump.xml (original)
+++ jakarta/jcs/trunk/build-gump.xml Thu May 10 09:03:42 2007
@@ -1,19 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <!--
 
   WARNING: This file is generated! Do not edit by hand!
-  
+
 -->
 
 <project name="maven" default="jar" basedir=".">
 
   <target
     name="jar">
-    
+
     <property name="build.dir" value="target"/>
     <property name="build.dest" value="${maven.build.dir}/classes"/>
-    
+
     <mkdir dir="${maven.build.dest}"/>
-    
+
     <javac
       destdir="${maven.build.dest}"
       excludes="**/package.html"
@@ -30,7 +49,7 @@
       basedir="${maven.build.dest}"
       excludes="**/package.html"
     />
-    
+
   </target>
 
 </project>

Modified: jakarta/jcs/trunk/build.xml
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/build.xml?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/build.xml (original)
+++ jakarta/jcs/trunk/build.xml Thu May 10 09:03:42 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 
 <project name="maven" default="maven:jar" basedir=".">
 
@@ -42,11 +60,11 @@
 
 
   <!-- maven:start -->
-  
+
   <!-- ================================================================== -->
   <!-- D E L E G A T O R S                                                -->
   <!-- ================================================================== -->
-        
+
 
     <target name="maven:gump-descriptor">
       <ant antfile="${maven.home}/plugins/core/build.xml" target="gump-descriptor"/>

Modified: jakarta/jcs/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/checkstyle.xml?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/checkstyle.xml (original)
+++ jakarta/jcs/trunk/checkstyle.xml Thu May 10 09:03:42 2007
@@ -1,21 +1,22 @@
 <?xml version="1.0"?>
-<!-- 
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 
 <!DOCTYPE module PUBLIC
     "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
@@ -69,7 +70,7 @@
         <module name="ConstantName">
           <property name="format" value="log|^[a-zA-Z][a-zA-Z0-9_]*$"/>
         </module>
-        
+
         <!-- ************************************************************** -->
         <!-- Default Sun coding conventions checks                          -->
         <!-- ************************************************************** -->
@@ -127,7 +128,7 @@
         <!-- See http://checkstyle.sf.net/config_blocks.html -->
         <module name="AvoidNestedBlocks"/>
         <module name="EmptyBlock"/>
-        
+
         <module name="NeedBraces"/>
 
 

Modified: jakarta/jcs/trunk/doap_jcs.rdf
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/doap_jcs.rdf?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/doap_jcs.rdf (original)
+++ jakarta/jcs/trunk/doap_jcs.rdf Thu May 10 09:03:42 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <rdf:RDF xmlns="http://usefulinc.com/ns/doap#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:asfext="http://projects.apache.org/ns/asfext#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:doap="http://usefulinc.com/ns/doap#" xml:lang="en">
   <Project rdf:about="http://jakarta.apache.org/jcs/">
     <name>Apache Jakarta JCS</name>

Modified: jakarta/jcs/trunk/gump.xml
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/gump.xml?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/gump.xml (original)
+++ jakarta/jcs/trunk/gump.xml Thu May 10 09:03:42 2007
@@ -1,23 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <module name="jakarta-jcs">
 
 
   <description>Cache</description>
   <url href="http://jakarta.apache.org/jcs/"/>
-  
+
   <cvs repository="jakarta"/>
-  
+
   <!-- This is really the cvs module. We need to change this but -->
   <!-- I will leave this for now until everything works.         -->
-  
+
   <project name="jakarta-jcs">
-    
+
     <!-- Standard Maven target to produce Javadocs, source -->
     <!-- and binary distributions.                         -->
-    
+
     <ant buildfile="build-gump.xml" target="jar">
       <property name="final.name" value="jcs-@@DATE@@"/>
     </ant>
-    
+
     <!-- All Maven projects need Ant and Xerces to build. -->
     <depend project="jakarta-ant"/>
     <depend project="xml-xerces"/>
@@ -43,7 +62,7 @@
 
     <nag to="turbine-jcs-dev@jakarta.apache.org"
          from="JCS Developers &lt;turbine-jcs-dev@jakarta.apache.org&gt;"/>
-    
+
   </project>
-  
+
 </module>

Modified: jakarta/jcs/trunk/maven-eclipse-codestyle.xml
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/maven-eclipse-codestyle.xml?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/maven-eclipse-codestyle.xml (original)
+++ jakarta/jcs/trunk/maven-eclipse-codestyle.xml Thu May 10 09:03:42 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <profiles version="8">
 <profile name="mergere-formats" version="8">
 <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>

Modified: jakarta/jcs/trunk/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/maven.xml?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/maven.xml (original)
+++ jakarta/jcs/trunk/maven.xml Thu May 10 09:03:42 2007
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <project default="java:jar" xmlns:j="jelly:core" xmlns:ant="jelly:ant"
 	xmlns:deploy="deploy" xmlns:u="jelly:util" xmlns:maven="jelly:maven">
 
@@ -27,13 +46,13 @@
       <classpath>
         <path refid="maven.dependency.classpath"/>
       </classpath>
-    </rmic> 
+    </rmic>
 
-    <rmic base="${maven.build.dest}" classname="org.apache.jcs.auxiliary.remote.server.RemoteCacheServer"> 
+    <rmic base="${maven.build.dest}" classname="org.apache.jcs.auxiliary.remote.server.RemoteCacheServer">
       <classpath>
         <path refid="maven.dependency.classpath"/>
       </classpath>
-    </rmic> 
+    </rmic>
   </goal>
 
   <goal name="copyjars">
@@ -45,13 +64,13 @@
   <postGoal name="site">
     <attainGoal name="pdf"/>
   </postGoal>
-  
+
   <!-- The eclipse goal runs .project and .classpath generation -->
   <!-- I want to prevent the .project file genreation, so -->
   <!-- the ant external tool builder will not get wiped out. -->
   <goal name="eclipse:generate-project">
     <!-- do nothing -->
-    <ant:echo>Not generating the .project file.</ant:echo>	  
+    <ant:echo>Not generating the .project file.</ant:echo>
   </goal>
-  
+
 </project>

Modified: jakarta/jcs/trunk/maven13.bat
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/maven13.bat?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
Binary files - no diff available.

Modified: jakarta/jcs/trunk/maven131.bat
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/maven131.bat?view=diff&rev=536904&r1=536903&r2=536904
==============================================================================
--- jakarta/jcs/trunk/maven131.bat (original)
+++ jakarta/jcs/trunk/maven131.bat Thu May 10 09:03:42 2007
@@ -1,3 +1,19 @@
-set JAVA_HOME=C:\Java\jdk1.3.1
-
-maven %1 %2
\ No newline at end of file
+rem Licensed to the Apache Software Foundation (ASF) under one
+rem or more contributor license agreements.  See the NOTICE file
+rem distributed with this work for additional information
+rem regarding copyright ownership.  The ASF licenses this file
+rem to you under the Apache License, Version 2.0 (the
+rem "License"); you may not use this file except in compliance
+rem with the License.  You may obtain a copy of the License at
+rem
+rem   http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing,
+rem software distributed under the License is distributed on an
+rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem KIND, either express or implied.  See the License for the
+rem specific language governing permissions and limitations
+rem under the License.
+set JAVA_HOME=C:\Java\jdk1.3.1
+
+maven %1 %2



---------------------------------------------------------------------
To unsubscribe, e-mail: jcs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jcs-dev-help@jakarta.apache.org


Mime
View raw message