abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmsn...@apache.org
Subject svn commit: r663818 - in /incubator/abdera/java/trunk: build/build.xml extensions/pom.xml
Date Fri, 06 Jun 2008 04:26:35 GMT
Author: jmsnell
Date: Thu Jun  5 21:26:35 2008
New Revision: 663818

URL: http://svn.apache.org/viewvc?rev=663818&view=rev
Log:
https://issues.apache.org/jira/browse/ABDERA-172 - Missing easymock dependency in Ant target
'init'.

Modified:
    incubator/abdera/java/trunk/build/build.xml
    incubator/abdera/java/trunk/extensions/pom.xml

Modified: incubator/abdera/java/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/build/build.xml?rev=663818&r1=663817&r2=663818&view=diff
==============================================================================
--- incubator/abdera/java/trunk/build/build.xml (original)
+++ incubator/abdera/java/trunk/build/build.xml Thu Jun  5 21:26:35 2008
@@ -178,6 +178,8 @@
           <available file="${dependencies}/${jetty-util.jar}" />
           <available file="${dependencies}/${htmlparser.jar}" />
           <available file="${dependencies}/${htmlserializer.jar}" />
+          <available file="${dependencies}/${easymock.jar}" />
+          <available file="${dependencies}/${easymockclassextension.jar}" />
         </and>
       </not>
     </condition>
@@ -344,7 +346,7 @@
     <echo>Make sure the example code compiles...</echo>
     <mkdir dir="${examples.work}" />
     <javac srcdir="${examples.src}" destdir="${examples.work}" classpathref="jar.dependencies"

-      classpath="${core.work};${parser.work};${client.work};${server.work};${extensions.work}/gdata;${extensions.work}/main;${security.work};${extensions.work}/sharing;${extensions.work}/geo;${extensions.work}/serializer"
debug="${debug}">
+      classpath="${core.work};${parser.work};${client.work};${server.work};${extensions.work}/gdata;${extensions.work}/main;${security.work};${extensions.work}/sharing;${extensions.work}/geo;${extensions.work}/serializer;${extensions.work}/features"
debug="${debug}">
       <exclude unless="do.security" name="**/security/*.java" />
     </javac>
     <delete dir="${examples.work}" />
@@ -690,7 +692,7 @@
   </target>
   
   
-  <target name="compile.extensions" depends="init, compile.core, compile.parser, compile.dependencies,
compile.client">
+  <target name="compile.extensions" depends="init, compile.core, compile.parser, compile.dependencies,
compile.client, compile.server">
     <mkdir dir="${extensions.work}" />
     
     <antcall target="compile.extension">
@@ -736,6 +738,10 @@
     <antcall target="compile.extension">
       <param name="ext" value="serializer" />
     </antcall>
+
+    <antcall target="compile.extension">
+      <param name="ext" value="features" />
+    </antcall>
     
   </target>
   
@@ -823,6 +829,10 @@
     <antcall target="dist.extension">
       <param name="ext" value="serializer" />
     </antcall>
+
+    <antcall target="dist.extension">
+      <param name="ext" value="features" />
+    </antcall>
     
   </target>
   
@@ -885,6 +895,10 @@
     <antcall target="test.extension">
       <param name="ext" value="serializer" />
     </antcall>
+
+    <antcall target="test.extension">
+      <param name="ext" value="features" />
+    </antcall>
     
   </target>
   
@@ -941,6 +955,10 @@
     <antcall target="retro.extension">
       <param name="ext" value="serializer" />
     </antcall>
+
+    <antcall target="retro.extension">
+      <param name="ext" value="features" />
+    </antcall>
     
   </target>
   

Modified: incubator/abdera/java/trunk/extensions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/extensions/pom.xml?rev=663818&r1=663817&r2=663818&view=diff
==============================================================================
--- incubator/abdera/java/trunk/extensions/pom.xml (original)
+++ incubator/abdera/java/trunk/extensions/pom.xml Thu Jun  5 21:26:35 2008
@@ -14,34 +14,36 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<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">
-	<parent>
-		<groupId>org.apache.abdera</groupId>
-		<artifactId>abdera</artifactId>
-		<version>0.5.0-incubating-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>abdera-extensions-parent</artifactId>
-	<packaging>pom</packaging>
-	<name>Abdera Extensions</name>
-	<version>0.5.0-incubating-SNAPSHOT</version>
-	<description>Abdera Extensions</description>
-
-  <properties>
-    <topDir>${basedir}/..</topDir>
-  </properties>
-  
-	<modules>
-    <module>gdata</module>
-		<module>geo</module>
-    <module>html</module>
-    <module>json</module>
-    <module>main</module>
-    <module>media</module>
-    <module>oauth</module>
-    <module>opensearch</module>
-    <module>serializer</module>
-    <module>sharing</module>
-    <module>wsse</module>	</modules>
-
-</project>
\ No newline at end of file
+<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">
+	<parent>
+		<groupId>org.apache.abdera</groupId>
+		<artifactId>abdera</artifactId>
+		<version>0.5.0-incubating-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>abdera-extensions-parent</artifactId>
+	<packaging>pom</packaging>
+	<name>Abdera Extensions</name>
+	<version>0.5.0-incubating-SNAPSHOT</version>
+	<description>Abdera Extensions</description>
+
+  <properties>
+    <topDir>${basedir}/..</topDir>
+  </properties>
+  
+	<modules>
+    <module>gdata</module>
+    <module>geo</module>
+    <module>html</module>
+    <module>json</module>
+    <module>main</module>
+    <module>media</module>
+    <module>oauth</module>
+    <module>opensearch</module>
+    <module>serializer</module>
+    <module>sharing</module>
+    <module>wsse</module>
+    <module>features</module>
+	</modules>
+
+</project>



Mime
View raw message