geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r567816 - in /geronimo/sandbox/AsyncHttpClient: pom.xml src/main/java/org/apache/ahc/HttpIoHandler.java src/test/java/org/apache/ahc/AbstractTest.java
Date Mon, 20 Aug 2007 20:19:59 GMT
Author: jgenender
Date: Mon Aug 20 13:19:58 2007
New Revision: 567816

URL: http://svn.apache.org/viewvc?rev=567816&view=rev
Log:
Move around directories

Modified:
    geronimo/sandbox/AsyncHttpClient/pom.xml
    geronimo/sandbox/AsyncHttpClient/src/main/java/org/apache/ahc/HttpIoHandler.java
    geronimo/sandbox/AsyncHttpClient/src/test/java/org/apache/ahc/AbstractTest.java

Modified: geronimo/sandbox/AsyncHttpClient/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/AsyncHttpClient/pom.xml?rev=567816&r1=567815&r2=567816&view=diff
==============================================================================
--- geronimo/sandbox/AsyncHttpClient/pom.xml (original)
+++ geronimo/sandbox/AsyncHttpClient/pom.xml Mon Aug 20 13:19:58 2007
@@ -109,27 +109,6 @@
                     <target>1.5</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <copy todir="target/var/catalina/conf" file="src/test/catalina/var/catalina/conf/web.xml"
/>
-                                <copy todir="target/var/catalina/conf" file="src/test/catalina/var/catalina/conf/keystore"
/>
-                                rcopy todir="target/var/catalina/conf" file="src/test/catalina/var/catalina/conf/keystore"
/>
-                                <copy todir="target/var/catalina/webapps/ROOT" file="src/test/catalina/var/catalina/webapps/ROOT/index.jsp"
/>
-                                <copy todir="target/var/catalina/webapps/ROOT" file="src/test/catalina/var/catalina/webapps/ROOT/pwrd_apache.gif"
/>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>

Modified: geronimo/sandbox/AsyncHttpClient/src/main/java/org/apache/ahc/HttpIoHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/AsyncHttpClient/src/main/java/org/apache/ahc/HttpIoHandler.java?rev=567816&r1=567815&r2=567816&view=diff
==============================================================================
--- geronimo/sandbox/AsyncHttpClient/src/main/java/org/apache/ahc/HttpIoHandler.java (original)
+++ geronimo/sandbox/AsyncHttpClient/src/main/java/org/apache/ahc/HttpIoHandler.java Mon Aug
20 13:19:58 2007
@@ -32,6 +32,10 @@
         this.callback = callback;
     }
 
+    public void sessionOpened(IoSession ioSession) throws Exception {
+        super.sessionOpened(ioSession);
+    }
+
     public void messageReceived(IoSession ioSession, Object object) throws Exception {
         HttpResponseMessage message = (HttpResponseMessage)object;
         callback.onResponse(message);

Modified: geronimo/sandbox/AsyncHttpClient/src/test/java/org/apache/ahc/AbstractTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/AsyncHttpClient/src/test/java/org/apache/ahc/AbstractTest.java?rev=567816&r1=567815&r2=567816&view=diff
==============================================================================
--- geronimo/sandbox/AsyncHttpClient/src/test/java/org/apache/ahc/AbstractTest.java (original)
+++ geronimo/sandbox/AsyncHttpClient/src/test/java/org/apache/ahc/AbstractTest.java Mon Aug
20 13:19:58 2007
@@ -25,33 +25,36 @@
 import org.apache.catalina.Engine;
 import org.apache.catalina.Host;
 import org.apache.catalina.Context;
+import org.apache.catalina.core.StandardHost;
 
 import java.io.File;
 
 public class AbstractTest extends TestCase {
 
     protected final File BASEDIR = getBaseDir();
-    protected final File CATALINAHOME = new File(BASEDIR,"target/var/catalina");
-    protected final File KEYSTORE = new File(CATALINAHOME,"conf/keystore");
-    protected final File WEBAPPS = new File(CATALINAHOME,"webapps");
+    protected final File CATALINAHOME = new File(BASEDIR, "src/test/catalina");
+    protected final File WORK = new File(BASEDIR, "target/work");
+    protected final File KEYSTORE = new File(CATALINAHOME, "conf/keystore");
+    protected final File WEBAPPS = new File(CATALINAHOME, "webapps");
     protected final File ROOT = new File(WEBAPPS, "ROOT");
     protected Embedded server;
 
-   protected void setUp() throws Exception {
+    protected void setUp() throws Exception {
         System.out.println("BASEDIR = " + BASEDIR.getAbsolutePath());
         server = new Embedded();
         server.setCatalinaHome(CATALINAHOME.getAbsolutePath());
 
         Engine engine = server.createEngine();
         engine.setDefaultHost("localhost");
-        
+
         Host host = server.createHost("localhost", WEBAPPS.getAbsolutePath());
+        ((StandardHost) host).setWorkDir(WORK.getAbsolutePath());
         engine.addChild(host);
 
         Context context = server.createContext("", ROOT.getAbsolutePath());
         context.setParentClassLoader(Thread.currentThread().getContextClassLoader());
         host.addChild(context);
-        
+
         server.addEngine(engine);
 
         //Http
@@ -78,8 +81,7 @@
         String tmp = System.getProperty("basedir");
         if (tmp != null) {
             dir = new File(tmp);
-        }
-        else {
+        } else {
             // Find the directory which this class (or really the sub-class of TestSupport)
is defined in.
             String path = getClass().getProtectionDomain().getCodeSource().getLocation().getFile();
 



Mime
View raw message