Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo?rev=782119&r1=782118&r2=782119&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo Fri Jun 5 19:55:15 2009 @@ -21,8 +21,8 @@ Modello currently does not have capability to share files --> -<model xsd.namespace="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0"; - xsd.target-namespace="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0";> +<model xsd.namespace="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.1"; + xsd.targetNamespace="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.1";> <id>component</id> <name>Component</name> @@ -101,7 +101,7 @@ </field> <field> <name>repositories</name> - <version>1.1.0</version> + <version>1.1.0+</version> <association> <type>Repository</type> <multiplicity>*</multiplicity> @@ -116,7 +116,7 @@ </field> <field> <name>containerDescriptorHandlers</name> - <version>1.1.0</version> + <version>1.1.0+</version> <association> <type>ContainerDescriptorHandlerConfig</type> <multiplicity>*</multiplicity> @@ -137,7 +137,7 @@ <fields> <field> <name>useStrictFiltering</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>boolean</type> <defaultValue>false</defaultValue> <description> @@ -149,7 +149,7 @@ </field> <field> <name>useDefaultExcludes</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>boolean</type> <defaultValue>true</defaultValue> <description> @@ -273,7 +273,7 @@ </field> <field> <name>filtered</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description> Whether to filter symbols in the files as they are copied, using properties from the build configuration. @@ -402,7 +402,7 @@ </field> <field> <name>unpackOptions</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description> Allows the specification of includes and excludes, along with filtering options, for items unpacked from a dependency artifact. @@ -424,7 +424,7 @@ </field> <field> <name>useProjectArtifact</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>boolean</type> <defaultValue>true</defaultValue> <description><![CDATA[ @@ -435,7 +435,7 @@ </field> <field> <name>useProjectAttachments</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>boolean</type> <defaultValue>false</defaultValue> <description><![CDATA[ @@ -445,7 +445,7 @@ </field> <field> <name>useTransitiveDependencies</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>boolean</type> <defaultValue>true</defaultValue> <description> @@ -459,7 +459,7 @@ </field> <field> <name>useTransitiveFiltering</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>boolean</type> <defaultValue>false</defaultValue> <description> @@ -477,13 +477,13 @@ <class> <name>Repository</name> - <version>1.1.0</version> + <version>1.1.0+</version> <superClass>SetBase</superClass> <description>Defines a Maven repository to be included in the assembly.</description> <fields> <field> <name>includeMetadata</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>boolean</type> <defaultValue>false</defaultValue> <description> @@ -494,7 +494,7 @@ </field> <field> <name>groupVersionAlignments</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description>Align a group to a version or an individual artifact.</description> <association> <type>GroupVersionAlignment</type> @@ -503,7 +503,7 @@ </field> <field> <name>scope</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>String</type> <defaultValue>runtime</defaultValue> <required>true</required> @@ -516,24 +516,24 @@ </class> <class> <name>GroupVersionAlignment</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description>Defines a Maven repository to be included in the assembly.</description> <fields> <field> <name>id</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>String</type> <description>The groupId for which you want to align the versions.</description> </field> <field> <name>version</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>String</type> <description>The version you want to align this group to.</description> </field> <field> <name>excludes</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description>Artifact Ids of the artifacts you want excluded from version alignment.</description> <association> <type>String</type> @@ -544,14 +544,14 @@ </class> <class> <name>UnpackOptions</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description> Specifies options for including/excluding/filtering items extracted from an archive. </description> <fields> <field> <name>includes</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description> Set of patterns for matching items to be included from an archive as it is unpacked. </description> @@ -562,7 +562,7 @@ </field> <field> <name>excludes</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description> Set of patterns for matching items to be excluded from an archive as it is unpacked. </description> @@ -573,7 +573,7 @@ </field> <field> <name>filtered</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description> Whether to filter symbols in the files as they are unpacked from the archive, using properties from the build configuration. @@ -585,7 +585,7 @@ </class> <class> <name>ContainerDescriptorHandlerConfig</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description> Configures a filter for files headed into the assembly archive, to enable aggregation of various types of descriptor fragments, such as components.xml, @@ -594,23 +594,21 @@ <fields> <field> <name>handlerName</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description> The handler's plexus role-hint, for lookup from the container. </description> <type>String</type> <required>true</required> </field> - <!-- Commented out until it can be implemented and tested... <field> <name>configuration</name> - <version>1.1.0</version> + <version>1.1.1</version> <description> Configuration options for the handler. </description> <type>DOM</type> </field> - --> </fields> </class> </classes>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo?rev=782119&r1=782118&r2=782119&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo Fri Jun 5 19:55:15 2009 @@ -23,8 +23,8 @@ to "component.mdo". --> -<model xsd.namespace="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; - xsd.target-namespace="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";> +<model xsd.namespace="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"; + xsd.targetNamespace="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1";> <id>assembly</id> <name>Assembly</name> @@ -120,7 +120,7 @@ </field> <field> <name>baseDirectory</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>String</type> <description> Sets the base directory of the resulting assembly archive. If this is not @@ -140,7 +140,7 @@ </field> <field> <name>containerDescriptorHandlers</name> - <version>1.1.0</version> + <version>1.1.0+</version> <association> <type>ContainerDescriptorHandlerConfig</type> <multiplicity>*</multiplicity> @@ -256,7 +256,7 @@ <fields> <field> <name>useStrictFiltering</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>boolean</type> <defaultValue>false</defaultValue> <description> @@ -268,7 +268,7 @@ </field> <field> <name>useDefaultExcludes</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>boolean</type> <defaultValue>true</defaultValue> <description> @@ -392,7 +392,7 @@ </field> <field> <name>filtered</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description> Whether to filter symbols in the files as they are copied, using properties from the build configuration. (Since 2.2) @@ -520,7 +520,7 @@ </field> <field> <name>unpackOptions</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description> Allows the specification of includes and excludes, along with filtering options, for items unpacked from a dependency artifact. (Since 2.2) @@ -542,7 +542,7 @@ </field> <field> <name>useProjectArtifact</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>boolean</type> <defaultValue>true</defaultValue> <description><![CDATA[ @@ -553,7 +553,7 @@ </field> <field> <name>useProjectAttachments</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>boolean</type> <defaultValue>false</defaultValue> <description><![CDATA[ @@ -563,7 +563,7 @@ </field> <field> <name>useTransitiveDependencies</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>boolean</type> <defaultValue>true</defaultValue> <description> @@ -577,7 +577,7 @@ </field> <field> <name>useTransitiveFiltering</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>boolean</type> <defaultValue>false</defaultValue> <description> @@ -610,7 +610,7 @@ <fields> <field> <name>includeSubModules</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>boolean</type> <defaultValue>true</defaultValue> <description> @@ -686,7 +686,7 @@ <fields> <field> <name>fileSets</name> - <version>1.1.0</version> + <version>1.1.0+</version> <association> <type>FileSet</type> <multiplicity>*</multiplicity> @@ -700,7 +700,7 @@ </field> <field> <name>includeModuleDirectory</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>boolean</type> <defaultValue>true</defaultValue> <description> @@ -712,7 +712,7 @@ </field> <field> <name>excludeSubModuleDirectories</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>boolean</type> <defaultValue>true</defaultValue> <description> @@ -727,7 +727,7 @@ </field> <field> <name>outputDirectoryMapping</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>String</type> <defaultValue>${module.artifactId}</defaultValue> <description> @@ -750,7 +750,7 @@ <fields> <field> <name>attachmentClassifier</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>String</type> <description> When specified, the attachmentClassifier will cause the assembler to look at artifacts @@ -772,7 +772,7 @@ </field> <field> <name>dependencySets</name> - <version>1.1.0</version> + <version>1.1.0+</version> <association> <type>DependencySet</type> <multiplicity>*</multiplicity> @@ -799,7 +799,7 @@ </field> <field> <name>unpackOptions</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description> Allows the specification of includes and excludes, along with filtering options, for items unpacked from a module artifact. (Since 2.2) @@ -869,7 +869,7 @@ </field> <field> <name>scope</name> - <version>1.1.0</version> + <version>1.1.0+</version> <type>String</type> <defaultValue>runtime</defaultValue> <required>true</required> @@ -924,14 +924,14 @@ </class> <class> <name>UnpackOptions</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description> Specifies options for including/excluding/filtering items extracted from an archive. (Since 2.2) </description> <fields> <field> <name>includes</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description> Set of patterns for matching items to be included from an archive as it is unpacked. (Since 2.2) </description> @@ -942,7 +942,7 @@ </field> <field> <name>excludes</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description> Set of patterns for matching items to be excluded from an archive as it is unpacked. (Since 2.2) </description> @@ -953,7 +953,7 @@ </field> <field> <name>filtered</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description> Whether to filter symbols in the files as they are unpacked from the archive, using properties from the build configuration. (Since 2.2) @@ -965,7 +965,7 @@ </class> <class> <name>ContainerDescriptorHandlerConfig</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description> Configures a filter for files headed into the assembly archive, to enable aggregation of various types of descriptor fragments, such as components.xml, @@ -974,23 +974,21 @@ <fields> <field> <name>handlerName</name> - <version>1.1.0</version> + <version>1.1.0+</version> <description> The handler's plexus role-hint, for lookup from the container. </description> <type>String</type> <required>true</required> </field> - <!-- Commented out until it can be implemented and tested... <field> <name>configuration</name> - <version>1.1.0</version> + <version>1.1.1</version> <description> Configuration options for the handler. </description> <type>DOM</type> </field> - --> </fields> </class> </classes> Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml?rev=782119&r1=782118&r2=782119&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml Fri Jun 5 19:55:15 2009 @@ -42,6 +42,13 @@ </component> <component> + <role>org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler</role> + <role-hint>file-aggregator</role-hint> + <implementation>org.apache.maven.plugin.assembly.filter.SimpleAggregatingDescriptorHandler</implementation> + <instantiation-strategy>per-lookup</instantiation-strategy> + </component> + + <component> <role>org.apache.maven.artifact.handler.ArtifactHandler</role> <role-hint>assembly-component</role-hint> <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation> Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/bin.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/bin.xml?rev=782119&r1=782118&r2=782119&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/bin.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/bin.xml Fri Jun 5 19:55:15 2009 @@ -29,18 +29,24 @@ </formats> <fileSets> <fileSet> + <directory>${project.basedir}</directory> + <outputDirectory>/</outputDirectory> <includes> - <include>${project.basedir}/README*</include> - <include>${project.basedir}/LICENSE*</include> - <include>${project.basedir}/NOTICE*</include> + <include>README*</include> + <include>LICENSE*</include> + <include>NOTICE*</include> </includes> </fileSet> - <!-- TODO: docs? --> <fileSet> <directory>${project.build.directory}</directory> + <outputDirectory>/</outputDirectory> <includes> <include>*.jar</include> </includes> </fileSet> + <fileSet> + <directory>${project.build.directory}/site</directory> + <outputDirectory>docs</outputDirectory> + </fileSet> </fileSets> </assembly> Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml?rev=782119&r1=782118&r2=782119&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml Fri Jun 5 19:55:15 2009 @@ -37,6 +37,7 @@ <fileSets> <fileSet> <directory>${project.build.outputDirectory}</directory> + <outputDirectory>/</outputDirectory> </fileSet> </fileSets> </assembly> Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/project.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/project.xml?rev=782119&r1=782118&r2=782119&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/project.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/project.xml Fri Jun 5 19:55:15 2009 @@ -30,8 +30,10 @@ <fileSets> <fileSet> <directory>${project.basedir}</directory> + <outputDirectory>/</outputDirectory> <useDefaultExcludes>true</useDefaultExcludes> <excludes> + <exclude>**/*.log</exclude> <exclude>**/${project.build.directory}/**</exclude> </excludes> </fileSet> Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/src.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/src.xml?rev=782119&r1=782118&r2=782119&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/src.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/src.xml Fri Jun 5 19:55:15 2009 @@ -29,11 +29,12 @@ </formats> <fileSets> <fileSet> + <directory>${project.basedir}</directory> <includes> - <include>${project.basedir}/README*</include> - <include>${project.basedir}/LICENSE*</include> - <include>${project.basedir}/NOTICE*</include> - <include>${project.basedir}/pom.xml</include> + <include>README*</include> + <include>LICENSE*</include> + <include>NOTICE*</include> + <include>pom.xml</include> </includes> <useDefaultExcludes>true</useDefaultExcludes> </fileSet> Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt?rev=782119&r1=782118&r2=782119&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt Fri Jun 5 19:55:15 2009 @@ -256,6 +256,52 @@ included in archives, unless your goal is to create project binaries or similar.> +* Using Regular Expressions to Exclude Files + + <<Since: 2.2-beta-4>> + + Sometimes, you may find you need to specify an extremely fine-grained inclusion or + exclusion pattern for a <<<fileSet>>>. In these cases, you have the option of specifying + your pattern in the form of a regular expression by using the <<<%regex[...]>>> syntax. + + <Note:> For completeness, the default pattern type - Ant-style patterns - can also be + specified using the new <<<%ant[...]>>> syntax. This will allow room for future expansion + of <<<fileSet>>> patterns, including the option to change the default pattern syntax + someday. + +** Example: Including directories named <<<target>>> in the <<<src>>> directory + + In this example, we want to produce a buildable source distribution of a + Maven project hierarchy. Obviously, each project's <<<target>>> directory is + a temporary workspace for the build process, so we want to exclude these + directories. However, if one or more of the projects also includes a subdirectory + named <<<target>>> in the <<<src>>> directory structure - perhaps as part of + a Java package name - we want to make sure the files in this directory are + included in the assembly. + +--- +<assembly> + [...] + <fileSets> + <fileSet> + <directory>${project.basedir}</directory> + <outputDirectory>/</outputDirectory> + <excludes> + <exclude>%regex[(?!.*src/).*target.*]</exclude> + </excludes> + </fileSet> + [...] + </fileSets> + [...] +</assembly> +--- + + The above <<<fileSet>>> uses a somewhat obscure feature of regular + expressions called <negative lookahead>, which means our exclude pattern + will only match paths that contain the word <<<target>>> but <<don't>> + contain <<<src>>>. Effectively, any <<<target>>> directory within the + <<<src>>> directory structure will be preserved in the assembly. + * Using Strict-Filtering to Catch Obsolete Patterns or Incorrect Builds At times, you want to build in a set of sanity checks when creating your Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt?rev=782119&r1=782118&r2=782119&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt Fri Jun 5 19:55:15 2009 @@ -113,7 +113,9 @@ * Assembly Descriptor Schemas (XSD) - * {{{http://maven.apache.org/xsd/assembly-1.1.0.xsd}http://maven.apache.org/xsd/assembly-1.1.0.xsd}} (for version 2.2 and higher) + * {{{http://maven.apache.org/xsd/assembly-1.1.1.xsd}http://maven.apache.org/xsd/assembly-1.1.1.xsd}} (for version 2.2-beta-4 and higher) + + * {{{http://maven.apache.org/xsd/assembly-1.1.0.xsd}http://maven.apache.org/xsd/assembly-1.1.0.xsd}} (for version 2.2-beta-3 and lower) * {{{http://maven.apache.org/xsd/assembly-1.0.0.xsd}http://maven.apache.org/xsd/assembly-1.0.0.xsd}} (for versions 2.1 and lower) Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java?rev=782119&r1=782118&r2=782119&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java Fri Jun 5 19:55:15 2009 @@ -703,6 +703,9 @@ protected void execute() throws ArchiverException, IOException { + defaultDirMode = getOverrideDirectoryMode(); + defaultFileMode = getOverrideFileMode(); + archiveCreated = true; super.createArchive(); } @@ -719,18 +722,6 @@ super.setCompression( mode ); } - public void setDefaultDirectoryMode( int mode ) - { - defaultDirMode = mode; - super.setDefaultDirectoryMode( mode ); - } - - public void setDefaultFileMode( int mode ) - { - defaultFileMode = mode; - super.setDefaultFileMode( mode ); - } - public void setLongfile( TarLongFileMode mode ) { longFileMode = mode; @@ -930,6 +921,34 @@ { } + public int getDirectoryMode() + { + return 0; + } + + public int getFileMode() + { + return 0; + } + + public int getOverrideDirectoryMode() + { + return 0; + } + + public int getOverrideFileMode() + { + return 0; + } + + public void setDirectoryMode( int mode ) + { + } + + public void setFileMode( int mode ) + { + } + } } Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java?rev=782119&r1=782118&r2=782119&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java Fri Jun 5 19:55:15 2009 @@ -294,20 +294,20 @@ void expectModeChange( int defaultDirMode, int defaultFileMode, int dirMode, int fileMode, boolean expectTwoSets ) { - archiver.getDefaultDirectoryMode(); + archiver.getOverrideDirectoryMode(); control.setReturnValue( defaultDirMode ); - archiver.getDefaultFileMode(); + archiver.getOverrideFileMode(); control.setReturnValue( defaultFileMode ); if ( expectTwoSets ) { - archiver.setDefaultDirectoryMode( dirMode ); - archiver.setDefaultFileMode( fileMode ); + archiver.setDirectoryMode( dirMode ); + archiver.setFileMode( fileMode ); } - archiver.setDefaultDirectoryMode( defaultDirMode ); - archiver.setDefaultFileMode( defaultFileMode ); + archiver.setDirectoryMode( defaultDirMode ); + archiver.setFileMode( defaultFileMode ); } // public void expectAddFile( File file, String outputLocation, int fileMode ) Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java?rev=782119&r1=782118&r2=782119&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java Fri Jun 5 19:55:15 2009 @@ -172,20 +172,34 @@ private void configureModeExpectations( int defaultDirMode, int defaultFileMode, int dirMode, int fileMode, boolean expectTwoSets ) { - archiver.getDefaultDirectoryMode(); + archiver.getOverrideDirectoryMode(); archiverControl.setReturnValue( defaultDirMode ); - archiver.getDefaultFileMode(); + archiver.getOverrideFileMode(); archiverControl.setReturnValue( defaultFileMode ); if ( expectTwoSets ) { - archiver.setDefaultDirectoryMode( dirMode ); - archiver.setDefaultFileMode( fileMode ); + if ( dirMode > -1 ) + { + archiver.setDirectoryMode( dirMode ); + } + + if ( fileMode > -1 ) + { + archiver.setFileMode( fileMode ); + } } - archiver.setDefaultDirectoryMode( defaultDirMode ); - archiver.setDefaultFileMode( defaultFileMode ); + if ( dirMode > -1 ) + { + archiver.setDirectoryMode( defaultDirMode ); + } + + if ( fileMode > -1 ) + { + archiver.setFileMode( defaultFileMode ); + } } } Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java?rev=782119&r1=782118&r2=782119&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java Fri Jun 5 19:55:15 2009 @@ -207,9 +207,9 @@ macTask.expectGetProject( null ); - macTask.archiver.getDefaultDirectoryMode(); + macTask.archiver.getOverrideDirectoryMode(); macTask.archiverCtl.setReturnValue( -1 ); - macTask.archiver.getDefaultFileMode(); + macTask.archiver.getOverrideFileMode(); macTask.archiverCtl.setReturnValue( -1 ); MavenProject project = new MavenProject( new Model() ); Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java?rev=782119&r1=782118&r2=782119&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java Fri Jun 5 19:55:15 2009 @@ -110,10 +110,10 @@ public void expectModeChange( int originalDirMode, int originalFileMode, int dirMode, int fileMode, int numberOfChanges ) { - archiver.getDefaultDirectoryMode(); + archiver.getOverrideDirectoryMode(); archiverCtl.setReturnValue( originalDirMode ); - archiver.getDefaultFileMode(); + archiver.getOverrideFileMode(); archiverCtl.setReturnValue( originalFileMode ); // one of the changes will occur below, when we restore the original mode. @@ -121,13 +121,27 @@ { for( int i = 1; i< numberOfChanges; i++ ) { - archiver.setDefaultDirectoryMode( dirMode ); - archiver.setDefaultFileMode( fileMode ); + if ( dirMode > -1 ) + { + archiver.setDirectoryMode( dirMode ); + } + + if ( fileMode > -1 ) + { + archiver.setFileMode( fileMode ); + } } } - archiver.setDefaultDirectoryMode( originalDirMode ); - archiver.setDefaultFileMode( originalFileMode ); + if ( dirMode > -1 ) + { + archiver.setDirectoryMode( originalDirMode ); + } + + if ( fileMode > -1 ) + { + archiver.setFileMode( originalFileMode ); + } } public void expectAddFile( File file, String outputLocation, int fileMode ) Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java?rev=782119&r1=782118&r2=782119&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java Fri Jun 5 19:55:15 2009 @@ -121,10 +121,10 @@ public void expectModeChange( int originalDirMode, int originalFileMode, int dirMode, int fileMode, int numberOfChanges ) { - archiver.getDefaultDirectoryMode(); + archiver.getOverrideDirectoryMode(); archiverCtl.setReturnValue( originalDirMode ); - archiver.getDefaultFileMode(); + archiver.getOverrideFileMode(); archiverCtl.setReturnValue( originalFileMode ); // one of the changes will occur below, when we restore the original mode. @@ -132,13 +132,13 @@ { for( int i = 1; i< numberOfChanges; i++ ) { - archiver.setDefaultDirectoryMode( dirMode ); - archiver.setDefaultFileMode( fileMode ); + archiver.setDirectoryMode( dirMode ); + archiver.setFileMode( fileMode ); } } - archiver.setDefaultDirectoryMode( originalDirMode ); - archiver.setDefaultFileMode( originalFileMode ); + archiver.setDirectoryMode( originalDirMode ); + archiver.setFileMode( originalFileMode ); } public void expectAddFile( File file, String outputLocation ) Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java?rev=782119&r1=782118&r2=782119&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java Fri Jun 5 19:55:15 2009 @@ -54,15 +54,15 @@ configSourceCtl = MockControl.createControl( AssemblerConfigurationSource.class ); mockManager.add( configSourceCtl ); - configSource = ( AssemblerConfigurationSource ) configSourceCtl.getMock(); + configSource = (AssemblerConfigurationSource) configSourceCtl.getMock(); archiverCtl = MockControl.createControl( Archiver.class ); mockManager.add( archiverCtl ); - archiver = ( Archiver ) archiverCtl.getMock(); + archiver = (Archiver) archiverCtl.getMock(); archiveBaseDir = fileManager.createTempDir(); - + configSource.getMavenSession(); configSourceCtl.setReturnValue( null, MockControl.ZERO_OR_MORE ); } @@ -81,23 +81,37 @@ public void expectModeChanges( int[] modes, int modeChangeCount ) { - archiver.getDefaultDirectoryMode(); + archiver.getOverrideDirectoryMode(); archiverCtl.setReturnValue( modes[0] ); - archiver.getDefaultFileMode(); + archiver.getOverrideFileMode(); archiverCtl.setReturnValue( modes[1] ); if ( modeChangeCount > 1 ) { for ( int i = 1; i < modeChangeCount; i++ ) { - archiver.setDefaultDirectoryMode( modes[2] ); - archiver.setDefaultFileMode( modes[3] ); + if ( modes[2] > -1 ) + { + archiver.setDirectoryMode( modes[2] ); + } + + if ( modes[3] > -1 ) + { + archiver.setFileMode( modes[3] ); + } } } - archiver.setDefaultDirectoryMode( modes[0] ); - archiver.setDefaultFileMode( modes[1] ); + if ( modes[2] > -1 ) + { + archiver.setDirectoryMode( modes[0] ); + } + + if ( modes[3] > -1 ) + { + archiver.setFileMode( modes[1] ); + } } public void expectAdditionOfSingleFileSet( MavenProject project, File basedir, String finalName, @@ -116,10 +130,10 @@ // the logger sends a debug message with this info inside the addFileSet(..) method.. if ( isDebugEnabled ) { - archiver.getDefaultDirectoryMode(); + archiver.getOverrideDirectoryMode(); archiverCtl.setReturnValue( modes[0] ); - archiver.getDefaultFileMode(); + archiver.getOverrideFileMode(); archiverCtl.setReturnValue( modes[1] ); } @@ -161,7 +175,7 @@ configSource.getMavenSession(); configSourceCtl.setReturnValue( session, MockControl.ONE_OR_MORE ); } - + public void expectGetFinalName( String finalName ) { configSource.getFinalName(); Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java?rev=782119&r1=782118&r2=782119&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java Fri Jun 5 19:55:15 2009 @@ -573,6 +573,36 @@ public void setDuplicateBehavior( String duplicate ) { } + + public int getDirectoryMode() + { + throw new UnsupportedOperationException( "not supported" ); + } + + public int getFileMode() + { + throw new UnsupportedOperationException( "not supported" ); + } + + public int getOverrideDirectoryMode() + { + throw new UnsupportedOperationException( "not supported" ); + } + + public int getOverrideFileMode() + { + throw new UnsupportedOperationException( "not supported" ); + } + + public void setDirectoryMode( int mode ) + { + throw new UnsupportedOperationException( "not supported" ); + } + + public void setFileMode( int mode ) + { + throw new UnsupportedOperationException( "not supported" ); + } } }
