Author: vsiveton
Date: Thu Nov 15 16:01:38 2007
New Revision: 595499
URL: http://svn.apache.org/viewvc?rev=595499&view=rev
Log:
o added new license header
o no code change
Modified:
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/FileNameMapper.java
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/FlatFileNameMapper.java
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/GlobPatternMapper.java
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/IdentityMapper.java
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperException.java
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MergingMapper.java
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/PackageNameMapper.java
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/UnPackageNameMapper.java
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
maven/shared/trunk/file-management/src/main/mdo/fileset.mdo
maven/shared/trunk/file-management/src/main/resources/mappers.properties
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
Modified:
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/FileNameMapper.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/FileNameMapper.java?rev=595499&r1=595498&r2=595499&view=diff
==============================================================================
---
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/FileNameMapper.java
(original)
+++
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/FileNameMapper.java
Thu Nov 15 16:01:38 2007
@@ -1,21 +1,23 @@
+package org.apache.maven.shared.model.fileset.mappers;
+
/*
- * Copyright 2000,2004 The Apache Software Foundation
- *
- * Licensed 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
+ * 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.
+ * 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.maven.shared.model.fileset.mappers;
/**
* Interface to be used by SourceFileScanner.
Modified:
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/FlatFileNameMapper.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/FlatFileNameMapper.java?rev=595499&r1=595498&r2=595499&view=diff
==============================================================================
---
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/FlatFileNameMapper.java
(original)
+++
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/FlatFileNameMapper.java
Thu Nov 15 16:01:38 2007
@@ -1,21 +1,23 @@
+package org.apache.maven.shared.model.fileset.mappers;
+
/*
- * Copyright 2000,2004 The Apache Software Foundation
- *
- * Licensed 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
+ * 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.
+ * 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.maven.shared.model.fileset.mappers;
/**
* Implementation of FileNameMapper that always returns the source
Modified:
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/GlobPatternMapper.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/GlobPatternMapper.java?rev=595499&r1=595498&r2=595499&view=diff
==============================================================================
---
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/GlobPatternMapper.java
(original)
+++
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/GlobPatternMapper.java
Thu Nov 15 16:01:38 2007
@@ -1,21 +1,23 @@
+package org.apache.maven.shared.model.fileset.mappers;
+
/*
- * Copyright 2000,2002,2004-2005 The Apache Software Foundation
- *
- * Licensed 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
+ * 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.
+ * 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.maven.shared.model.fileset.mappers;
/**
* Implementation of FileNameMapper that does simple wildcard pattern
Modified:
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/IdentityMapper.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/IdentityMapper.java?rev=595499&r1=595498&r2=595499&view=diff
==============================================================================
---
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/IdentityMapper.java
(original)
+++
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/IdentityMapper.java
Thu Nov 15 16:01:38 2007
@@ -1,21 +1,23 @@
+package org.apache.maven.shared.model.fileset.mappers;
+
/*
- * Copyright 2000,2004 The Apache Software Foundation
- *
- * Licensed 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
+ * 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.
+ * 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.maven.shared.model.fileset.mappers;
/**
* Implementation of FileNameMapper that always returns the source file name.
Modified:
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperException.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperException.java?rev=595499&r1=595498&r2=595499&view=diff
==============================================================================
---
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperException.java
(original)
+++
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperException.java
Thu Nov 15 16:01:38 2007
@@ -1,5 +1,24 @@
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.
+ */
+
public class MapperException
extends Exception
{
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=595499&r1=595498&r2=595499&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
Thu Nov 15 16:01:38 2007
@@ -1,22 +1,24 @@
+package org.apache.maven.shared.model.fileset.mappers;
+
/*
- * Copyright 2000-2004 The Apache Software Foundation
- *
- * Licensed 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
+ * 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
*
- * 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.
+ * 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.maven.shared.model.fileset.mappers;
-
import org.apache.maven.shared.model.fileset.Mapper;
import org.codehaus.plexus.util.IOUtil;
@@ -31,7 +33,7 @@
{
private static final String MAPPER_PROPERTIES = "mapper.properties";
-
+
private static Properties implementations;
private MapperUtil()
@@ -46,20 +48,20 @@
if ( implementations == null )
{
Properties props = new Properties();
-
+
ClassLoader cloader =
Thread.currentThread().getContextClassLoader();
-
+
InputStream stream = null;
-
+
try
{
stream = cloader.getResourceAsStream( MAPPER_PROPERTIES );
-
+
if ( stream == null )
{
throw new IllegalStateException( "Cannot find classpath
resource: " + MAPPER_PROPERTIES );
}
-
+
try
{
props.load( stream );
@@ -86,12 +88,12 @@
{
return null;
}
-
+
initializeBuiltIns();
-
+
String type = mapper.getType();
String classname = mapper.getClassname();
-
+
if ( type == null && classname == null )
{
throw new MapperException( "nested mapper or " + "one of the
attributes type or classname is required" );
Modified:
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MergingMapper.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MergingMapper.java?rev=595499&r1=595498&r2=595499&view=diff
==============================================================================
---
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MergingMapper.java
(original)
+++
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MergingMapper.java
Thu Nov 15 16:01:38 2007
@@ -1,21 +1,23 @@
+package org.apache.maven.shared.model.fileset.mappers;
+
/*
- * Copyright 2000,2004 The Apache Software Foundation
- *
- * Licensed 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
+ * 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.
+ * 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.maven.shared.model.fileset.mappers;
/**
* Implementation of FileNameMapper that always returns the same
Modified:
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/PackageNameMapper.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/PackageNameMapper.java?rev=595499&r1=595498&r2=595499&view=diff
==============================================================================
---
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/PackageNameMapper.java
(original)
+++
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/PackageNameMapper.java
Thu Nov 15 16:01:38 2007
@@ -1,20 +1,23 @@
+package org.apache.maven.shared.model.fileset.mappers;
+
/*
- * Copyright 2001-2002,2004 The Apache Software Foundation
- *
- * Licensed 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
+ * 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.
+ * 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.maven.shared.model.fileset.mappers;
import java.io.File;
Modified:
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/UnPackageNameMapper.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/UnPackageNameMapper.java?rev=595499&r1=595498&r2=595499&view=diff
==============================================================================
---
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/UnPackageNameMapper.java
(original)
+++
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/UnPackageNameMapper.java
Thu Nov 15 16:01:38 2007
@@ -1,20 +1,23 @@
+package org.apache.maven.shared.model.fileset.mappers;
+
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed 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
+ * 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.
+ * 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.maven.shared.model.fileset.mappers;
import java.io.File;
Modified:
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java?rev=595499&r1=595498&r2=595499&view=diff
==============================================================================
---
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
(original)
+++
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
Thu Nov 15 16:01:38 2007
@@ -1,19 +1,22 @@
package org.apache.maven.shared.model.fileset.util;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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 org.apache.maven.plugin.logging.Log;
Modified: maven/shared/trunk/file-management/src/main/mdo/fileset.mdo
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/mdo/fileset.mdo?rev=595499&r1=595498&r2=595499&view=diff
==============================================================================
--- maven/shared/trunk/file-management/src/main/mdo/fileset.mdo (original)
+++ maven/shared/trunk/file-management/src/main/mdo/fileset.mdo Thu Nov 15
16:01:38 2007
@@ -1,14 +1,33 @@
<?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.
+-->
+
<model>
<id>fileset</id>
<name>FileSet</name>
<description>
<![CDATA[
- <p>
- A definition of a file-set. This model defines how file-sets can be
+ <p>
+ A definition of a file-set. This model defines how file-sets can be
captured, using directory, includes, and excludes.
- </p>
+ </p>
]]>
</description>
<defaults>
@@ -85,10 +104,10 @@
<![CDATA[
Similar to a UNIX permission. Format: (User)(Group)(Other) where
each
component is a sum of Read = 4, Write = 2, and Execute = 1. For
example,
- the default value of 0644 translates to User read-write, Group and
Other
- read-only.
+ the default value of 0644 translates to User read-write, Group and
Other
+ read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -100,10 +119,10 @@
<![CDATA[
Similar to a UNIX permission. Format: (User)(Group)(Other) where
each
component is a sum of Read = 4, Write = 2, and Execute = 1. For
example,
- the default value of 0644 translates to User read-write, Group and
Other
- read-only.
+ the default value of 0644 translates to User read-write, Group and
Other
+ read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -137,7 +156,7 @@
{
includesArry = new String[0];
}
-
+
return includesArry;
}
@@ -156,7 +175,7 @@
{
excludesArry = new String[0];
}
-
+
return excludesArry;
}
@@ -174,42 +193,42 @@
<type>String</type>
<defaultValue>identity</defaultValue>
<description>
- <![CDATA[
+ <![CDATA[
Specifies a built-in mapper implementation.
<br/>
Valid values:
<ul>
- <li><b>"flatten"</b> -
- The target file name is identical to the source file name,
with all leading
+ <li><b>"flatten"</b> -
+ The target file name is identical to the source file name,
with all leading
directory information stripped off. Both to and from will be
ignored.
</li>
- <li><b>"glob"</b> -
- Both to and from define patterns that may contain at most
one *. For each source
- file that matches the from pattern, a target file name will
be constructed from
- the to pattern by substituting the * in the to pattern with
the text that matches
- the * in the from pattern. Source file names that don't
match the from pattern
+ <li><b>"glob"</b> -
+ Both to and from define patterns that may contain at most
one *. For each source
+ file that matches the from pattern, a target file name will
be constructed from
+ the to pattern by substituting the * in the to pattern with
the text that matches
+ the * in the from pattern. Source file names that don't
match the from pattern
will be ignored.
</li>
- <li><b>"regexp"</b> -
- Both to and from define regular expressions. If the source
file name matches the
- from pattern, the target file name will be constructed from
the to pattern, using
- \0 to \9 as back-references for the full match (\0) or the
matches of the
- subexpressions in parentheses. Source files not matching the
from pattern will be
+ <li><b>"regexp"</b> -
+ Both to and from define regular expressions. If the source
file name matches the
+ from pattern, the target file name will be constructed from
the to pattern, using
+ \0 to \9 as back-references for the full match (\0) or the
matches of the
+ subexpressions in parentheses. Source files not matching the
from pattern will be
ignored.
</li>
- <li><b>"merge"</b> -
- The target file name will always be the same, as defined by
to. from will be
+ <li><b>"merge"</b> -
+ The target file name will always be the same, as defined by
to. from will be
ignored.
</li>
- <li><b>"package"</b> -
- Sharing the same syntax as the glob mapper, the package
mapper replaces directory
- separators found in the matched source pattern with dots in
the target pattern
+ <li><b>"package"</b> -
+ Sharing the same syntax as the glob mapper, the package
mapper replaces directory
+ separators found in the matched source pattern with dots in
the target pattern
placeholder.
</li>
- <li><b>"unpackage"</b> -
- This mapper is the inverse of the package mapper. It
replaces the dots in a
- package name with directory separators. This is useful for
matching XML formatter
- results against their JUnit test test cases. The mapper
shares the sample syntax
+ <li><b>"unpackage"</b> -
+ This mapper is the inverse of the package mapper. It
replaces the dots in a
+ package name with directory separators. This is useful for
matching XML formatter
+ results against their JUnit test test cases. The mapper
shares the sample syntax
as the glob mapper.
</li>
</ul>
@@ -221,7 +240,7 @@
<version>1.1.0</version>
<type>String</type>
<description>
- Specifies a type-specific pattern for matching source paths
which should be mapped.
+ Specifies a type-specific pattern for matching source paths
which should be mapped.
</description>
</field>
<field>
@@ -229,7 +248,7 @@
<version>1.1.0</version>
<type>String</type>
<description>
- Specifies a type-specific pattern for producing paths based on
source paths.
+ Specifies a type-specific pattern for producing paths based on
source paths.
</description>
</field>
<field>
@@ -237,9 +256,9 @@
<version>1.1.0</version>
<type>String</type>
<description>
- Allows specification of a custom mapper implementation. The
class must be of type
- org.apache.maven.shared.model.fileset.mappers.FileNameMapper,
from the artifact
- org.apache.maven.shared:file-management.
+ Allows specification of a custom mapper implementation. The class
must be of type
+ org.apache.maven.shared.model.fileset.mappers.FileNameMapper, from
the artifact
+ org.apache.maven.shared:file-management.
</description>
</field>
</fields>
@@ -270,7 +289,7 @@
<description>
<![CDATA[
Controls the line-endings of files in this fileSet.
- Valid values:
+ Valid values:
<ul>
<li><b>"keep"</b> - Preserve all line endings</li>
<li><b>"unix"</b> - Use Unix-style line endings</li>
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=595499&r1=595498&r2=595499&view=diff
==============================================================================
--- maven/shared/trunk/file-management/src/main/resources/mappers.properties
(original)
+++ maven/shared/trunk/file-management/src/main/resources/mappers.properties
Thu Nov 15 16:01:38 2007
@@ -1,3 +1,19 @@
+# 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.
identity=org.apache.maven.plugin.assembly.mappers.IdentityMapper
flatten=org.apache.maven.plugin.assembly.mappers.FlatFileNameMapper
glob=org.apache.maven.plugin.assembly.mappers.GlobPatternMapper
Modified:
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java?rev=595499&r1=595498&r2=595499&view=diff
==============================================================================
---
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
(original)
+++
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
Thu Nov 15 16:01:38 2007
@@ -1,5 +1,24 @@
package org.apache.maven.shared.model.fileset.util;
+/*
+ * 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 java.io.File;
import java.io.IOException;
import java.net.URL;
@@ -20,151 +39,151 @@
public class FileSetUtilsTest
extends TestCase
{
-
+
private Set testDirectories = new HashSet();
private Set linkFiles = new HashSet();
-
+
public void tearDown() throws IOException
{
for ( Iterator it = linkFiles.iterator(); it.hasNext(); )
{
File linkFile = (File) it.next();
-
+
linkFile.delete();
}
-
+
for ( Iterator it = testDirectories.iterator(); it.hasNext(); )
{
File dir = (File) it.next();
-
+
FileUtils.deleteDirectory( dir );
}
}
-
+
public void testGetIncludedFiles() throws IOException
{
File directory = setupTestDirectory( "testGetIncludedFiles" );
-
+
FileSet set = new FileSet();
set.setDirectory( directory.getPath() );
set.addInclude( "**/included.txt" );
-
+
FileSetManager fileSetManager = new FileSetManager();
-
+
String[] included = fileSetManager.getIncludedFiles( set );
-
+
Assert.assertEquals( 1, included.length );
}
-
+
public void testIncludesDontFollowSymlinks() throws IOException,
InterruptedException, CommandLineException
{
File directory = setupTestDirectory( "testIncludesDontFollowSymlinks"
);
File subdir = new File( directory, "linked-to-self" );
-
+
if ( !createSymlink( directory, subdir ) )
{
// assume failure to create a sym link is because the system does
not support them
// and not because the sym link creation failed.
return;
}
-
+
FileSet set = new FileSet();
set.setDirectory( directory.getPath() );
set.addInclude( "**/included.txt" );
set.setFollowSymlinks( false );
-
+
FileSetManager fileSetManager = new FileSetManager();
-
+
String[] included = fileSetManager.getIncludedFiles( set );
-
+
Assert.assertEquals( 1, included.length );
}
-
+
public void testDeleteDontFollowSymlinks() throws IOException,
InterruptedException, CommandLineException
{
File directory = setupTestDirectory( "testDeleteDontFollowSymlinks" );
File subdir = new File( directory, "linked-to-self" );
-
+
if ( !createSymlink( directory, subdir ) )
{
// assume failure to create a sym link is because the system does
not support them
// and not because the sym link creation failed.
return;
}
-
+
FileSet set = new FileSet();
set.setDirectory( directory.getPath() );
set.addInclude( "**/included.txt" );
set.addInclude( "**/linked-to-self" );
set.setFollowSymlinks( false );
-
+
FileSetManager fileSetManager = new FileSetManager();
-
+
fileSetManager.delete( set );
-
- Assert.assertFalse( subdir.exists() );
+
+ Assert.assertFalse( subdir.exists() );
}
-
+
public void testDelete() throws IOException
{
File directory = setupTestDirectory( "testDelete" );
File subdirFile = new File( directory, "subdir/excluded.txt" );
-
+
FileSet set = new FileSet();
set.setDirectory( directory.getPath() );
set.addInclude( "**/included.txt" );
set.addInclude( "**/subdir" );
-
+
FileSetManager fileSetManager = new FileSetManager();
-
+
fileSetManager.delete( set );
-
+
Assert.assertFalse( "file in marked subdirectory still exists.",
subdirFile.exists() );
}
-
+
private boolean createSymlink( File from, File to ) throws
InterruptedException, CommandLineException
{
if ( to.exists() )
{
to.delete();
}
-
+
Commandline cli = new Commandline();
cli.setExecutable( "ln" );
cli.createArgument().setLine( "-s" );
cli.createArgument().setLine( from.getPath() );
cli.createArgument().setLine( to.getPath() );
-
+
int result = cli.execute().waitFor();
-
+
linkFiles.add( to );
return result == 0;
}
-
+
private File setupTestDirectory( String directoryName ) throws IOException
{
System.out.println( "Setting up directory for test: " + directoryName
);
-
+
URL sourceResource = getClass().getClassLoader().getResource(
directoryName );
-
+
if ( sourceResource == null )
{
Assert.fail( "Source directory for test: " + directoryName + "
cannot be found." );
}
-
+
File sourceDir = new File( sourceResource.getPath() );
-
+
String basedir = System.getProperty( "basedir", System.getProperty(
"user.dir" ) );
String testBase = System.getProperty( "testBase",
"target/test-directories" );
-
+
File testDir = new File( basedir, testBase + "/" + directoryName );
testDir.mkdirs();
-
+
FileUtils.copyDirectoryStructure( sourceDir, testDir );
-
+
testDirectories.add( testDir );
-
+
return testDir;
}
