Title: [waffle-scm] [79] trunk: Renamed extensions/acceptance to extensions/taglib-acceptance.
Revision
79
Author
mauro
Date
2007-05-24 04:54:32 -0500 (Thu, 24 May 2007)

Log Message

Renamed extensions/acceptance to extensions/taglib-acceptance.

Modified Paths


Added Paths

Removed Paths

Diff

Modified: trunk/extensions/taglib/pom.xml (78 => 79)

--- trunk/extensions/taglib/pom.xml	2007-05-24 09:49:51 UTC (rev 78)
+++ trunk/extensions/taglib/pom.xml	2007-05-24 09:54:32 UTC (rev 79)
@@ -16,7 +16,6 @@
             <artifactId>waffle</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jsp-api</artifactId>

Copied: trunk/extensions/taglib-acceptance (from rev 77, trunk/extensions/acceptance) ( => )

Deleted: trunk/extensions/taglib-acceptance/pom.xml
===================================================================
--- trunk/extensions/acceptance/pom.xml	2007-05-24 08:03:24 UTC (rev 77)
+++ trunk/extensions/taglib-acceptance/pom.xml	2007-05-24 09:54:32 UTC (rev 79)
@@ -1,171 +0,0 @@
-<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.codehaus.waffle</groupId>
-        <artifactId>waffle-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <packaging>war</packaging>
-    <artifactId>waffle-acceptance</artifactId>
-    <name>Waffle Acceptance</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>waffle</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>waffle-taglib</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jsp-api</artifactId>
-            <scope>compile</scope>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.openqa.selenium.client-drivers</groupId>
-            <artifactId>selenium-java-client-driver</artifactId>
-            <version>0.9.2-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-
-            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <configuration>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.cargo</groupId>
-                <artifactId>cargo-maven2-plugin</artifactId>
-                <!--				<version>0.3-SNAPSHOT</version>-->
-                <executions>
-                    <execution>
-                        <id>start-container</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start</goal>
-                        </goals>
-                        <configuration>
-                            <wait>false</wait>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>stop-container</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>stop</goal>
-                        </goals>
-                        <configuration>
-                            <wait>false</wait>
-                        </configuration>
-                    </execution>
-                </executions>
-                <configuration>
-                    <container>
-                        <containerId>jetty6x</containerId>
-                        <type>embedded</type>
-                    </container>
-                    <deployables>
-                        <deployable>
-                            <properties>
-                                <context>waffle</context>
-                            </properties>
-                            <pingURL>
-                                http://localhost:8080/cargocpc/index.html
-                            </pingURL>
-                        </deployable>
-                    </deployables>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>selenium-maven-plugin</artifactId>
-                <version>1.0-beta-1</version>
-                <executions>
-                    <execution>
-                        <id>start-selenium</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-server</goal>
-                        </goals>
-                        <configuration>
-                            <background>true</background>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <testFailureIgnore>true</testFailureIgnore>
-                    <skip>true</skip>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>run integration tests</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <skip>false</skip>
-                            <includes>
-                                <include>
-                                    **/acceptance/**/*Test.java
-                                </include>
-                            </includes>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>run unitary tests</id>
-                        <phase>test</phase>
-                        <goals>
-
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <skip>false</skip>
-                            <includes>
-                                <include>
-                                    **/utest/**/*Test.java
-                                </include>
-                            </includes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
-</project>

Copied: trunk/extensions/taglib-acceptance/pom.xml (from rev 78, trunk/extensions/acceptance/pom.xml) (0 => 79)

--- trunk/extensions/taglib-acceptance/pom.xml	                        (rev 0)
+++ trunk/extensions/taglib-acceptance/pom.xml	2007-05-24 09:54:32 UTC (rev 79)
@@ -0,0 +1,178 @@
+<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.codehaus.waffle</groupId>
+    <artifactId>waffle-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <packaging>war</packaging>
+  <artifactId>waffle-acceptance</artifactId>
+  <name>Waffle Acceptance</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>waffle</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>waffle-taglib</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+      <scope>compile</scope>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>taglibs</groupId>
+      <artifactId>standard</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.openqa.selenium.client-drivers</groupId>
+      <artifactId>selenium-java-client-driver</artifactId>
+      <version>0.9.2-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <configuration>
+          <scanIntervalSeconds>10</scanIntervalSeconds>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.cargo</groupId>
+        <artifactId>cargo-maven2-plugin</artifactId>
+        <!--<version>0.3-SNAPSHOT</version>-->
+        <executions>
+          <execution>
+            <id>start-container</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>start</goal>
+            </goals>
+            <configuration>
+              <wait>false</wait>
+            </configuration>
+          </execution>
+          <execution>
+            <id>stop-container</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+            <configuration>
+              <wait>false</wait>
+            </configuration>
+          </execution>
+        </executions>
+        <configuration>
+          <container>
+            <containerId>jetty6x</containerId>
+            <type>embedded</type>
+          </container>
+          <deployables>
+            <deployable>
+              <properties>
+                <context>waffle</context>
+              </properties>
+              <pingURL>http://localhost:8080/cargocpc/index.html</pingURL>
+            </deployable>
+          </deployables>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>selenium-maven-plugin</artifactId>
+        <version>1.0-beta-1</version>
+        <executions>
+          <execution>
+            <id>start-selenium</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>start-server</goal>
+            </goals>
+            <configuration>
+              <background>true</background>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <testFailureIgnore>true</testFailureIgnore>
+          <skip>true</skip>
+        </configuration>
+        <executions>
+          <execution>
+            <id>run integration tests</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <configuration>
+              <skip>false</skip>
+              <systemProperties>
+                <property>
+                  <name>seleniumBrowserString</name>
+                  <value>*firefox ${firefox.bin}</value>
+                </property>
+                <property>
+                  <name>seleniumContextPath</name>
+                  <value>/${pom.artifactId}-${pom.version}/</value>
+                </property>
+              </systemProperties>
+              <includes>
+                <include>**/acceptance/**/*Test.java</include>
+              </includes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <properties>
+    <firefox.bin>/usr/lib/firefox/firefox-bin</firefox.bin>
+  </properties>
+
+  <profiles>
+    <profile>
+      <id>macosx</id>
+      <activation>
+        <os>
+          <name>Mac OS X</name>
+        </os>
+      </activation>
+      <properties>
+        <firefox.bin>/Applications/Firefox.app/Contents/MacOS/firefox-bin</firefox.bin>
+      </properties>
+    </profile>
+
+  </profiles>
+
+</project>

Copied: trunk/extensions/taglib-acceptance/src (from rev 78, trunk/extensions/acceptance/src) ( => )

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2007-05-24 09:49:51 UTC (rev 78)
+++ trunk/pom.xml	2007-05-24 09:54:32 UTC (rev 79)
@@ -17,7 +17,7 @@
     <module>core</module>
     <module>extensions/webcontainer</module>
     <module>extensions/taglib</module>
-    <module>extensions/acceptance</module>
+    <module>extensions/taglib-acceptance</module>
   </modules>
 
   <dependencyManagement>


To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to