You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ak...@apache.org on 2008/01/26 23:04:41 UTC
svn commit: r615512 - in /mina/asyncweb/trunk/server/src: main/java/org/apache/asyncweb/server/errorReporting/ main/java/org/apache/asyncweb/server/session/ main/java/org/apache/asyncweb/server/util/ main/java/org/safehaus/asyncweb/util/ test/java/org/...

Author: akarasulu
Date: Sat Jan 26 14:04:40 2008
New Revision: 615512

URL: http://svn.apache.org/viewvc?rev=615512&view=rev
Log:
moved utilities to proper package

Added:
    mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/
    mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/LinkedPermitIssuer.java   (contents, props changed)
      - copied, changed from r615510, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/LinkedPermitIssuer.java
    mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/PermitExpirationListener.java   (contents, props changed)
      - copied, changed from r615510, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/PermitExpirationListener.java
    mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/StringBundle.java   (contents, props changed)
      - copied, changed from r615510, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/StringBundle.java
    mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/TimedPermit.java   (contents, props changed)
      - copied, changed from r615510, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/TimedPermit.java
    mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/TimedPermitIssuer.java   (contents, props changed)
      - copied, changed from r615510, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/TimedPermitIssuer.java
Removed:
    mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/
Modified:
    mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java
    mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSession.java
    mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSessionStore.java
    mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/util/LinkedPermitIssuerTest.java

Modified: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java?rev=615512&r1=615511&r2=615512&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java Sat Jan 26 14:04:40 2008
@@ -26,7 +26,7 @@
 import org.apache.asyncweb.common.HttpResponseStatus.Category;
 import org.apache.asyncweb.common.HttpRequest;
 import org.apache.asyncweb.common.HttpResponseStatus;
-import org.safehaus.asyncweb.util.StringBundle;
+import org.apache.asyncweb.server.util.StringBundle;
 
 public class StandardResponseFormatter implements ErrorResponseFormatter {
 

Modified: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSession.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSession.java?rev=615512&r1=615511&r2=615512&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSession.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSession.java Sat Jan 26 14:04:40 2008
@@ -24,7 +24,7 @@
 import java.util.Map;
 
 import org.apache.asyncweb.server.HttpSession;
-import org.safehaus.asyncweb.util.TimedPermit;
+import org.apache.asyncweb.server.util.TimedPermit;
 
 /**
  * A basic <code>Session</code> implementation which holds session values

Modified: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSessionStore.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSessionStore.java?rev=615512&r1=615511&r2=615512&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSessionStore.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSessionStore.java Sat Jan 26 14:04:40 2008
@@ -27,10 +27,10 @@
 import java.util.Map;
 
 import org.apache.asyncweb.server.HttpSession;
-import org.safehaus.asyncweb.util.LinkedPermitIssuer;
-import org.safehaus.asyncweb.util.PermitExpirationListener;
-import org.safehaus.asyncweb.util.TimedPermit;
-import org.safehaus.asyncweb.util.TimedPermitIssuer;
+import org.apache.asyncweb.server.util.LinkedPermitIssuer;
+import org.apache.asyncweb.server.util.TimedPermit;
+import org.apache.asyncweb.server.util.PermitExpirationListener;
+import org.apache.asyncweb.server.util.TimedPermitIssuer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -268,7 +268,8 @@
      * @author irvingd
      *
      */
-    private class TimeoutListener implements PermitExpirationListener {
+    private class TimeoutListener implements PermitExpirationListener
+    {
 
         /**
          * Invoked when a permit issued for a session expires

Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/LinkedPermitIssuer.java (from r615510, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/LinkedPermitIssuer.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/LinkedPermitIssuer.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/LinkedPermitIssuer.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/LinkedPermitIssuer.java&r1=615510&r2=615512&rev=615512&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/LinkedPermitIssuer.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/LinkedPermitIssuer.java Sat Jan 26 14:04:40 2008
@@ -17,7 +17,7 @@
  *  under the License.
  *
  */
-package org.safehaus.asyncweb.util;
+package org.apache.asyncweb.server.util;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -25,6 +25,9 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.apache.asyncweb.server.util.TimedPermitIssuer;
+import org.apache.asyncweb.server.util.PermitExpirationListener;
+import org.apache.asyncweb.server.util.TimedPermit;
 
 /**
  * A <code>TimedPermitIssuer</code> which stores all issued permits in a linked
@@ -38,7 +41,8 @@
  * @author irvingd
  *
  */
-public class LinkedPermitIssuer implements TimedPermitIssuer {
+public class LinkedPermitIssuer implements TimedPermitIssuer
+{
 
     private static final Logger LOG = LoggerFactory
             .getLogger(LinkedPermitIssuer.class);

Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/LinkedPermitIssuer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/LinkedPermitIssuer.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/PermitExpirationListener.java (from r615510, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/PermitExpirationListener.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/PermitExpirationListener.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/PermitExpirationListener.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/PermitExpirationListener.java&r1=615510&r2=615512&rev=615512&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/PermitExpirationListener.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/PermitExpirationListener.java Sat Jan 26 14:04:40 2008
@@ -17,7 +17,7 @@
  *  under the License.
  *
  */
-package org.safehaus.asyncweb.util;
+package org.apache.asyncweb.server.util;
 
 /**
  * Something interested in receiving notifications when permits issued by a

Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/PermitExpirationListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/PermitExpirationListener.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/StringBundle.java (from r615510, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/StringBundle.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/StringBundle.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/StringBundle.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/StringBundle.java&r1=615510&r2=615512&rev=615512&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/StringBundle.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/StringBundle.java Sat Jan 26 14:04:40 2008
@@ -17,7 +17,7 @@
  *  under the License.
  *
  */
-package org.safehaus.asyncweb.util;
+package org.apache.asyncweb.server.util;
 
 import java.text.MessageFormat;
 import java.util.HashMap;

Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/StringBundle.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/StringBundle.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/TimedPermit.java (from r615510, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/TimedPermit.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/TimedPermit.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/TimedPermit.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/TimedPermit.java&r1=615510&r2=615512&rev=615512&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/TimedPermit.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/TimedPermit.java Sat Jan 26 14:04:40 2008
@@ -17,7 +17,7 @@
  *  under the License.
  *
  */
-package org.safehaus.asyncweb.util;
+package org.apache.asyncweb.server.util;
 
 /**
  * A time limited permit granting access to a target object.

Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/TimedPermit.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/TimedPermit.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/TimedPermitIssuer.java (from r615510, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/TimedPermitIssuer.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/TimedPermitIssuer.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/TimedPermitIssuer.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/TimedPermitIssuer.java&r1=615510&r2=615512&rev=615512&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/util/TimedPermitIssuer.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/TimedPermitIssuer.java Sat Jan 26 14:04:40 2008
@@ -17,7 +17,9 @@
  *  under the License.
  *
  */
-package org.safehaus.asyncweb.util;
+package org.apache.asyncweb.server.util;
+
+import org.apache.asyncweb.server.util.PermitExpirationListener;
 
 /**
  * Issues permits for accessing objects for a limited period of time.
@@ -50,6 +52,6 @@
      *
      * @param listener  The listener
      */
-    public void addPermitExpirationListener(PermitExpirationListener listener);
+    public void addPermitExpirationListener( PermitExpirationListener listener);
 
 }

Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/TimedPermitIssuer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/util/TimedPermitIssuer.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/util/LinkedPermitIssuerTest.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/util/LinkedPermitIssuerTest.java?rev=615512&r1=615511&r2=615512&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/util/LinkedPermitIssuerTest.java (original)
+++ mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/util/LinkedPermitIssuerTest.java Sat Jan 26 14:04:40 2008
@@ -23,6 +23,9 @@
 import java.util.List;
 
 import junit.framework.TestCase;
+import org.apache.asyncweb.server.util.LinkedPermitIssuer;
+import org.apache.asyncweb.server.util.TimedPermit;
+import org.apache.asyncweb.server.util.PermitExpirationListener;
 
 /**
  * Tests <code>LinkedPermitIssuer</code>
@@ -148,7 +151,8 @@
      *
      * @author irvingd
      */
-    private class MockListener implements PermitExpirationListener {
+    private class MockListener implements PermitExpirationListener
+    {
 
         private List<Object> expectedToExpire = new ArrayList<Object>();