commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbe...@apache.org
Subject svn commit: r996376 - in /commons/sandbox/gsoc/2010/scxml-js/trunk: build-common.xml build.xml mvn-ant-build.xml pom.xml
Date Sun, 12 Sep 2010 19:41:05 GMT
Author: jbeard
Date: Sun Sep 12 19:41:05 2010
New Revision: 996376

URL: http://svn.apache.org/viewvc?rev=996376&view=rev
Log:
Added selenium java driver to dependencies. Unit testing with selenium from ant script now
works.

Modified:
    commons/sandbox/gsoc/2010/scxml-js/trunk/build-common.xml
    commons/sandbox/gsoc/2010/scxml-js/trunk/build.xml
    commons/sandbox/gsoc/2010/scxml-js/trunk/mvn-ant-build.xml
    commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/build-common.xml?rev=996376&r1=996375&r2=996376&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/build-common.xml (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/build-common.xml Sun Sep 12 19:41:05 2010
@@ -47,10 +47,10 @@
 	<property name="is_for_ie" value="is-for-ie"/>
 	<property name="is_not_for_ie" value="is-not-for-ie"/>
 
-	<property name="backends" value="switch,table,state"/>
 	<!--
-	<property name="backends" value="switch"/>
+	<property name="backends" value="switch,table,state"/>
 	-->
+	<property name="backends" value="switch"/>
 	<property name="browsers" value="firefox,chrome"/>
 	<!--
 	<property name="browsers" value="firefox,${ie_browser_name},chrome"/>
@@ -119,6 +119,11 @@
 	<available property="rhino-available" filepath="rhino-classpath"/>
 	-->
 
+	<condition property="isWindows">
+		<os family="windows" />
+	</condition>
+
+
 	<target name="download-dependencies" depends="setup-antcontrib">
 		<mkdir dir="${tmp-dir}"/>
 

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/build.xml?rev=996376&r1=996375&r2=996376&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/build.xml (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/build.xml Sun Sep 12 19:41:05 2010
@@ -34,7 +34,9 @@
 	<artifact:pom id="mypom" file="pom.xml" />
 	<artifact:dependencies pathId="maven.compile.classpath" pomRefId="mypom" />
 
-	<!-- TODO: try and read the plugin dependencies -->
+	<artifact:remoteRepository id="openqa-releases" url="http://nexus.openqa.org/content/repositories/releases"
/>
+
+	<!-- TODO: attempt better integration with pom.xml, so we do not need to duplicate ant
plugin depencies here -->
 	<artifact:dependencies pathId="maven.plugin.classpath">
 		<artifact:dependency groupId="bsf" artifactId="bsf" version="2.4.0"/>
 		<artifact:dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1"/>
@@ -43,6 +45,9 @@
 		</artifact:dependency>
 		<!--<artifact:dependency groupId="org.apache.maven" artifactId="maven-ant-tasks"
version="2.1.1"/>-->
 		<artifact:dependency groupId="xalan" artifactId="xalan" version="2.7.0"/>
+		<artifact:dependency groupId="org.seleniumhq.selenium.client-drivers" artifactId="selenium-java-client-driver"
version="1.0.1"/>
+
+		<artifact:remoteRepository refid="openqa-releases" />
 	</artifact:dependencies>
 
 	<import file="mvn-ant-build.xml"/>
@@ -152,13 +157,13 @@
 		</for>
 	</target>
 
-	<target name="run-unit-tests-with-selenium" depends="generate-unit-test-html,generate-javascript">
+	<target name="run-unit-tests-with-selenium" depends="generate-unit-test-html,generate-javascript"
if="isWindows">
 		<run-unit-tests-with-selenium-macro 
 			unit-tests-html-property-name="unit-test-html-location"/>
 	</target>
 
 
-	<target name="run-in-browser-unit-tests-with-selenium" depends="preprocess-stylesheets,generate-in-browser-unit-test-html">
+	<target name="run-in-browser-unit-tests-with-selenium" depends="preprocess-stylesheets,generate-in-browser-unit-test-html"
if="isWindows">
 		<run-unit-tests-with-selenium-macro 
 			unit-tests-html-property-name="in-browser-unit-test-html-location"/>
 	</target>

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/mvn-ant-build.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/mvn-ant-build.xml?rev=996376&r1=996375&r2=996376&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/mvn-ant-build.xml (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/mvn-ant-build.xml Sun Sep 12 19:41:05 2010
@@ -70,8 +70,4 @@
 		</java>
 		<move file="${build-js}/${build-class-main-name}.class" todir="${build-class}"/>
 	</target>
-
-
-
 </project>
-

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml?rev=996376&r1=996375&r2=996376&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml Sun Sep 12 19:41:05 2010
@@ -25,6 +25,34 @@
   </parent>
 
 
+    <repositories>
+        <repository>
+            <id>openqa-releases</id>
+            <name>Openqa Release Repository</name>
+            <url>http://nexus.openqa.org/content/repositories/releases</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+        <repository>
+            <id>openqa-snapshots</id>
+            <name>Openqa Snapshot Repository</name>
+            <url>http://nexus.openqa.org/content/repositories/snapshots</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
 
   <name>Commons SCXML JavaScript (Sandbox)</name>
   <groupId>commons-scxml</groupId>
@@ -210,6 +238,19 @@
         </executions>
 	<dependencies>
 		<dependency>
+			<groupId>org.seleniumhq.selenium.client-drivers</groupId>
+			<artifactId>selenium-java-client-driver</artifactId>
+			<version>1.0.1</version>
+		</dependency>
+		<!--
+		<dependency>
+		    <groupId>org.seleniumhq.selenium.server</groupId>
+		    <artifactId>selenium-server</artifactId>
+		    <version>1.0.3</version>
+		    <classifier>standalone</classifier>
+		</dependency>
+		-->
+		<dependency>
 			<groupId>bsf</groupId>
 			<artifactId>bsf</artifactId>
 			<version>2.4.0</version>



Mime
View raw message