You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/09/13 04:01:10 UTC
svn commit: r575140 - in /mina/trunk: ./ filter-codec-http/
mina-filter-codec-http/ mina-protocol-client-http/
mina-protocol-server-http/ protocol-client-http/
protocol-client-http/src/test/java/org/apache/mina/http/client/
protocol-server-http/
Author: trustin
Date: Wed Sep 12 19:01:08 2007
New Revision: 575140
URL: http://svn.apache.org/viewvc?rev=575140&view=rev
Log:
* Removed mina- prefix from module directory names like other existing submodules
* Cleaned up poms
Added:
mina/trunk/filter-codec-http/
- copied from r575136, mina/trunk/mina-filter-codec-http/
mina/trunk/protocol-client-http/
- copied from r575136, mina/trunk/mina-protocol-client-http/
mina/trunk/protocol-server-http/
- copied from r575136, mina/trunk/mina-protocol-server-http/
Removed:
mina/trunk/mina-filter-codec-http/
mina/trunk/mina-protocol-client-http/
mina/trunk/mina-protocol-server-http/
Modified:
mina/trunk/filter-codec-http/pom.xml
mina/trunk/pom.xml
mina/trunk/protocol-client-http/pom.xml
mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/FakeIoSession.java
mina/trunk/protocol-server-http/pom.xml
Modified: mina/trunk/filter-codec-http/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/pom.xml?rev=575140&r1=575136&r2=575140&view=diff
==============================================================================
--- mina/trunk/filter-codec-http/pom.xml (original)
+++ mina/trunk/filter-codec-http/pom.xml Wed Sep 12 19:01:08 2007
@@ -1,31 +1,23 @@
-<?xml version="1.0"?><project>
+<?xml version="1.0"?>
+<project>
<parent>
<artifactId>build</artifactId>
<groupId>org.apache.mina</groupId>
<version>2.0.0-M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.mina.http.codec</groupId>
<artifactId>mina-filter-codec-http</artifactId>
<name>mina-filter-codec-http</name>
- <version>2.0.0-M1-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: mina/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/pom.xml?rev=575140&r1=575139&r2=575140&view=diff
==============================================================================
--- mina/trunk/pom.xml (original)
+++ mina/trunk/pom.xml Wed Sep 12 19:01:08 2007
@@ -88,15 +88,15 @@
<modules>
<module>core</module>
- <module>filter-codec-netty</module>
+ <module>transport-serial</module>
<module>filter-compression</module>
+ <module>filter-codec-netty</module>
+ <module>filter-codec-http</module>
+ <module>protocol-client-http</module>
+ <module>protocol-server-http</module>
<module>integration-spring</module>
<module>integration-jmx</module>
<module>example</module>
- <module>transport-serial</module>
- <module>mina-filter-codec-http</module>
- <module>mina-protocol-client-http</module>
- <module>mina-protocol-server-http</module>
</modules>
<build>
Modified: mina/trunk/protocol-client-http/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/protocol-client-http/pom.xml?rev=575140&r1=575136&r2=575140&view=diff
==============================================================================
--- mina/trunk/protocol-client-http/pom.xml (original)
+++ mina/trunk/protocol-client-http/pom.xml Wed Sep 12 19:01:08 2007
@@ -17,99 +17,83 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>build</artifactId>
<groupId>org.apache.mina</groupId>
- <artifactId>mina-protocol-client-http</artifactId>
- <packaging>jar</packaging>
<version>2.0.0-M1-SNAPSHOT</version>
- <name>Apache MINA Asynch HTTP Client</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.mina.http.codec</groupId>
- <artifactId>mina-filter-codec-http</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.4.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>6.0.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>coyote</artifactId>
- <version>6.0.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>servlet-api</artifactId>
- <version>6.0.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.extras</groupId>
- <artifactId>juli-adapters</artifactId>
- <version>6.0.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jasper</artifactId>
- <version>6.0.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jasper-jdt</artifactId>
- <version>6.0.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>mina-protocol-client-http</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache MINA Asynch HTTP Client</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-filter-codec-http</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>6.0.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>coyote</artifactId>
+ <version>6.0.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>6.0.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.extras</groupId>
+ <artifactId>juli-adapters</artifactId>
+ <version>6.0.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper</artifactId>
+ <version>6.0.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper-jdt</artifactId>
+ <version>6.0.13</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/FakeIoSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/FakeIoSession.java?rev=575140&r1=575136&r2=575140&view=diff
==============================================================================
--- mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/FakeIoSession.java (original)
+++ mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/FakeIoSession.java Wed Sep 12 19:01:08 2007
@@ -258,13 +258,13 @@
}
- public int getScheduledWriteRequests()
+ public long getScheduledWriteRequests()
{
return 0;
}
- public int getScheduledWriteBytes()
+ public long getScheduledWriteBytes()
{
return 0;
}
Modified: mina/trunk/protocol-server-http/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/protocol-server-http/pom.xml?rev=575140&r1=575136&r2=575140&view=diff
==============================================================================
--- mina/trunk/protocol-server-http/pom.xml (original)
+++ mina/trunk/protocol-server-http/pom.xml Wed Sep 12 19:01:08 2007
@@ -1,21 +1,13 @@
-<?xml version="1.0"?><project>
+<?xml version="1.0"?>
+<project>
<parent>
<artifactId>build</artifactId>
<groupId>org.apache.mina</groupId>
<version>2.0.0-M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.mina.http.server</groupId>
<artifactId>mina-protocol-server-http</artifactId>
<name>mina-protocol-server-http</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
<dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>