You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ni...@apache.org on 2007/10/20 13:20:18 UTC

svn commit: r586703 - in /mina/trunk: pom.xml statemachine/pom.xml

Author: niklas
Date: Sat Oct 20 04:20:16 2007
New Revision: 586703

URL: http://svn.apache.org/viewvc?rev=586703&view=rev
Log:
Resolved DIRMINA-457: mina-sm from sandbox has now been imported into trunk as the statemachine module.

Modified:
    mina/trunk/pom.xml
    mina/trunk/statemachine/pom.xml

Modified: mina/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/pom.xml?rev=586703&r1=586702&r2=586703&view=diff
==============================================================================
--- mina/trunk/pom.xml (original)
+++ mina/trunk/pom.xml Sat Oct 20 04:20:16 2007
@@ -113,6 +113,11 @@
         <artifactId>mina-integration-spring</artifactId>
         <version>${pom.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.mina</groupId>
+        <artifactId>mina-statemachine</artifactId>
+        <version>${pom.version}</version>
+      </dependency>
 
       <!-- Transport -->
       <dependency>
@@ -162,6 +167,13 @@
         </exclusions>
       </dependency>
 
+      <!-- State Machine -->
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>2.1</version>
+      </dependency>
+
       <!-- Logging -->
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -200,6 +212,11 @@
         <artifactId>easymockclassextension</artifactId>
         <version>2.2.2</version>
       </dependency>
+      <dependency>
+        <groupId>com.agical.rmock</groupId>
+        <artifactId>rmock</artifactId>
+        <version>2.0.2</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -242,6 +259,11 @@
       <artifactId>easymockclassextension</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.agical.rmock</groupId>
+      <artifactId>rmock</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <modules>
@@ -257,6 +279,7 @@
     -->
     <module>integration-jmx</module>
     <module>integration-spring</module>
+    <module>statemachine</module>
     <module>example</module>
   </modules>
   

Modified: mina/trunk/statemachine/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/pom.xml?rev=586703&r1=586702&r2=586703&view=diff
==============================================================================
--- mina/trunk/statemachine/pom.xml (original)
+++ mina/trunk/statemachine/pom.xml Sat Oct 20 04:20:16 2007
@@ -1,71 +1,26 @@
-<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>
-    <groupId>org.apache.mina</groupId>
-    <artifactId>build</artifactId>
-    <version>1.1.0</version>
-  </parent>
-  <artifactId>mina-sm</artifactId>
-  <name>Apache MINA State Machine Module</name>
-  <version>0.0.1-SNAPSHOT</version>
-  <inceptionYear>2006</inceptionYear>
-
-  <url>http://directory.apache.org/projects/mina/</url>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>org.apache.mina</groupId>
-      <artifactId>mina-core</artifactId>
-      <version>1.1.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.1</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.agical.rmock</groupId>
-      <artifactId>rmock</artifactId>
-      <version>2.0.0-rc-6</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-          <debug>true</debug>
-          <optimize>true</optimize>
-          <showDeprecations>true</showDeprecations>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-          </excludes>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.mina</groupId>
+    <artifactId>build</artifactId>
+    <version>2.0.0-M1-SNAPSHOT</version>
+  </parent>
+  <artifactId>mina-statemachine</artifactId>
+  <name>Apache MINA State Machine</name>
+  <packaging>bundle</packaging>  
+  <properties>
+    <exportedPackage>${groupId}.statemachine</exportedPackage>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>${groupId}</groupId>
+      <artifactId>mina-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+  </dependencies>
+</project>
+