You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ve...@apache.org on 2010/05/14 12:51:25 UTC
svn commit: r944198 - in /webservices/commons/trunk/modules/axiom: ./
modules/axiom-api/ modules/axiom-c14n/
modules/axiom-c14n/src/test/java/org/apache/axiom/c14n/impl/
modules/axiom-dom/ modules/axiom-impl/
Author: veithen
Date: Fri May 14 10:51:24 2010
New Revision: 944198
URL: http://svn.apache.org/viewvc?rev=944198&view=rev
Log:
* Set the parent of the root POM to org.apache:apache:7 and removed redundant stuff from POMs (legal files are now added automatically).
* Work around an illegal usage of new String(byte[]) in the unit tests of the c14n module.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-c14n/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-c14n/src/test/java/org/apache/axiom/c14n/impl/Canonicalizer20010315OmitCommentTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
webservices/commons/trunk/modules/axiom/pom.xml
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml?rev=944198&r1=944197&r2=944198&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml Fri May 14 10:51:24 2010
@@ -76,14 +76,6 @@
</dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>${project.build.directory}/legal-files</directory>
- </resource>
- </resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
@@ -94,28 +86,6 @@
</testResources>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-legal-files</id>
- <phase>generate-resources</phase>
- <configuration>
- <tasks>
- <copy todir="${project.build.directory}/legal-files">
- <fileset dir="../..">
- <include name="LICENSE.txt" />
- <include name="NOTICE.txt" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<version>1.2</version>
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-c14n/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-c14n/pom.xml?rev=944198&r1=944197&r2=944198&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-c14n/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-c14n/pom.xml Fri May 14 10:51:24 2010
@@ -47,38 +47,8 @@
</dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>${project.build.directory}/legal-files</directory>
- </resource>
- </resources>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-legal-files</id>
- <phase>generate-resources</phase>
- <configuration>
- <tasks>
- <copy todir="${project.build.directory}/legal-files">
- <fileset dir="../..">
- <include name="LICENSE.txt" />
- <include name="NOTICE.txt" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-c14n/src/test/java/org/apache/axiom/c14n/impl/Canonicalizer20010315OmitCommentTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-c14n/src/test/java/org/apache/axiom/c14n/impl/Canonicalizer20010315OmitCommentTest.java?rev=944198&r1=944197&r2=944198&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-c14n/src/test/java/org/apache/axiom/c14n/impl/Canonicalizer20010315OmitCommentTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-c14n/src/test/java/org/apache/axiom/c14n/impl/Canonicalizer20010315OmitCommentTest.java Fri May 14 10:51:24 2010
@@ -72,7 +72,7 @@ public class Canonicalizer20010315OmitCo
// get the canonicalized byte[]
bytes = c14n.canonicalize(dp.getBytes());
// check against sample6Result
- assertEquals(sample6Result, new String(bytes));
+ assertEquals(sample6Result, new String(bytes, "UTF-8"));
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml?rev=944198&r1=944197&r2=944198&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml Fri May 14 10:51:24 2010
@@ -84,38 +84,8 @@
</dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>${project.build.directory}/legal-files</directory>
- </resource>
- </resources>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-legal-files</id>
- <phase>generate-resources</phase>
- <configuration>
- <tasks>
- <copy todir="${project.build.directory}/legal-files">
- <fileset dir="../..">
- <include name="LICENSE.txt" />
- <include name="NOTICE.txt" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml?rev=944198&r1=944197&r2=944198&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml Fri May 14 10:51:24 2010
@@ -84,38 +84,8 @@
</dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>${project.build.directory}/legal-files</directory>
- </resource>
- </resources>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-legal-files</id>
- <phase>generate-resources</phase>
- <configuration>
- <tasks>
- <copy todir="${project.build.directory}/legal-files">
- <fileset dir="../..">
- <include name="LICENSE.txt" />
- <include name="NOTICE.txt" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
Modified: webservices/commons/trunk/modules/axiom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/pom.xml?rev=944198&r1=944197&r2=944198&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/pom.xml Fri May 14 10:51:24 2010
@@ -19,6 +19,11 @@
-->
<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.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>7</version>
+ </parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
<name>Axiom</name>