You are viewing a plain text version of this content. The canonical link for it is here.
Posted to kato-commits@incubator.apache.org by sp...@apache.org on 2009/06/17 06:30:39 UTC
svn commit: r785482 - in
/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks:
./ src/main/java/org/apache/kato/anttasks/tcklistbuilder/ target/
target/maven-archiver/
Author: spoole
Date: Wed Jun 17 06:30:38 2009
New Revision: 785482
URL: http://svn.apache.org/viewvc?rev=785482&view=rev
Log:
updated anttask pom to build using ant 1.7 etc
Added:
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks/target/
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks/target/maven-archiver/
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks/target/maven-archiver/pom.properties
Modified:
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks/pom.xml
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/tcklistbuilder/TCKSelectionExpressionEvaluator.java
Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks/pom.xml?rev=785482&r1=785481&r2=785482&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks/pom.xml (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks/pom.xml Wed Jun 17 06:30:38 2009
@@ -1,13 +1,69 @@
-<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>
- <artifactId>kato</artifactId>
- <groupId>org.apache.kato</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.kato</groupId>
- <artifactId>kato.anttasks</artifactId>
- <name>Ant Tasks</name>
- <version>0.0.1-SNAPSHOT</version>
- <description>Ant Tasks for TCK and other misc activities</description>
+<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>
+ <artifactId>kato</artifactId>
+ <groupId>org.apache.kato</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.kato</groupId>
+ <artifactId>kato.anttasks</artifactId>
+ <name>Ant Tasks</name>
+ <version>0.0.1-SNAPSHOT</version>
+ <description>Ant Tasks for TCK and other misc activities</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ant-plugin</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.6</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+
+
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/tcklistbuilder/TCKSelectionExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/tcklistbuilder/TCKSelectionExpressionEvaluator.java?rev=785482&r1=785481&r2=785482&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/tcklistbuilder/TCKSelectionExpressionEvaluator.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/tcklistbuilder/TCKSelectionExpressionEvaluator.java Wed Jun 17 06:30:38 2009
@@ -28,7 +28,7 @@
}
- public boolean evaluate(TCKSelectionExpression expression,Map values) {
+ public boolean evaluate(TCKSelectionExpression expression,Map<String,String> values) {
report(expression);
boolean result=evaluate0(expression, values);
@@ -45,7 +45,7 @@
}
- private boolean evaluate0(TCKSelectionExpression expression,Map values) {
+ private boolean evaluate0(TCKSelectionExpression expression,Map<String,String> values) {
if(expression instanceof OrExpression ) {
@@ -67,7 +67,7 @@
TCKSelectionEnvironmentExpression e=(TCKSelectionEnvironmentExpression) expression;
- Object value=values.get(e.key);
+ String value=values.get(e.key);
report(e.key+" is "+value+" (check is "+TCKSelectionExpression.getOperatorValue(e.operator));
Added: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks/target/maven-archiver/pom.properties
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks/target/maven-archiver/pom.properties?rev=785482&view=auto
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks/target/maven-archiver/pom.properties (added)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.anttasks/target/maven-archiver/pom.properties Wed Jun 17 06:30:38 2009
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Wed Jun 17 07:26:24 BST 2009
+version=0.0.1-SNAPSHOT
+groupId=org.apache.kato
+artifactId=kato.anttasks