You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ad...@apache.org on 2009/12/15 05:57:23 UTC
svn commit: r890643 - in /mina/sandbox/adc/ahc: api/pom.xml mina2/pom.xml
mina2/src/test/java/org/apache/ahc/client/EquipmentStackTest.java
mina3/pom.xml
mina3/src/test/java/org/apache/ahc/client/EquipmentStackTest.java pom.xml
Author: adc
Date: Tue Dec 15 04:57:23 2009
New Revision: 890643
URL: http://svn.apache.org/viewvc?rev=890643&view=rev
Log:
Intermediate re-org
Modified:
mina/sandbox/adc/ahc/api/pom.xml
mina/sandbox/adc/ahc/mina2/pom.xml
mina/sandbox/adc/ahc/mina2/src/test/java/org/apache/ahc/client/EquipmentStackTest.java
mina/sandbox/adc/ahc/mina3/pom.xml
mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/client/EquipmentStackTest.java
mina/sandbox/adc/ahc/pom.xml
Modified: mina/sandbox/adc/ahc/api/pom.xml
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/pom.xml?rev=890643&r1=890642&r2=890643&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/pom.xml (original)
+++ mina/sandbox/adc/ahc/api/pom.xml Tue Dec 15 04:57:23 2009
@@ -28,14 +28,10 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>client</artifactId>
- <name>Apache Asynchronous HTTP Client</name>
+ <artifactId>api</artifactId>
+ <name>Apache Asynchronous HTTP Client :: API</name>
<packaging>jar</packaging>
<build/>
- <properties>
- <minaVersion>2.0.0-RC1</minaVersion>
- </properties>
-
</project>
Modified: mina/sandbox/adc/ahc/mina2/pom.xml
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/pom.xml?rev=890643&r1=890642&r2=890643&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/pom.xml (original)
+++ mina/sandbox/adc/ahc/mina2/pom.xml Tue Dec 15 04:57:23 2009
@@ -23,35 +23,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>4</version>
+ <groupId>org.apache.ahc</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.ahc</groupId>
- <artifactId>client</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <name>Apache Asynchronous HTTP Client</name>
+ <artifactId>mina2</artifactId>
+ <name>Apache Asynchronous HTTP Client :: Mina 2</name>
<packaging>jar</packaging>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- <source>1.5</source>
- <target>1.5</target>
- <debug>true</debug>
- <optimize>true</optimize>
- <showDeprecations>true</showDeprecations>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
+ <build/>
<properties>
<minaVersion>2.0.0-RC1</minaVersion>
@@ -60,10 +41,8 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
+ <groupId>org.apache.ahc</groupId>
+ <artifactId>api</artifactId>
</dependency>
<dependency>
Modified: mina/sandbox/adc/ahc/mina2/src/test/java/org/apache/ahc/client/EquipmentStackTest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/test/java/org/apache/ahc/client/EquipmentStackTest.java?rev=890643&r1=890642&r2=890643&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/test/java/org/apache/ahc/client/EquipmentStackTest.java (original)
+++ mina/sandbox/adc/ahc/mina2/src/test/java/org/apache/ahc/client/EquipmentStackTest.java Tue Dec 15 04:57:23 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ahc.client;
+package org.apache.ahc.mina2;
import java.util.EmptyStackException;
import java.util.Set;
Modified: mina/sandbox/adc/ahc/mina3/pom.xml
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/pom.xml?rev=890643&r1=890642&r2=890643&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/pom.xml (original)
+++ mina/sandbox/adc/ahc/mina3/pom.xml Tue Dec 15 04:57:23 2009
@@ -23,55 +23,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>4</version>
+ <groupId>org.apache.ahc</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.ahc</groupId>
- <artifactId>client</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <name>Apache Asynchronous HTTP Client</name>
+ <artifactId>mina3</artifactId>
+ <name>Apache Asynchronous HTTP Client :: Mina 3</name>
<packaging>jar</packaging>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- <source>1.5</source>
- <target>1.5</target>
- <debug>true</debug>
- <optimize>true</optimize>
- <showDeprecations>true</showDeprecations>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <properties>
- <minaVersion>2.0.0-RC1</minaVersion>
- </properties>
+ <build/>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>${minaVersion}</version>
+ <groupId>org.apache.ahc</groupId>
+ <artifactId>api</artifactId>
</dependency>
</dependencies>
-
+
</project>
Modified: mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/client/EquipmentStackTest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/client/EquipmentStackTest.java?rev=890643&r1=890642&r2=890643&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/client/EquipmentStackTest.java (original)
+++ mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/client/EquipmentStackTest.java Tue Dec 15 04:57:23 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ahc.client;
+package org.apache.ahc.mina3;
import java.util.EmptyStackException;
import java.util.Set;
Modified: mina/sandbox/adc/ahc/pom.xml
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/pom.xml?rev=890643&r1=890642&r2=890643&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/pom.xml (original)
+++ mina/sandbox/adc/ahc/pom.xml Tue Dec 15 04:57:23 2009
@@ -21,55 +21,61 @@
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>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>6</version>
- </parent>
-
- <groupId>org.apache.ahc</groupId>
- <artifactId>project</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <name>Apache Asynchronous HTTP Client</name>
- <packaging>pom</packaging>
-
- <modules>
- <module>api</module>
- <module>mina2</module>
- <module>mina3</module>
- </modules>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- <source>1.5</source>
- <target>1.5</target>
- <debug>true</debug>
- <optimize>true</optimize>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>6</version>
+ </parent>
+
+ <groupId>org.apache.ahc</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>Apache Asynchronous HTTP Client</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>api</module>
+ <module>mina2</module>
+ <module>mina3</module>
+ </modules>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <source>1.5</source>
+ <target>1.5</target>
+ <debug>true</debug>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ahc</groupId>
+ <artifactId>api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
- </dependencies>
- </dependencyManagement>
+ </dependencies>
+ </dependencyManagement>
</project>