commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbe...@apache.org
Subject svn commit: r996398 - in /commons/sandbox/gsoc/2010/scxml-js/trunk: build-common.xml build.xml pom.xml
Date Sun, 12 Sep 2010 23:48:47 GMT
Author: jbeard
Date: Sun Sep 12 23:48:46 2010
New Revision: 996398

URL: http://svn.apache.org/viewvc?rev=996398&view=rev
Log:
Refactored maven.compile.classpath to be maven.runtime.classpath. Made all previous compile-time
dependencies runtime dependencies, as I felt this was more accurate.

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/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=996398&r1=996397&r2=996398&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 23:48:46 2010
@@ -17,15 +17,6 @@
 -->
 <project name="scxml-js-common" basedir=".">
 
-	<!-- compile_classpath and plugin_classpath properties get provided by maven or ant,

-		depending on whether maven is used as the entry point, or ant is -->
-	<!-- TODO: refactor path id maven.compile.classpath to maven.runtime.classpath -->
-	<!-- TODO: get rid of this -->
-	<!--
-	<path location="${compile_classpath}" id="maven.compile.classpath"/>
-	<path location="${plugin_classpath}" id="maven.plugin.classpath"/>
-	-->
-
 	<!-- location properties -->
 	<property name="src" value="src"/>
 
@@ -288,7 +279,7 @@
 			<java classname="org.mozilla.javascript.tools.shell.Main" output="@{out-path}" fork="true">
 				<classpath>
 					<path refid="maven.plugin.classpath"/>
-					<path refid="maven.compile.classpath"/>
+					<path refid="maven.runtime.classpath"/>
 				</classpath>
 
 				<arg value="${basedir}/runner.js"/>
@@ -314,7 +305,7 @@
 			<java classname="org.mozilla.javascript.tools.shell.Main" output="@{out-path}" fork="true">
 				<classpath>
 					<path refid="maven.plugin.classpath"/>
-					<path refid="maven.compile.classpath"/>
+					<path refid="maven.runtime.classpath"/>
 				</classpath>
 
 				<arg value="${basedir}/runner.js"/>

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=996398&r1=996397&r2=996398&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/build.xml (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/build.xml Sun Sep 12 23:48:46 2010
@@ -32,7 +32,7 @@
 		classpathref="path-to-maven-ant-tasks" />
 
 	<artifact:pom id="mypom" file="pom.xml" />
-	<artifact:dependencies pathId="maven.compile.classpath" pomRefId="mypom" />
+	<artifact:dependencies pathId="maven.runtime.classpath" pomRefId="mypom" useScope="runtime"
/>
 
 	<artifact:remoteRepository id="openqa-releases" url="http://nexus.openqa.org/content/repositories/releases"
/>
 
@@ -98,7 +98,7 @@
 	<target name="test">
 		<property name="test.plugin.classpath" refid="maven.plugin.classpath"/>
 		<echo>${test.plugin.classpath}</echo>
-		<property name="test.compile.classpath" refid="maven.compile.classpath"/>
+		<property name="test.compile.classpath" refid="maven.runtime.classpath"/>
 		<echo>${test.compile.classpath}</echo>
 	</target>
 	-->

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=996398&r1=996397&r2=996398&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml Sun Sep 12 23:48:46 2010
@@ -112,72 +112,31 @@
     <commons.jira.pid>12310492</commons.jira.pid>
   </properties> 
 
-<!--
-  <repositories>
-    <repository>
-      <id>openqa</id>
-      <url>http://maven.openqa.org</url>
-    </repository>
-  </repositories>
--->
-
-
   <dependencies>
 	<dependency>
 		<groupId>commons-cli</groupId>
 		<artifactId>commons-cli</artifactId>
 		<version>1.2</version>
+		<scope>runtime</scope>
 	</dependency>
 	<dependency>
 		<groupId>xalan</groupId>
 		<artifactId>xalan</artifactId>
 		<version>2.7.0</version>
+		<scope>runtime</scope>
 	</dependency>
 	<dependency>
 		<groupId>xerces</groupId>
 		<artifactId>xercesImpl</artifactId>
 		<version>2.9.1</version>
+		<scope>runtime</scope>
 	</dependency>
 	<dependency>
 		<groupId>xml-apis</groupId>
 		<artifactId>xml-apis</artifactId>
 		<version>2.0.2</version>
-	</dependency>
-
-	<!-- would be very nice if we could pull down rhino as well...
-		we could extend Array.prototype with reduce.
-		or just take it out... -->
-	<!--
-	<dependency>
-		<groupId>rhino</groupId>
-		<artifactId>js</artifactId>
-		<version>1.7R2</version>
 		<scope>runtime</scope>
 	</dependency>
-	-->
-
-	<!-- TODO: start/stop selenium server as part of testing lifecycle -->
-	<!--
-	<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>org.seleniumhq.selenium</groupId>
-		<artifactId>selenium-remote-control</artifactId>
-		<version>1.0.1</version>
-        </dependency>
-	-->
-	
   </dependencies>
 
  <build>



Mime
View raw message