You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/03/24 20:28:00 UTC
svn commit: r640535 [1/2] - in /maven/plugins/trunk/maven-war-plugin/src:
it/MWAR-129/ it/MWAR-129/src/main/webapp/WEB-INF/ it/MWAR-139/
it/MWAR-139/src/main/webapp/WEB-INF/ it/MWAR-139/src/main/webresources/
it/MWAR-143/ it/MWAR-143/war-common/ it/MWA...
Author: bentmann
Date: Mon Mar 24 12:27:50 2008
New Revision: 640535
URL: http://svn.apache.org/viewvc?rev=640535&view=rev
Log:
o Added svn:eol-style=native
Modified:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/pom.xml (props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/WEB-INF/web.xml (props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/verify.bsh (contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/pom.xml (props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/webapp/WEB-INF/web.xml (props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/webresources/filterme.xml (props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/verify.bsh (contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/verify.bsh (contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/pom.xml (contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/resources/filter.properties (contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/pom.xml (contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-62/pom.xml (props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-62/src/main/webapp/web.xml (props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-62/verify.bsh (contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh (contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/it/scoped-dependency-same-artifact/goals.txt (props changed)
maven/plugins/trunk/maven-war-plugin/src/it/scoped-dependency-same-artifact/pom.xml (props changed)
maven/plugins/trunk/maven-war-plugin/src/it/scoped-dependency-same-artifact/src/main/webapp/WEB-INF/web.xml (props changed)
maven/plugins/trunk/maven-war-plugin/src/it/scoped-dependency-same-artifact/verify.bsh (props changed)
maven/plugins/trunk/maven-war-plugin/src/it/simple-war-no-webxml/pom.xml (props changed)
maven/plugins/trunk/maven-war-plugin/src/it/simple-war-no-webxml/verify.bsh (props changed)
maven/plugins/trunk/maven-war-plugin/src/it/simple-war-project/pom.xml (props changed)
maven/plugins/trunk/maven-war-plugin/src/it/simple-war-project/src/main/webapp/WEB-INF/web.xml (props changed)
maven/plugins/trunk/maven-war-plugin/src/it/simple-war-project/verify.bsh (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/Overlay.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/DefaultOverlay.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/InvalidOverlayConfigurationException.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/SaveWebappStructurePostPackagingTask.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingContext.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingTask.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPostPackagingTask.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/ClassesPackager.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DependencyInfo.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/PathSet.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/file-name-mapping.apt (props changed)
maven/plugins/trunk/maven-war-plugin/src/site/apt/overlays.apt (props changed)
maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml (contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarManifestMojoTest.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarZipTest.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/AarArtifactStub.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/EJBArtifactStubWithClassifier.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenZipProject.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/WarOverlayStub.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/ZipArtifactStub.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java (contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/WebappStructureTest.java (props changed)
maven/plugins/trunk/maven-war-plugin/src/test/resources/overlays/overlay-one/WEB-INF/web.xml (props changed)
maven/plugins/trunk/maven-war-plugin/src/test/resources/overlays/overlay-two/WEB-INF/web.xml (props changed)
maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/dependencies/default.xml (props changed)
maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml (contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-classpath/plugin-config.xml (contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-main-class/plugin-config.xml (contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-other-attrs/plugin-config.xml (contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/waroverlays/default.xml (props changed)
maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/warziptest/war-with-zip.xml (props changed)
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/pom.xml
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Mar 24 12:27:50 2008
@@ -1 +1 @@
-LF
+native
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Mar 24 12:27:50 2008
@@ -1 +1 @@
-LF
+native
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/verify.bsh?rev=640535&r1=640534&r2=640535&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/verify.bsh (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/verify.bsh Mon Mar 24 12:27:50 2008
@@ -1,67 +1,67 @@
-
-/*
- * 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.*;
-import org.codehaus.plexus.util.*;
-
-boolean result = true;
-
-try
-{
- File target = new File( basedir, "target" );
- if ( !target.exists() || !target.isDirectory() )
- {
- System.err.println( "target file is missing or not a directory." );
- return false;
- }
-
- File webappDirectory = new File( target, "profile2" );
- if ( !webappDirectory.exists() || !webappDirectory.isDirectory() )
- {
- System.err.println( "webappDirectory is missing or not a directory." );
- return false;
- }
-
- File param = new File ( webappDirectory, "param.jsp" );
- if ( !param.exists() || param.isDirectory() )
- {
- System.err.println( "param.jsp file is missing or a directory." );
- return false;
- }
- System.out.println (" before reading param " );
- FileInputStream fis = new FileInputStream ( param );
- String paramContent = IOUtil.toString ( fis );
-
-
- int indexOf = paramContent.indexOf( "<c:set var=\"app_version\" value=\"1.0-SNAPSHOT\"/>" );
- if ( indexOf < 0)
- {
- System.err.println( "param.jsp not contains <c:set var=\"app_version\" value=\"1.0-SNAPSHOT\"/>" );
- return false;
- }
-
-}
-catch( Throwable e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
+
+/*
+ * 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.*;
+import org.codehaus.plexus.util.*;
+
+boolean result = true;
+
+try
+{
+ File target = new File( basedir, "target" );
+ if ( !target.exists() || !target.isDirectory() )
+ {
+ System.err.println( "target file is missing or not a directory." );
+ return false;
+ }
+
+ File webappDirectory = new File( target, "profile2" );
+ if ( !webappDirectory.exists() || !webappDirectory.isDirectory() )
+ {
+ System.err.println( "webappDirectory is missing or not a directory." );
+ return false;
+ }
+
+ File param = new File ( webappDirectory, "param.jsp" );
+ if ( !param.exists() || param.isDirectory() )
+ {
+ System.err.println( "param.jsp file is missing or a directory." );
+ return false;
+ }
+ System.out.println (" before reading param " );
+ FileInputStream fis = new FileInputStream ( param );
+ String paramContent = IOUtil.toString ( fis );
+
+
+ int indexOf = paramContent.indexOf( "<c:set var=\"app_version\" value=\"1.0-SNAPSHOT\"/>" );
+ if ( indexOf < 0)
+ {
+ System.err.println( "param.jsp not contains <c:set var=\"app_version\" value=\"1.0-SNAPSHOT\"/>" );
+ return false;
+ }
+
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/webresources/filterme.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/verify.bsh?rev=640535&r1=640534&r2=640535&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/verify.bsh (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/verify.bsh Mon Mar 24 12:27:50 2008
@@ -1,73 +1,73 @@
-
-/*
- * 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.*;
-import org.codehaus.plexus.util.*;
-
-boolean result = true;
-
-try
-{
- File target = new File( basedir, "target" );
- if ( !target.exists() || !target.isDirectory() )
- {
- System.err.println( "target file is missing or not a directory." );
- return false;
- }
-
- File webappDirectory = new File( target, "MWAR-139-1.0-SNAPSHOT" );
- if ( !webappDirectory.exists() || !webappDirectory.isDirectory() )
- {
- System.err.println( "webappDirectory is missing or not a directory." );
- return false;
- }
-
- File param = new File ( webappDirectory, "filterme.xml" );
- if ( !param.exists() || param.isDirectory() )
- {
- System.err.println( "filterme.xml file is missing or a directory." );
- return false;
- }
-
- FileInputStream fis = new FileInputStream ( param );
- String paramContent = IOUtil.toString ( fis );
-
- int indexOf = paramContent.indexOf( "<text>hallo @@ hallo</text>" );
- if ( indexOf < 0)
- {
- System.err.println( "filterme.xml does not contains <text>hallo @@ hallo</text>" );
- return false;
- }
-
- indexOf = paramContent.indexOf( "<text2>start-${}-end</text2>" );
- if ( indexOf < 0)
- {
- System.err.println( "filterme.xml does not contains <text2>start-${}-end</text2>" );
- return false;
- }
-
-}
-catch( Throwable e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
+
+/*
+ * 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.*;
+import org.codehaus.plexus.util.*;
+
+boolean result = true;
+
+try
+{
+ File target = new File( basedir, "target" );
+ if ( !target.exists() || !target.isDirectory() )
+ {
+ System.err.println( "target file is missing or not a directory." );
+ return false;
+ }
+
+ File webappDirectory = new File( target, "MWAR-139-1.0-SNAPSHOT" );
+ if ( !webappDirectory.exists() || !webappDirectory.isDirectory() )
+ {
+ System.err.println( "webappDirectory is missing or not a directory." );
+ return false;
+ }
+
+ File param = new File ( webappDirectory, "filterme.xml" );
+ if ( !param.exists() || param.isDirectory() )
+ {
+ System.err.println( "filterme.xml file is missing or a directory." );
+ return false;
+ }
+
+ FileInputStream fis = new FileInputStream ( param );
+ String paramContent = IOUtil.toString ( fis );
+
+ int indexOf = paramContent.indexOf( "<text>hallo @@ hallo</text>" );
+ if ( indexOf < 0)
+ {
+ System.err.println( "filterme.xml does not contains <text>hallo @@ hallo</text>" );
+ return false;
+ }
+
+ indexOf = paramContent.indexOf( "<text2>start-${}-end</text2>" );
+ if ( indexOf < 0)
+ {
+ System.err.println( "filterme.xml does not contains <text2>start-${}-end</text2>" );
+ return false;
+ }
+
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/verify.bsh?rev=640535&r1=640534&r2=640535&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/verify.bsh (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/verify.bsh Mon Mar 24 12:27:50 2008
@@ -1,125 +1,125 @@
-
-/*
- * 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.*;
-import org.codehaus.plexus.util.*;
-
-boolean result = true;
-
-filesAreIdentical( File expected, File current )
- throws IOException
-{
- if ( expected.length() != current.length() )
- {
- return false;
- }
- FileInputStream expectedIn = new FileInputStream( expected );
- FileInputStream currentIn = new FileInputStream( current );
- try
- {
- byte[] expectedBuffer = IOUtil.toByteArray( expectedIn );
-
- byte[] currentBuffer = IOUtil.toByteArray( currentIn );
- if (expectedBuffer.length != currentBuffer.length)
- {
- return false;
- }
- for (int i = 0,size = expectedBuffer.length;i<size;i++)
- {
- if(expectedBuffer[i]!= currentBuffer[i])
- {
- return false;
- }
- }
- }
- finally
- {
- expectedIn.close();
- currentIn.close();
- }
- return true;
-}
-
-try
-{
-
- File originalImg = new File( basedir, "war-common/src/main/images/duke-beer.jpg" );
-
- File targetImg = new File( basedir, "war-common/target/common-overlay-1.0-SNAPSHOT/duke-beer.jpg" );
-
- boolean identical = filesAreIdentical( originalImg, targetImg );
-
- if (!identical)
- {
- System.err.println( "filtered images are not identical in war-common." );
- return false;
- }
-
- File target = new File( basedir, "war-filter-overlay/target" );
- if ( !target.exists() || !target.isDirectory() )
- {
- System.err.println( "target file is missing or not a directory." );
- return false;
- }
-
- File webappDirectory = new File( target, "custom-manifest-1.0-SNAPSHOT" );
- if ( !webappDirectory.exists() || !webappDirectory.isDirectory() )
- {
- System.err.println( "webappDirectory is missing or not a directory." );
- return false;
- }
-
- File param = new File ( webappDirectory, "WEB-INF/classes/filter.properties" );
- if ( !param.exists() || param.isDirectory() )
- {
- System.err.println( "filter.properties file is missing or a directory." );
- return false;
- }
-
-
- FileInputStream fis = new FileInputStream ( param );
- String paramContent = IOUtil.toString ( fis );
-
- int indexOf = paramContent.indexOf( "debug.test = hello world !" );
- if ( indexOf < 0)
- {
- System.err.println( "filter.properties does not contains debug.test = hello world !" );
- return false;
- }
-
- targetImg = new File( basedir, "war-filter-overlay/target/custom-manifest-1.0-SNAPSHOT/duke-beer.jpg" );
-
- boolean identical = filesAreIdentical( originalImg, targetImg );
-
- if (!identical)
- {
- System.err.println( "filtered images are not identical with overlay." );
- return false;
- }
-
-}
-catch( Throwable e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
-
+
+/*
+ * 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.*;
+import org.codehaus.plexus.util.*;
+
+boolean result = true;
+
+filesAreIdentical( File expected, File current )
+ throws IOException
+{
+ if ( expected.length() != current.length() )
+ {
+ return false;
+ }
+ FileInputStream expectedIn = new FileInputStream( expected );
+ FileInputStream currentIn = new FileInputStream( current );
+ try
+ {
+ byte[] expectedBuffer = IOUtil.toByteArray( expectedIn );
+
+ byte[] currentBuffer = IOUtil.toByteArray( currentIn );
+ if (expectedBuffer.length != currentBuffer.length)
+ {
+ return false;
+ }
+ for (int i = 0,size = expectedBuffer.length;i<size;i++)
+ {
+ if(expectedBuffer[i]!= currentBuffer[i])
+ {
+ return false;
+ }
+ }
+ }
+ finally
+ {
+ expectedIn.close();
+ currentIn.close();
+ }
+ return true;
+}
+
+try
+{
+
+ File originalImg = new File( basedir, "war-common/src/main/images/duke-beer.jpg" );
+
+ File targetImg = new File( basedir, "war-common/target/common-overlay-1.0-SNAPSHOT/duke-beer.jpg" );
+
+ boolean identical = filesAreIdentical( originalImg, targetImg );
+
+ if (!identical)
+ {
+ System.err.println( "filtered images are not identical in war-common." );
+ return false;
+ }
+
+ File target = new File( basedir, "war-filter-overlay/target" );
+ if ( !target.exists() || !target.isDirectory() )
+ {
+ System.err.println( "target file is missing or not a directory." );
+ return false;
+ }
+
+ File webappDirectory = new File( target, "custom-manifest-1.0-SNAPSHOT" );
+ if ( !webappDirectory.exists() || !webappDirectory.isDirectory() )
+ {
+ System.err.println( "webappDirectory is missing or not a directory." );
+ return false;
+ }
+
+ File param = new File ( webappDirectory, "WEB-INF/classes/filter.properties" );
+ if ( !param.exists() || param.isDirectory() )
+ {
+ System.err.println( "filter.properties file is missing or a directory." );
+ return false;
+ }
+
+
+ FileInputStream fis = new FileInputStream ( param );
+ String paramContent = IOUtil.toString ( fis );
+
+ int indexOf = paramContent.indexOf( "debug.test = hello world !" );
+ if ( indexOf < 0)
+ {
+ System.err.println( "filter.properties does not contains debug.test = hello world !" );
+ return false;
+ }
+
+ targetImg = new File( basedir, "war-filter-overlay/target/custom-manifest-1.0-SNAPSHOT/duke-beer.jpg" );
+
+ boolean identical = filesAreIdentical( originalImg, targetImg );
+
+ if (!identical)
+ {
+ System.err.println( "filtered images are not identical with overlay." );
+ return false;
+ }
+
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
+
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/pom.xml?rev=640535&r1=640534&r2=640535&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/pom.xml Mon Mar 24 12:27:50 2008
@@ -25,27 +25,27 @@
<artifactId>MWAR-143</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>common-overlay</artifactId>
- <packaging>war</packaging>
+ <artifactId>common-overlay</artifactId>
+ <packaging>war</packaging>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Class-Path>properties</Class-Path>
- </manifestEntries>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Class-Path>properties</Class-Path>
+ </manifestEntries>
</archive>
<webResources>
<resource>
<directory>src/main/images</directory>
<filtering>true</filtering>
</resource>
- </webResources>
- </configuration>
+ </webResources>
+ </configuration>
</plugin>
</plugins>
</build>
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/resources/filter.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/resources/filter.properties?rev=640535&r1=640534&r2=640535&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/resources/filter.properties (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/resources/filter.properties Mon Mar 24 12:27:50 2008
@@ -1,4 +1,4 @@
title.main=Prototype ${pom.name}
-title.version=version ${pom.version}
-
+title.version=version ${pom.version}
+
debug.test = ${my.filter.value}
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/resources/filter.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/pom.xml?rev=640535&r1=640534&r2=640535&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/pom.xml Mon Mar 24 12:27:50 2008
@@ -27,39 +27,39 @@
</parent>
<artifactId>custom-manifest</artifactId>
<packaging>war</packaging>
-
- <dependencies>
- <!-- War Overlay -->
- <dependency>
- <groupId>debug.war</groupId>
- <artifactId>common-overlay</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>war</type>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
+
+ <dependencies>
+ <!-- War Overlay -->
+ <dependency>
+ <groupId>debug.war</groupId>
+ <artifactId>common-overlay</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <overlays>
- <overlay>
- <groupId>debug.war</groupId>
- <artifactId>common-overlay</artifactId>
- <!--targetPath>filter</targetPath-->
- <filtered>true</filtered>
- </overlay>
- </overlays>
- </configuration>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <overlays>
+ <overlay>
+ <groupId>debug.war</groupId>
+ <artifactId>common-overlay</artifactId>
+ <!--targetPath>filter</targetPath-->
+ <filtered>true</filtered>
+ </overlay>
+ </overlays>
+ </configuration>
</plugin>
</plugins>
- </build>
-
- <properties>
- <my.filter.value>hello world !</my.filter.value>
- </properties>
+ </build>
+
+ <properties>
+ <my.filter.value>hello world !</my.filter.value>
+ </properties>
</project>
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-62/pom.xml
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Mar 24 12:27:50 2008
@@ -1 +1 @@
-LF
+native
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-62/src/main/webapp/web.xml
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Mar 24 12:27:50 2008
@@ -1 +1 @@
-LF
+native
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-62/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-62/verify.bsh?rev=640535&r1=640534&r2=640535&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-62/verify.bsh (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-62/verify.bsh Mon Mar 24 12:27:50 2008
@@ -1,61 +1,61 @@
-
-/*
- * 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.*;
-import org.codehaus.plexus.util.*;
-
-boolean result = true;
-
-try
-{
- File target = new File( basedir, "target" );
- if ( !target.exists() || !target.isDirectory() )
- {
- System.err.println( "target file is missing or not a directory." );
- return false;
- }
- File webAppDirectory = new File ( target, "webAppDirectory" );
- if ( !webAppDirectory.exists() || !webAppDirectory.isDirectory() )
- {
- System.err.println( "webAppDirectory is missing or a not directory." );
- return false;
- }
- File devProperties = new File ( webAppDirectory, "dev.properties" );
- if ( devProperties.exists() )
- {
- System.err.println( "dev.properties has not been excluded." );
- return false;
- }
-
- File testProperties = new File ( webAppDirectory, "test.properties" );
- if ( testProperties.exists() )
- {
- System.err.println( "test.properties has not been excluded." );
- return false;
- }
-
-}
-catch( Throwable e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
+
+/*
+ * 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.*;
+import org.codehaus.plexus.util.*;
+
+boolean result = true;
+
+try
+{
+ File target = new File( basedir, "target" );
+ if ( !target.exists() || !target.isDirectory() )
+ {
+ System.err.println( "target file is missing or not a directory." );
+ return false;
+ }
+ File webAppDirectory = new File ( target, "webAppDirectory" );
+ if ( !webAppDirectory.exists() || !webAppDirectory.isDirectory() )
+ {
+ System.err.println( "webAppDirectory is missing or a not directory." );
+ return false;
+ }
+ File devProperties = new File ( webAppDirectory, "dev.properties" );
+ if ( devProperties.exists() )
+ {
+ System.err.println( "dev.properties has not been excluded." );
+ return false;
+ }
+
+ File testProperties = new File ( webAppDirectory, "test.properties" );
+ if ( testProperties.exists() )
+ {
+ System.err.println( "test.properties has not been excluded." );
+ return false;
+ }
+
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-62/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh?rev=640535&r1=640534&r2=640535&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh Mon Mar 24 12:27:50 2008
@@ -1,73 +1,73 @@
-
-/*
- * 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.*;
-import org.codehaus.plexus.util.*;
-
-boolean result = true;
-
-try
-{
- File target = new File( basedir, "target" );
- if ( !target.exists() || !target.isDirectory() )
- {
- System.err.println( "target file is missing or not a directory." );
- return false;
- }
-
- File webappDirectory = new File( target, "MWAR-96-1.0-SNAPSHOT" );
- if ( !webappDirectory.exists() || !webappDirectory.isDirectory() )
- {
- System.err.println( "webappDirectory is missing or not a directory." );
- return false;
- }
-
- File param = new File ( webappDirectory, "index.jsp" );
- if ( !param.exists() || param.isDirectory() )
- {
- System.err.println( "index.jsp file is missing or a directory." );
- return false;
- }
- FileInputStream fis = new FileInputStream ( param );
- String paramContent = IOUtil.toString ( fis );
-
- String javaVersion = System.getProperty("java.version");
- int indexOf = paramContent.indexOf( "<td>java version : " + javaVersion + "</td>" );
- if ( indexOf < 0)
- {
- System.err.println( "index.jsp not contains <td>java version : " + javaVersion + "</td>" );
- return false;
- }
-
- indexOf = paramContent.indexOf("<td>okitworks</td>");
- if ( indexOf < 0)
- {
- System.err.println( "index.jsp not contains <td>okitworks</td>" );
- return false;
- }
-
-}
-catch( Throwable e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
+
+/*
+ * 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.*;
+import org.codehaus.plexus.util.*;
+
+boolean result = true;
+
+try
+{
+ File target = new File( basedir, "target" );
+ if ( !target.exists() || !target.isDirectory() )
+ {
+ System.err.println( "target file is missing or not a directory." );
+ return false;
+ }
+
+ File webappDirectory = new File( target, "MWAR-96-1.0-SNAPSHOT" );
+ if ( !webappDirectory.exists() || !webappDirectory.isDirectory() )
+ {
+ System.err.println( "webappDirectory is missing or not a directory." );
+ return false;
+ }
+
+ File param = new File ( webappDirectory, "index.jsp" );
+ if ( !param.exists() || param.isDirectory() )
+ {
+ System.err.println( "index.jsp file is missing or a directory." );
+ return false;
+ }
+ FileInputStream fis = new FileInputStream ( param );
+ String paramContent = IOUtil.toString ( fis );
+
+ String javaVersion = System.getProperty("java.version");
+ int indexOf = paramContent.indexOf( "<td>java version : " + javaVersion + "</td>" );
+ if ( indexOf < 0)
+ {
+ System.err.println( "index.jsp not contains <td>java version : " + javaVersion + "</td>" );
+ return false;
+ }
+
+ indexOf = paramContent.indexOf("<td>okitworks</td>");
+ if ( indexOf < 0)
+ {
+ System.err.println( "index.jsp not contains <td>okitworks</td>" );
+ return false;
+ }
+
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/scoped-dependency-same-artifact/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/scoped-dependency-same-artifact/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/scoped-dependency-same-artifact/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/scoped-dependency-same-artifact/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/simple-war-no-webxml/pom.xml
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Mar 24 12:27:50 2008
@@ -1 +1 @@
-LF
+native
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/simple-war-no-webxml/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/simple-war-project/pom.xml
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Mar 24 12:27:50 2008
@@ -1 +1 @@
-LF
+native
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/simple-war-project/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Mar 24 12:27:50 2008
@@ -1 +1 @@
-LF
+native
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/simple-war-project/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/Overlay.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/DefaultOverlay.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/InvalidOverlayConfigurationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/SaveWebappStructurePostPackagingTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPostPackagingTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/ClassesPackager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DependencyInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/PathSet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/file-name-mapping.apt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/site/apt/overlays.apt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml?rev=640535&r1=640534&r2=640535&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml Mon Mar 24 12:27:50 2008
@@ -1,121 +1,121 @@
-<?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.
--->
-
-<faqs id="FAQ" title="Frequently Asked Questions">
- <part id="General">
- <faq id="filtering">
- <question>How is filtering done in the war plugin?</question>
- <answer>
- <p>Examples can be found <a href="examples/adding-filtering-webresources.html">here</a></p>
- </answer>
- </faq>
- <faq id="classifieruse">
- <question>How does the classifier affect artifacts in my war project?</question>
- <answer>
- <p>When used, the copy of the artifact in your project will have the classifier appended to its
- filename. This can be used to differentiate duplicate artifacts.</p>
- </answer>
- </faq>
- <faq id="transitiveexclude">
- <question>How do I exclude transitive dependencies from my project?</question>
- <answer>
- <p>Give it a "provided" scope.</p>
- </answer>
- </faq>
- <faq id="dependentwarexclude">
- <question>What's the difference in using dependentWarExclude and provided scope?</question>
- <answer>
- <p>dependentWarExclude is used in <a href="examples/war-overlay.html">war overlays</a> for excluding dependent
- war files from being included in the exploded war.</p>
- </answer>
- </faq>
- <faq id="webresourcesexclude">
- <question>How do I exclude files in my web rources?</question>
- <answer>
- <p>Use the webResources exclude parameter to identify the tokens to use for the filtering.</p>
- </answer>
- </faq>
- <faq id="waroverlaysexclude">
- <question>How do I exclude files when doing war overlays?</question>
- <answer>
- <p>Use the dependentWarExcludes parameter to identify the tokens to use for the filtering.</p>
- <p>For more information refer to <a href="examples/adding-filtering-webresources.html">Adding and Filtering
- External Web Resources</a></p>
- </answer>
- </faq>
- <faq id="configurationdoc">
- <question>Where can I find the documentation for the plugin's configuration?</question>
- <answer>
- <p>
- For each goal, you can use the documentation from the <a href="http://maven.apache.org/plugins/maven-war-plugin/plugin-info.html">plugin site</a>.
- </p>
- <p>
- If you need a specific version, generate it using site:site or use mvn help:describe \\ <br/>
- -DgroupId=org.apache.maven.plugins -DartifactId=maven-war-plugin -Dfull=true \\ <br/>
- -Dversion>your-plugin-version-here<
- </p>
- </answer>
- </faq>
- <faq id="attached">
- <question>How do I create a jar containing the classes in my webapp?</question>
- <answer>
- <p>If you would simply like to package the classes and resources as a jar in WEB-INF/lib
- rather than as loose files under WEB-INF/classes, use the following configuration:</p>
- <p>
- <source>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>X.Y</version>
- <configuration>
- <archiveClasses>true</archiveClasses>
- </configuration>
- </plugin>
- </source>
- </p>
- <p>If you need to re-use this jar in another project, the recommended approach is to move the classes to a
- separate module that builds a jar, and then declare a dependency on that jar from your webapp as well as from
- any other projects that need it.</p>
- <p>If you can't move the classes to another project, you can deploy the classes and resources included in
- your webapp as an "attached" artifact, with a classifier, by using the following configuration:</p>
- <p>
- <source>
- <project>
- ...
- <artifactId>mywebapp</artifactId>
- <version>1.0-SNAPSHOT</version>
- ...
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>X.Y</version>
- <configuration>
- <attachClasses>true</attachClasses>
- </configuration>
- </plugin>
- ...
- </project>
- </source>
- </p>
- <p>This will result in two artifacts being deployed: mywebapp-1.0-SNAPSHOT.war
- and mywebapp-1.0-SNAPSHOT-classes.jar</p>
- </answer>
- </faq>
- </part>
+<?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.
+-->
+
+<faqs id="FAQ" title="Frequently Asked Questions">
+ <part id="General">
+ <faq id="filtering">
+ <question>How is filtering done in the war plugin?</question>
+ <answer>
+ <p>Examples can be found <a href="examples/adding-filtering-webresources.html">here</a></p>
+ </answer>
+ </faq>
+ <faq id="classifieruse">
+ <question>How does the classifier affect artifacts in my war project?</question>
+ <answer>
+ <p>When used, the copy of the artifact in your project will have the classifier appended to its
+ filename. This can be used to differentiate duplicate artifacts.</p>
+ </answer>
+ </faq>
+ <faq id="transitiveexclude">
+ <question>How do I exclude transitive dependencies from my project?</question>
+ <answer>
+ <p>Give it a "provided" scope.</p>
+ </answer>
+ </faq>
+ <faq id="dependentwarexclude">
+ <question>What's the difference in using dependentWarExclude and provided scope?</question>
+ <answer>
+ <p>dependentWarExclude is used in <a href="examples/war-overlay.html">war overlays</a> for excluding dependent
+ war files from being included in the exploded war.</p>
+ </answer>
+ </faq>
+ <faq id="webresourcesexclude">
+ <question>How do I exclude files in my web rources?</question>
+ <answer>
+ <p>Use the webResources exclude parameter to identify the tokens to use for the filtering.</p>
+ </answer>
+ </faq>
+ <faq id="waroverlaysexclude">
+ <question>How do I exclude files when doing war overlays?</question>
+ <answer>
+ <p>Use the dependentWarExcludes parameter to identify the tokens to use for the filtering.</p>
+ <p>For more information refer to <a href="examples/adding-filtering-webresources.html">Adding and Filtering
+ External Web Resources</a></p>
+ </answer>
+ </faq>
+ <faq id="configurationdoc">
+ <question>Where can I find the documentation for the plugin's configuration?</question>
+ <answer>
+ <p>
+ For each goal, you can use the documentation from the <a href="http://maven.apache.org/plugins/maven-war-plugin/plugin-info.html">plugin site</a>.
+ </p>
+ <p>
+ If you need a specific version, generate it using site:site or use mvn help:describe \\ <br/>
+ -DgroupId=org.apache.maven.plugins -DartifactId=maven-war-plugin -Dfull=true \\ <br/>
+ -Dversion>your-plugin-version-here<
+ </p>
+ </answer>
+ </faq>
+ <faq id="attached">
+ <question>How do I create a jar containing the classes in my webapp?</question>
+ <answer>
+ <p>If you would simply like to package the classes and resources as a jar in WEB-INF/lib
+ rather than as loose files under WEB-INF/classes, use the following configuration:</p>
+ <p>
+ <source>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>X.Y</version>
+ <configuration>
+ <archiveClasses>true</archiveClasses>
+ </configuration>
+ </plugin>
+ </source>
+ </p>
+ <p>If you need to re-use this jar in another project, the recommended approach is to move the classes to a
+ separate module that builds a jar, and then declare a dependency on that jar from your webapp as well as from
+ any other projects that need it.</p>
+ <p>If you can't move the classes to another project, you can deploy the classes and resources included in
+ your webapp as an "attached" artifact, with a classifier, by using the following configuration:</p>
+ <p>
+ <source>
+ <project>
+ ...
+ <artifactId>mywebapp</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ ...
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>X.Y</version>
+ <configuration>
+ <attachClasses>true</attachClasses>
+ </configuration>
+ </plugin>
+ ...
+ </project>
+ </source>
+ </p>
+ <p>This will result in two artifacts being deployed: mywebapp-1.0-SNAPSHOT.war
+ and mywebapp-1.0-SNAPSHOT-classes.jar</p>
+ </answer>
+ </faq>
+ </part>
</faqs>
Propchange: maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarManifestMojoTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarZipTest.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Mar 24 12:27:50 2008
@@ -1 +1 @@
-LF
+native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/AarArtifactStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/EJBArtifactStubWithClassifier.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenZipProject.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Mar 24 12:27:50 2008
@@ -1 +1 @@
-LF
+native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/WarOverlayStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/ZipArtifactStub.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Mar 24 12:27:50 2008
@@ -1 +1 @@
-LF
+native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
------------------------------------------------------------------------------
svn:eol-style = native