Author: ptahchiev
Date: Wed Feb 4 19:55:31 2009
New Revision: 740845
URL: http://svn.apache.org/viewvc?rev=740845&view=rev
Log:
MSHARED-92 The patch is applied.
Added:
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/mappers/
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/mappers/MapperUtilTest.java
(with props)
Modified:
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java
maven/shared/trunk/file-management/src/main/resources/mappers.properties
Modified:
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java?rev=740845&r1=740844&r2=740845&view=diff
==============================================================================
---
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java
(original)
+++
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java
Wed Feb 4 19:55:31 2009
@@ -33,7 +33,7 @@
*/
public final class MapperUtil
{
- private static final String MAPPER_PROPERTIES = "mapper.properties";
+ private static final String MAPPER_PROPERTIES = "mappers.properties";
private static Properties implementations;
@@ -67,6 +67,7 @@
try
{
props.load( stream );
+ implementations = props;
}
catch ( IOException e )
{
Modified:
maven/shared/trunk/file-management/src/main/resources/mappers.properties
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/resources/mappers.properties?rev=740845&r1=740844&r2=740845&view=diff
==============================================================================
--- maven/shared/trunk/file-management/src/main/resources/mappers.properties
(original)
+++ maven/shared/trunk/file-management/src/main/resources/mappers.properties
Wed Feb 4 19:55:31 2009
@@ -14,10 +14,10 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-identity=org.apache.maven.plugin.assembly.mappers.IdentityMapper
-flatten=org.apache.maven.plugin.assembly.mappers.FlatFileNameMapper
-glob=org.apache.maven.plugin.assembly.mappers.GlobPatternMapper
-merge=org.apache.maven.plugin.assembly.mappers.MergingMapper
-regexp=org.apache.maven.plugin.assembly.mappers.RegexpPatternMapper
-package=org.apache.maven.plugin.assembly.mappers.PackageNameMapper
-unpackage=org.apache.maven.plugin.assembly.mappers.UnPackageNameMapper
+identity=org.apache.maven.shared.model.fileset.mappers.IdentityMapper
+flatten=org.apache.maven.shared.model.fileset.mappers.FlatFileNameMapper
+glob=org.apache.maven.shared.model.fileset.mappers.GlobPatternMapper
+merge=org.apache.maven.shared.model.fileset.mappers.MergingMapper
+regexp=org.apache.maven.shared.model.fileset.mappers.RegexpPatternMapper
+package=org.apache.maven.shared.model.fileset.mappers.PackageNameMapper
+unpackage=org.apache.maven.shared.model.fileset.mappers.UnPackageNameMapper
Added:
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/mappers/MapperUtilTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/mappers/MapperUtilTest.java?rev=740845&view=auto
==============================================================================
---
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/mappers/MapperUtilTest.java
(added)
+++
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/mappers/MapperUtilTest.java
Wed Feb 4 19:55:31 2009
@@ -0,0 +1,77 @@
+package org.apache.maven.shared.model.fileset.mappers;
+
+/*
+ * 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.
+ */
+
+import junit.framework.TestCase;
+
+import org.apache.maven.shared.model.fileset.Mapper;
+
+/**
+ * A test-case for the MapperUtil.
+ *
+ * @version $Id$
+ */
+public class MapperUtilTest
+ extends TestCase
+{
+
+ /**
+ * Test
+ */
+ public void testGetFileNameMapper()
+ {
+ Mapper mapper = null;
+ try
+ {
+ assertNull( MapperUtil.getFileNameMapper( mapper ) );
+ }
+ catch ( MapperException e )
+ {
+ fail( "Unexpected exception " + e );
+ }
+ mapper = new Mapper();
+ try
+ {
+ // default to identity mapper.
+ FileNameMapper fileNameMapper = MapperUtil.getFileNameMapper(
mapper );
+ assertNotNull( fileNameMapper );
+ assertEquals( "/var/some-file.text", fileNameMapper.mapFileName(
"/var/some-file.text" ) );
+ }
+ catch ( MapperException e )
+ {
+ fail( "Unexpected exception " + e );
+ }
+ // check with FileNameMapper type
+ mapper = new Mapper();
+ mapper.setType( "glob" );
+ mapper.setFrom( "*.java" );
+ mapper.setTo( "*.class" );
+ try
+ {
+ FileNameMapper fileNameMapper = MapperUtil.getFileNameMapper(
mapper );
+ assertNotNull( fileNameMapper );
+ assertEquals( "/var/SomeClasses.class",
fileNameMapper.mapFileName( "/var/SomeClasses.java" ) );
+ }
+ catch ( MapperException e )
+ {
+ fail( "Unexpected exception " + e );
+ }
+ }
+}
Propchange:
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/mappers/MapperUtilTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/mappers/MapperUtilTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
