Browse Source

xzresource task - PR 60350

master
Stefan Bodewig 8 years ago
parent
commit
fe327c78c4
6 changed files with 118 additions and 0 deletions
  1. +1
    -0
      build.xml
  2. +1
    -0
      src/etc/poms/ant-xz/pom.xml
  3. +1
    -0
      src/etc/poms/ant/pom.xml
  4. +1
    -0
      src/main/org/apache/tools/ant/types/defaults.properties
  5. +77
    -0
      src/main/org/apache/tools/ant/types/optional/xz/XzResource.java
  6. +37
    -0
      src/tests/antunit/types/optional/xz/xzresource-test.xml

+ 1
- 0
build.xml View File

@@ -295,6 +295,7 @@
<selector id="needs.xz"> <selector id="needs.xz">
<or> <or>
<filename name="${optional.package}/xz/"/> <filename name="${optional.package}/xz/"/>
<filename name="${type.package}/optional/xz/"/>
</or> </or>
</selector> </selector>




+ 1
- 0
src/etc/poms/ant-xz/pom.xml View File

@@ -57,6 +57,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<configuration> <configuration>
<includes> <includes>
<include>org/apache/tools/ant/taskdefs/optional/xz/*</include> <include>org/apache/tools/ant/taskdefs/optional/xz/*</include>
<include>org/apache/tools/ant/types/optional/xz/*</include>
</includes> </includes>
</configuration> </configuration>
</plugin> </plugin>


+ 1
- 0
src/etc/poms/ant/pom.xml View File

@@ -98,6 +98,7 @@
<configuration> <configuration>
<excludes> <excludes>
<exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude> <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
<exclude>org/apache/tools/ant/types/optional/xz/*</exclude>
<exclude>org/apache/tools/ant/types/resolver/**</exclude> <exclude>org/apache/tools/ant/types/resolver/**</exclude>
<exclude>org/apache/tools/ant/listener/Log4jListener*</exclude> <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
<exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude> <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>


+ 1
- 0
src/main/org/apache/tools/ant/types/defaults.properties View File

@@ -94,6 +94,7 @@ bzip2resource=org.apache.tools.ant.types.resources.BZip2Resource
javaresource=org.apache.tools.ant.types.resources.JavaResource javaresource=org.apache.tools.ant.types.resources.JavaResource
multirootfileset=org.apache.tools.ant.types.resources.MultiRootFileSet multirootfileset=org.apache.tools.ant.types.resources.MultiRootFileSet
javaconstant=org.apache.tools.ant.types.resources.JavaConstantResource javaconstant=org.apache.tools.ant.types.resources.JavaConstantResource
xzresource=org.apache.tools.ant.types.optional.xz.XzResource


#tokenizer implementations #tokenizer implementations
linetokenizer=org.apache.tools.ant.util.LineTokenizer linetokenizer=org.apache.tools.ant.util.LineTokenizer


+ 77
- 0
src/main/org/apache/tools/ant/types/optional/xz/XzResource.java View File

@@ -0,0 +1,77 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.tools.ant.types.optional.xz;

import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import org.apache.tools.ant.types.resources.CompressedResource;
import org.tukaani.xz.LZMA2Options;
import org.tukaani.xz.XZInputStream;
import org.tukaani.xz.XZOutputStream;

/**
* A XZ compressed resource.
*
* <p>Wraps around another resource, delegates all queries to that
* other resource but uncompresses/compresses streams on the fly.</p>
*
* @since Ant 1.10.1
*/
public class XzResource extends CompressedResource {

/** A no-arg constructor */
public XzResource() {
}

/**
* Constructor with another resource to wrap.
* @param other the resource to wrap.
*/
public XzResource(org.apache.tools.ant.types.ResourceCollection other) {
super(other);
}

/**
* Decompress on the fly using java.util.zip.XZInputStream.
* @param in the stream to wrap.
* @return the wrapped stream.
* @throws IOException if there is a problem.
*/
protected InputStream wrapStream(InputStream in) throws IOException {
return new XZInputStream(in);
}

/**
* Compress on the fly using java.util.zip.XZOutStream.
* @param out the stream to wrap.
* @return the wrapped stream.
* @throws IOException if there is a problem.
*/
protected OutputStream wrapStream(OutputStream out) throws IOException {
return new XZOutputStream(out, new LZMA2Options());
}

/**
* Get the name of the compression method.
* @return the string "XZ".
*/
protected String getCompressionName() {
return "XZ";
}
}

+ 37
- 0
src/tests/antunit/types/optional/xz/xzresource-test.xml View File

@@ -0,0 +1,37 @@
<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">

<import file="../../../antunit-base.xml" />

<target name="setup">
<mkdir dir="${output}"/>
<available property="xz.present" classname="org.tukaani.xz.XZOutputStream"/>
</target>

<target name="testDocumentationClaimsOnCopy">
<copy todir="${output}">
<xzresource>
<file file="../../../../../etc/testcases/taskdefs/expected/asf-logo.gif.xz"/>
</xzresource>
<mapper type="glob" from="*.xz" to="*"/>
</copy>
<au:assertFilesMatch expected="../../../../../etc/testcases/asf-logo.gif"
actual="${output}/asf-logo.gif"/>
</target>
</project>

Loading…
Cancel
Save