You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2008/01/01 22:40:13 UTC
svn commit: r607923 [1/2] - in /maven/plugins/trunk/maven-jar-plugin/src/it:
MJAR-30-excludes/ MJAR-30-excludes/src/main/java/foo/project003/
MJAR-30-excludes/src/main/resources/
MJAR-30-excludes/src/test/java/foo/project003/ MJAR-30-excludes/src/test/...
Author: dennisl
Date: Tue Jan 1 13:40:09 2008
New Revision: 607923
URL: http://svn.apache.org/viewvc?rev=607923&view=rev
Log:
o Set eol style to Native.
o Fix inconsistent newlines.
Modified:
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/pom.xml (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/src/main/java/foo/project003/App.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/src/main/resources/default-configuration.properties (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/src/main/resources/excluded-file.txt (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/src/test/java/foo/project003/AppTest.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/src/test/resources/excluded-file.txt (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/src/test/resources/test-default-configuration.properties (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/verify.bsh (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-fullcontent/pom.xml (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-fullcontent/src/main/java/foo/project001/App.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-fullcontent/src/main/resources/default-configuration.properties (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-fullcontent/src/test/java/foo/project001/AppTest.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-fullcontent/src/test/resources/test-default-configuration.properties (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-fullcontent/verify.bsh (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/pom.xml (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/src/main/java/TestCompile1.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/src/main/java/service/TestInterface.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/src/main/java/service/impl/TestImplementation.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/src/main/resources/notIncluded.xml (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/verify.bsh (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-60/pom.xml (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-60/src/main/java/myproject/HelloWorld.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-60/verify.bsh (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-no-recreation/pom.xml (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-no-recreation/src/main/java/myproject/HelloWorld.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-no-recreation/verify.bsh (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-recreation/pom.xml (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-recreation/src/main/java/myproject/HelloWorld.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-recreation/verify.bsh (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/pom.xml (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/src/main/java/foo/project003/App.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/src/main/resources/default-configuration.properties (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/src/main/resources/excluded-file.txt (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/src/test/java/foo/project003/AppIntegrationTest.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/src/test/java/foo/project003/AppTest.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/src/test/resources/excluded-file.txt (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/src/test/resources/test-default-configuration.properties (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/verify.bsh (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/pom.xml (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/src/main/java/foo/project003/App.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/src/main/resources/default-configuration.properties (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/src/main/resources/excluded-file.txt (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/src/test/java/foo/project003/AppIntegrationTest.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/src/test/java/foo/project003/AppTest.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/src/test/resources/test-default-configuration.properties (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/verify.bsh (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/pom.xml (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/src/main/java/foo/project003/App.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/src/main/resources/default-configuration.properties (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/src/main/resources/excluded-file.txt (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/src/test/java/foo/project003/AppIntegrationTest.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/src/test/java/foo/project003/AppTest.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/src/test/resources/test-default-configuration.properties (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/verify.bsh (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-01/pom.xml (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-01/src/main/java/foo/project003/App.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-01/src/main/resources/META-INF/MANIFEST.MF (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-01/verify.bsh (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-02/pom.xml (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-02/src/main/java/foo/project003/App.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-02/src/main/resources/META-INF/MANIFEST.MF (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-02/verify.bsh (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-90/pom.xml (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-90/src/main/java/Foo.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-90/src/test/java/FooTest.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-90/verify.bsh (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/project-004/pom.xml (contents, props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/project-004/src/main/java/TestCompile1.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/project-004/src/main/java/service/TestInterface.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/project-004/src/main/java/service/impl/TestImplementation.java (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/project-004/src/main/resources/notIncluded.xml (props changed)
maven/plugins/trunk/maven-jar-plugin/src/it/project-004/verify.bsh (contents, props changed)
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/pom.xml?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/pom.xml Tue Jan 1 13:40:09 2008
@@ -48,10 +48,10 @@
<exclude>**/*.txt</exclude>
</excludes>
</configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
</plugin>
</plugins>
</build>
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/src/main/java/foo/project003/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/src/main/resources/default-configuration.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/src/main/resources/excluded-file.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/src/test/java/foo/project003/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/src/test/resources/excluded-file.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/src/test/resources/test-default-configuration.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/verify.bsh?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/verify.bsh (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/verify.bsh Tue Jan 1 13:40:09 2008
@@ -1,84 +1,84 @@
-
-/*
- * 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 java.util.*;
-import java.util.jar.*;
-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 artifact = new File ( target, "maven-jar-plugin-test-mjar-30-03-99.0.jar" );
- if ( !artifact.exists() || artifact.isDirectory() )
- {
- System.err.println( "artifact file is missing or a directory." );
- return false;
- }
-
- String[] artifactNames = new String[] { "default-configuration.properties", "META-INF/MANIFEST.MF",
- "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-03/pom.properties",
- "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-03/pom.xml" };
-
- Set contents = new HashSet();
-
- JarFile jar = new JarFile( artifact );
- Enumeration jarEntries = jar.entries();
- while ( jarEntries.hasMoreElements() )
- {
- JarEntry entry = (JarEntry) jarEntries.nextElement();
- if ( !entry.isDirectory() )
- {
- // Only compare files
- contents.add( entry.getName() );
- }
- }
-
- if ( artifactNames.length != contents.size() )
- {
- System.err.println( "jar content size is different from the expected content size" );
- return false;
- }
- for ( int i = 0; i < artifactNames.length; i++ )
- {
- String artifactName = artifactNames[i];
- if ( !contents.contains( artifactName ) )
- {
- System.err.println( "Artifact[" + artifactName + "] not found in jar archive" );
- 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 java.util.*;
+import java.util.jar.*;
+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 artifact = new File ( target, "maven-jar-plugin-test-mjar-30-03-99.0.jar" );
+ if ( !artifact.exists() || artifact.isDirectory() )
+ {
+ System.err.println( "artifact file is missing or a directory." );
+ return false;
+ }
+
+ String[] artifactNames = new String[] { "default-configuration.properties", "META-INF/MANIFEST.MF",
+ "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-03/pom.properties",
+ "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-03/pom.xml" };
+
+ Set contents = new HashSet();
+
+ JarFile jar = new JarFile( artifact );
+ Enumeration jarEntries = jar.entries();
+ while ( jarEntries.hasMoreElements() )
+ {
+ JarEntry entry = (JarEntry) jarEntries.nextElement();
+ if ( !entry.isDirectory() )
+ {
+ // Only compare files
+ contents.add( entry.getName() );
+ }
+ }
+
+ if ( artifactNames.length != contents.size() )
+ {
+ System.err.println( "jar content size is different from the expected content size" );
+ return false;
+ }
+ for ( int i = 0; i < artifactNames.length; i++ )
+ {
+ String artifactName = artifactNames[i];
+ if ( !contents.contains( artifactName ) )
+ {
+ System.err.println( "Artifact[" + artifactName + "] not found in jar archive" );
+ return false;
+ }
+ }
+
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-excludes/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-fullcontent/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-fullcontent/src/main/java/foo/project001/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-fullcontent/src/main/resources/default-configuration.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-fullcontent/src/test/java/foo/project001/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-fullcontent/src/test/resources/test-default-configuration.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-fullcontent/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-fullcontent/verify.bsh?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-fullcontent/verify.bsh (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-fullcontent/verify.bsh Tue Jan 1 13:40:09 2008
@@ -1,85 +1,85 @@
-
-/*
- * 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 java.util.*;
-import java.util.jar.*;
-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 artifact = new File ( target, "maven-jar-plugin-test-mjar-30-01-99.0.jar" );
- if ( !artifact.exists() || artifact.isDirectory() )
- {
- System.err.println( "artifact file is missing or a directory." );
- return false;
- }
-
- String[] artifactNames = new String[] { "default-configuration.properties",
- "foo/project001/App.class", "META-INF/MANIFEST.MF",
- "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-01/pom.properties",
- "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-01/pom.xml" };
-
- Set contents = new HashSet();
-
- JarFile jar = new JarFile( artifact );
- Enumeration jarEntries = jar.entries();
- while ( jarEntries.hasMoreElements() )
- {
- JarEntry entry = (JarEntry) jarEntries.nextElement();
- if ( !entry.isDirectory() )
- {
- // Only compare files
- contents.add( entry.getName() );
- }
- }
-
- if ( artifactNames.length != contents.size() )
- {
- System.err.println( "jar content size is different from the expected content size" );
- return false;
- }
- for ( int i = 0; i < artifactNames.length; i++ )
- {
- String artifactName = artifactNames[i];
- if ( !contents.contains( artifactName ) )
- {
- System.err.println( "Artifact[" + artifactName + "] not found in jar archive" );
- 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 java.util.*;
+import java.util.jar.*;
+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 artifact = new File ( target, "maven-jar-plugin-test-mjar-30-01-99.0.jar" );
+ if ( !artifact.exists() || artifact.isDirectory() )
+ {
+ System.err.println( "artifact file is missing or a directory." );
+ return false;
+ }
+
+ String[] artifactNames = new String[] { "default-configuration.properties",
+ "foo/project001/App.class", "META-INF/MANIFEST.MF",
+ "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-01/pom.properties",
+ "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-01/pom.xml" };
+
+ Set contents = new HashSet();
+
+ JarFile jar = new JarFile( artifact );
+ Enumeration jarEntries = jar.entries();
+ while ( jarEntries.hasMoreElements() )
+ {
+ JarEntry entry = (JarEntry) jarEntries.nextElement();
+ if ( !entry.isDirectory() )
+ {
+ // Only compare files
+ contents.add( entry.getName() );
+ }
+ }
+
+ if ( artifactNames.length != contents.size() )
+ {
+ System.err.println( "jar content size is different from the expected content size" );
+ return false;
+ }
+ for ( int i = 0; i < artifactNames.length; i++ )
+ {
+ String artifactName = artifactNames[i];
+ if ( !contents.contains( artifactName ) )
+ {
+ System.err.println( "Artifact[" + artifactName + "] not found in jar archive" );
+ return false;
+ }
+ }
+
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-fullcontent/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/pom.xml?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/pom.xml Tue Jan 1 13:40:09 2008
@@ -39,10 +39,10 @@
<include>**/service/*</include>
</includes>
</configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
</plugin>
</plugins>
</build>
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/src/main/java/TestCompile1.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/src/main/java/service/TestInterface.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/src/main/java/service/impl/TestImplementation.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/src/main/resources/notIncluded.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/verify.bsh?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/verify.bsh (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/verify.bsh Tue Jan 1 13:40:09 2008
@@ -1,84 +1,84 @@
-
-/*
- * 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 java.util.*;
-import java.util.jar.*;
-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 artifact = new File ( target, "maven-jar-plugin-test-mjar-30-02-99.0.jar" );
- if ( !artifact.exists() || artifact.isDirectory() )
- {
- System.err.println( "artifact file is missing or a directory." );
- return false;
- }
-
- String[] artifactNames = new String[] { "service/TestInterface.class", "META-INF/MANIFEST.MF",
- "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-02/pom.properties",
- "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-02/pom.xml" };
-
- Set contents = new HashSet();
-
- JarFile jar = new JarFile( artifact );
- Enumeration jarEntries = jar.entries();
- while ( jarEntries.hasMoreElements() )
- {
- JarEntry entry = (JarEntry) jarEntries.nextElement();
- if ( !entry.isDirectory() )
- {
- // Only compare files
- contents.add( entry.getName() );
- }
- }
-
- if ( artifactNames.length != contents.size() )
- {
- System.err.println( "jar content size is different from the expected content size" );
- return false;
- }
- for ( int i = 0; i < artifactNames.length; i++ )
- {
- String artifactName = artifactNames[i];
- if ( !contents.contains( artifactName ) )
- {
- System.err.println( "Artifact[" + artifactName + "] not found in jar archive" );
- 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 java.util.*;
+import java.util.jar.*;
+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 artifact = new File ( target, "maven-jar-plugin-test-mjar-30-02-99.0.jar" );
+ if ( !artifact.exists() || artifact.isDirectory() )
+ {
+ System.err.println( "artifact file is missing or a directory." );
+ return false;
+ }
+
+ String[] artifactNames = new String[] { "service/TestInterface.class", "META-INF/MANIFEST.MF",
+ "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-02/pom.properties",
+ "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-02/pom.xml" };
+
+ Set contents = new HashSet();
+
+ JarFile jar = new JarFile( artifact );
+ Enumeration jarEntries = jar.entries();
+ while ( jarEntries.hasMoreElements() )
+ {
+ JarEntry entry = (JarEntry) jarEntries.nextElement();
+ if ( !entry.isDirectory() )
+ {
+ // Only compare files
+ contents.add( entry.getName() );
+ }
+ }
+
+ if ( artifactNames.length != contents.size() )
+ {
+ System.err.println( "jar content size is different from the expected content size" );
+ return false;
+ }
+ for ( int i = 0; i < artifactNames.length; i++ )
+ {
+ String artifactName = artifactNames[i];
+ if ( !contents.contains( artifactName ) )
+ {
+ System.err.println( "Artifact[" + artifactName + "] not found in jar archive" );
+ return false;
+ }
+ }
+
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-30-include/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-60/pom.xml
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Jan 1 13:40:09 2008
@@ -1 +1 @@
-LF
+native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-60/src/main/java/myproject/HelloWorld.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Jan 1 13:40:09 2008
@@ -1 +1 @@
-LF
+native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-60/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-60/verify.bsh?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-60/verify.bsh (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-60/verify.bsh Tue Jan 1 13:40:09 2008
@@ -1,76 +1,76 @@
-
-/*
- * 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 java.util.*;
-import java.util.jar.*;
-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 artifact = new File ( target, "MJAR-60-1.0-SNAPSHOT.jar" );
- if ( !artifact.exists() || artifact.isDirectory() )
- {
- System.err.println( "artifact file is missing or a directory." );
- return false;
- }
-
- JarFile jar = new JarFile( artifact );
- Enumeration jarEntries = jar.entries();
- while ( jarEntries.hasMoreElements() )
- {
- JarEntry entry = (JarEntry) jarEntries.nextElement();
- if ( !entry.isDirectory() )
- {
- // Only compare files
- if ( entry.getName().equals ("META-INF/MANIFEST.MF") )
- {
- String manifest = IOUtil.toString ( jar.getInputStream ( entry ) );
- int index = manifest.indexOf ( "Class-Path: config/" );
- if ( index <= 0 )
- {
- System.err.println ( "MANIFEST doens t contains : Class-Path: config/" );
- return false;
- }
- return true;
- }
- }
- }
- System.err.println ( "MANIFEST.MF not found" );
- 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 java.util.*;
+import java.util.jar.*;
+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 artifact = new File ( target, "MJAR-60-1.0-SNAPSHOT.jar" );
+ if ( !artifact.exists() || artifact.isDirectory() )
+ {
+ System.err.println( "artifact file is missing or a directory." );
+ return false;
+ }
+
+ JarFile jar = new JarFile( artifact );
+ Enumeration jarEntries = jar.entries();
+ while ( jarEntries.hasMoreElements() )
+ {
+ JarEntry entry = (JarEntry) jarEntries.nextElement();
+ if ( !entry.isDirectory() )
+ {
+ // Only compare files
+ if ( entry.getName().equals ("META-INF/MANIFEST.MF") )
+ {
+ String manifest = IOUtil.toString ( jar.getInputStream ( entry ) );
+ int index = manifest.indexOf ( "Class-Path: config/" );
+ if ( index <= 0 )
+ {
+ System.err.println ( "MANIFEST doens t contains : Class-Path: config/" );
+ return false;
+ }
+ return true;
+ }
+ }
+ }
+ System.err.println ( "MANIFEST.MF not found" );
+ return false;
+
+
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-60/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-no-recreation/pom.xml
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Jan 1 13:40:09 2008
@@ -1 +1 @@
-LF
+native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-no-recreation/src/main/java/myproject/HelloWorld.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Jan 1 13:40:09 2008
@@ -1 +1 @@
-LF
+native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-no-recreation/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-no-recreation/verify.bsh?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-no-recreation/verify.bsh (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-no-recreation/verify.bsh Tue Jan 1 13:40:09 2008
@@ -1,79 +1,79 @@
-
-/*
- * 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 java.util.*;
-import java.util.jar.*;
-import org.codehaus.plexus.util.*;
-import org.codehaus.plexus.util.cli.*;
-
-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 artifact = new File ( target, "MJAR-70-no-recreation-1.0-SNAPSHOT.jar" );
- if ( !artifact.exists() || artifact.isDirectory() )
- {
- System.err.println( "artifact file is missing or a directory." );
- return false;
- }
-
- long lastModified = artifact.lastModified();
+
+/*
+ * 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 java.util.*;
+import java.util.jar.*;
+import org.codehaus.plexus.util.*;
+import org.codehaus.plexus.util.cli.*;
+
+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 artifact = new File ( target, "MJAR-70-no-recreation-1.0-SNAPSHOT.jar" );
+ if ( !artifact.exists() || artifact.isDirectory() )
+ {
+ System.err.println( "artifact file is missing or a directory." );
+ return false;
+ }
+
+ long lastModified = artifact.lastModified();
String localRepoPath = basedir.getParentFile().getParentFile().getParentFile().getPath() + "/target/local-repo";
- Commandline commandline = new Commandline();
- commandline.setExecutable( "mvn" );
- commandline.setWorkingDirectory( basedir );
- commandline.createArg().setLine( "-f interpolated-pom.xml -Dmaven.repo.local=" + localRepoPath + " package" );
- CommandLineUtils.StringStreamConsumer consumer = new CommandLineUtils.StringStreamConsumer();
- int res = CommandLineUtils.executeCommandLine( commandline, consumer, consumer );
- System.out.println( consumer.getOutput() );
+ Commandline commandline = new Commandline();
+ commandline.setExecutable( "mvn" );
+ commandline.setWorkingDirectory( basedir );
+ commandline.createArg().setLine( "-f interpolated-pom.xml -Dmaven.repo.local=" + localRepoPath + " package" );
+ CommandLineUtils.StringStreamConsumer consumer = new CommandLineUtils.StringStreamConsumer();
+ int res = CommandLineUtils.executeCommandLine( commandline, consumer, consumer );
+ System.out.println( consumer.getOutput() );
if ( res != 0 )
{
System.err.println( "mvn cli invocation not return 0 but " + res );
return false;
}
- artifact = new File ( target, "MJAR-70-no-recreation-1.0-SNAPSHOT.jar" );
- if ( !artifact.exists() || artifact.isDirectory() )
- {
- System.err.println( "artifact file is missing or a directory." );
- return false;
- }
- if ( lastModified != artifact.lastModified() )
- {
- System.err.println( "lastModified != artifact.lastModified() jar has been recreated" );
- return false;
- }
-
-
-}
-catch( Throwable e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
+ artifact = new File ( target, "MJAR-70-no-recreation-1.0-SNAPSHOT.jar" );
+ if ( !artifact.exists() || artifact.isDirectory() )
+ {
+ System.err.println( "artifact file is missing or a directory." );
+ return false;
+ }
+ if ( lastModified != artifact.lastModified() )
+ {
+ System.err.println( "lastModified != artifact.lastModified() jar has been recreated" );
+ return false;
+ }
+
+
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-no-recreation/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-recreation/pom.xml
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Jan 1 13:40:09 2008
@@ -1 +1 @@
-LF
+native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-recreation/src/main/java/myproject/HelloWorld.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Jan 1 13:40:09 2008
@@ -1 +1 @@
-LF
+native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-recreation/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-recreation/verify.bsh?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-recreation/verify.bsh (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-recreation/verify.bsh Tue Jan 1 13:40:09 2008
@@ -1,78 +1,78 @@
-
-/*
- * 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 java.util.*;
-import java.util.jar.*;
-import org.codehaus.plexus.util.*;
-import org.codehaus.plexus.util.cli.*;
-
-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 artifact = new File ( target, "MJAR-70-recreation-1.0-SNAPSHOT.jar" );
- if ( !artifact.exists() || artifact.isDirectory() )
- {
- System.err.println( "artifact file is missing or a directory." );
- return false;
- }
-
- long lastModified = artifact.lastModified();
+
+/*
+ * 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 java.util.*;
+import java.util.jar.*;
+import org.codehaus.plexus.util.*;
+import org.codehaus.plexus.util.cli.*;
+
+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 artifact = new File ( target, "MJAR-70-recreation-1.0-SNAPSHOT.jar" );
+ if ( !artifact.exists() || artifact.isDirectory() )
+ {
+ System.err.println( "artifact file is missing or a directory." );
+ return false;
+ }
+
+ long lastModified = artifact.lastModified();
String localRepoPath = basedir.getParentFile().getParentFile().getParentFile().getPath() + "/target/local-repo";
- Commandline commandline = new Commandline();
- commandline.setExecutable( "mvn" );
- commandline.setWorkingDirectory( basedir );
- commandline.createArg().setLine( "-f interpolated-pom.xml -Dmaven.repo.local=" + localRepoPath + " package" );
- CommandLineUtils.StringStreamConsumer consumer = new CommandLineUtils.StringStreamConsumer();
- int res = CommandLineUtils.executeCommandLine( commandline, consumer, consumer );
+ Commandline commandline = new Commandline();
+ commandline.setExecutable( "mvn" );
+ commandline.setWorkingDirectory( basedir );
+ commandline.createArg().setLine( "-f interpolated-pom.xml -Dmaven.repo.local=" + localRepoPath + " package" );
+ CommandLineUtils.StringStreamConsumer consumer = new CommandLineUtils.StringStreamConsumer();
+ int res = CommandLineUtils.executeCommandLine( commandline, consumer, consumer );
if ( res != 0 )
{
System.err.println( "mvn cli invocation not return 0 but " + res );
return false;
}
- artifact = new File ( target, "MJAR-70-recreation-1.0-SNAPSHOT.jar" );
- if ( !artifact.exists() || artifact.isDirectory() )
- {
- System.err.println( "artifact file is missing or a directory." );
- return false;
- }
- if ( artifact.lastModified() <= lastModified )
- {
- System.err.println( "artifact.lastModified() <= lastModified jar has not been recreated" );
- return false;
- }
-
-
-}
-catch( Throwable e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
+ artifact = new File ( target, "MJAR-70-recreation-1.0-SNAPSHOT.jar" );
+ if ( !artifact.exists() || artifact.isDirectory() )
+ {
+ System.err.println( "artifact file is missing or a directory." );
+ return false;
+ }
+ if ( artifact.lastModified() <= lastModified )
+ {
+ System.err.println( "artifact.lastModified() <= lastModified jar has not been recreated" );
+ return false;
+ }
+
+
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-70-recreation/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/pom.xml?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/pom.xml Tue Jan 1 13:40:09 2008
@@ -55,10 +55,10 @@
</configuration>
</execution>
</executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
</plugin>
</plugins>
</build>
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/src/main/java/foo/project003/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/src/main/resources/default-configuration.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/src/main/resources/excluded-file.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/src/test/java/foo/project003/AppIntegrationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/src/test/java/foo/project003/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/src/test/resources/excluded-file.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/src/test/resources/test-default-configuration.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/verify.bsh?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/verify.bsh (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/verify.bsh Tue Jan 1 13:40:09 2008
@@ -1,92 +1,92 @@
-
-/*
- * 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 java.util.*;
-import java.util.jar.*;
-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 artifact = new File ( target, "maven-jar-plugin-test-mjar-80-03-99.0.jar" );
- if ( !artifact.exists() || artifact.isDirectory() )
- {
- System.err.println( "artifact file is missing or a directory." );
- return false;
- }
-
- File testArtifact = new File ( target, "maven-jar-plugin-test-mjar-80-03-99.0-tests.jar" );
- if ( !testArtifact.exists() || testArtifact.isDirectory() )
- {
- System.err.println( "testArtifact file is missing or a directory." );
- return false;
- }
-
- String[] artifactNames = new String[] { "test-default-configuration.properties",
- "foo/project003/AppTest.class", "foo/project003/AppIntegrationTest.class", "META-INF/MANIFEST.MF",
- "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-03/pom.properties",
- "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-03/pom.xml" };
-
- Set contents = new HashSet();
-
- JarFile jar = new JarFile( testArtifact );
- Enumeration jarEntries = jar.entries();
- while ( jarEntries.hasMoreElements() )
- {
- JarEntry entry = (JarEntry) jarEntries.nextElement();
- if ( !entry.isDirectory() )
- {
- // Only compare files
- contents.add( entry.getName() );
- }
- }
-
- if ( artifactNames.length != contents.size() )
- {
- System.err.println( "jar content size is different from the expected content size" );
- return false;
- }
- for ( int i = 0; i < artifactNames.length; i++ )
- {
- String artifactName = artifactNames[i];
- if ( !contents.contains( artifactName ) )
- {
- System.err.println( "Artifact[" + artifactName + "] not found in jar archive" );
- 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 java.util.*;
+import java.util.jar.*;
+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 artifact = new File ( target, "maven-jar-plugin-test-mjar-80-03-99.0.jar" );
+ if ( !artifact.exists() || artifact.isDirectory() )
+ {
+ System.err.println( "artifact file is missing or a directory." );
+ return false;
+ }
+
+ File testArtifact = new File ( target, "maven-jar-plugin-test-mjar-80-03-99.0-tests.jar" );
+ if ( !testArtifact.exists() || testArtifact.isDirectory() )
+ {
+ System.err.println( "testArtifact file is missing or a directory." );
+ return false;
+ }
+
+ String[] artifactNames = new String[] { "test-default-configuration.properties",
+ "foo/project003/AppTest.class", "foo/project003/AppIntegrationTest.class", "META-INF/MANIFEST.MF",
+ "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-03/pom.properties",
+ "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-03/pom.xml" };
+
+ Set contents = new HashSet();
+
+ JarFile jar = new JarFile( testArtifact );
+ Enumeration jarEntries = jar.entries();
+ while ( jarEntries.hasMoreElements() )
+ {
+ JarEntry entry = (JarEntry) jarEntries.nextElement();
+ if ( !entry.isDirectory() )
+ {
+ // Only compare files
+ contents.add( entry.getName() );
+ }
+ }
+
+ if ( artifactNames.length != contents.size() )
+ {
+ System.err.println( "jar content size is different from the expected content size" );
+ return false;
+ }
+ for ( int i = 0; i < artifactNames.length; i++ )
+ {
+ String artifactName = artifactNames[i];
+ if ( !contents.contains( artifactName ) )
+ {
+ System.err.println( "Artifact[" + artifactName + "] not found in jar archive" );
+ return false;
+ }
+ }
+
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-exclude/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/pom.xml?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/pom.xml Tue Jan 1 13:40:09 2008
@@ -50,10 +50,10 @@
<phase>package</phase>
</execution>
</executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
</plugin>
</plugins>
</build>
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/src/main/java/foo/project003/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/src/main/resources/default-configuration.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/src/main/resources/excluded-file.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/src/test/java/foo/project003/AppIntegrationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/src/test/java/foo/project003/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/src/test/resources/test-default-configuration.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/verify.bsh?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/verify.bsh (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/verify.bsh Tue Jan 1 13:40:09 2008
@@ -1,92 +1,92 @@
-
-/*
- * 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 java.util.*;
-import java.util.jar.*;
-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 artifact = new File ( target, "maven-jar-plugin-test-mjar-80-01-99.0.jar" );
- if ( !artifact.exists() || artifact.isDirectory() )
- {
- System.err.println( "artifact file is missing or a directory." );
- return false;
- }
-
- File testArtifact = new File ( target, "maven-jar-plugin-test-mjar-80-01-99.0-tests.jar" );
- if ( !testArtifact.exists() || testArtifact.isDirectory() )
- {
- System.err.println( "testArtifact file is missing or a directory." );
- return false;
- }
-
- String[] artifactNames = new String[] { "test-default-configuration.properties",
- "foo/project003/AppTest.class", "foo/project003/AppIntegrationTest.class", "META-INF/MANIFEST.MF",
- "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-01/pom.properties",
- "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-01/pom.xml" };
-
- Set contents = new HashSet();
-
- JarFile jar = new JarFile( testArtifact );
- Enumeration jarEntries = jar.entries();
- while ( jarEntries.hasMoreElements() )
- {
- JarEntry entry = (JarEntry) jarEntries.nextElement();
- if ( !entry.isDirectory() )
- {
- // Only compare files
- contents.add( entry.getName() );
- }
- }
-
- if ( artifactNames.length != contents.size() )
- {
- System.err.println( "jar content size is different from the expected content size" );
- return false;
- }
- for ( int i = 0; i < artifactNames.length; i++ )
- {
- String artifactName = artifactNames[i];
- if ( !contents.contains( artifactName ) )
- {
- System.err.println( "Artifact[" + artifactName + "] not found in jar archive" );
- 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 java.util.*;
+import java.util.jar.*;
+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 artifact = new File ( target, "maven-jar-plugin-test-mjar-80-01-99.0.jar" );
+ if ( !artifact.exists() || artifact.isDirectory() )
+ {
+ System.err.println( "artifact file is missing or a directory." );
+ return false;
+ }
+
+ File testArtifact = new File ( target, "maven-jar-plugin-test-mjar-80-01-99.0-tests.jar" );
+ if ( !testArtifact.exists() || testArtifact.isDirectory() )
+ {
+ System.err.println( "testArtifact file is missing or a directory." );
+ return false;
+ }
+
+ String[] artifactNames = new String[] { "test-default-configuration.properties",
+ "foo/project003/AppTest.class", "foo/project003/AppIntegrationTest.class", "META-INF/MANIFEST.MF",
+ "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-01/pom.properties",
+ "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-01/pom.xml" };
+
+ Set contents = new HashSet();
+
+ JarFile jar = new JarFile( testArtifact );
+ Enumeration jarEntries = jar.entries();
+ while ( jarEntries.hasMoreElements() )
+ {
+ JarEntry entry = (JarEntry) jarEntries.nextElement();
+ if ( !entry.isDirectory() )
+ {
+ // Only compare files
+ contents.add( entry.getName() );
+ }
+ }
+
+ if ( artifactNames.length != contents.size() )
+ {
+ System.err.println( "jar content size is different from the expected content size" );
+ return false;
+ }
+ for ( int i = 0; i < artifactNames.length; i++ )
+ {
+ String artifactName = artifactNames[i];
+ if ( !contents.contains( artifactName ) )
+ {
+ System.err.println( "Artifact[" + artifactName + "] not found in jar archive" );
+ return false;
+ }
+ }
+
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-fullcontent/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/pom.xml?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/pom.xml Tue Jan 1 13:40:09 2008
@@ -55,10 +55,10 @@
</configuration>
</execution>
</executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
</plugin>
</plugins>
</build>
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/src/main/java/foo/project003/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/src/main/resources/default-configuration.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/src/main/resources/excluded-file.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/src/test/java/foo/project003/AppIntegrationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/src/test/java/foo/project003/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/src/test/resources/test-default-configuration.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/verify.bsh?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/verify.bsh (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/verify.bsh Tue Jan 1 13:40:09 2008
@@ -1,92 +1,92 @@
-
-/*
- * 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 java.util.*;
-import java.util.jar.*;
-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 artifact = new File ( target, "maven-jar-plugin-test-mjar-80-02-99.0.jar" );
- if ( !artifact.exists() || artifact.isDirectory() )
- {
- System.err.println( "artifact file is missing or a directory." );
- return false;
- }
-
- File testArtifact = new File ( target, "maven-jar-plugin-test-mjar-80-02-99.0-tests.jar" );
- if ( !testArtifact.exists() || testArtifact.isDirectory() )
- {
- System.err.println( "testArtifact file is missing or a directory." );
- return false;
- }
-
- String[] artifactNames = new String[] { "foo/project003/AppIntegrationTest.class",
- "META-INF/MANIFEST.MF",
- "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-02/pom.properties",
- "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-02/pom.xml" };
-
- Set contents = new HashSet();
-
- JarFile jar = new JarFile( testArtifact );
- Enumeration jarEntries = jar.entries();
- while ( jarEntries.hasMoreElements() )
- {
- JarEntry entry = (JarEntry) jarEntries.nextElement();
- if ( !entry.isDirectory() )
- {
- // Only compare files
- contents.add( entry.getName() );
- }
- }
-
- if ( artifactNames.length != contents.size() )
- {
- System.err.println( "jar content size is different from the expected content size" );
- return false;
- }
- for ( int i = 0; i < artifactNames.length; i++ )
- {
- String artifactName = artifactNames[i];
- if ( !contents.contains( artifactName ) )
- {
- System.err.println( "Artifact[" + artifactName + "] not found in jar archive" );
- 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 java.util.*;
+import java.util.jar.*;
+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 artifact = new File ( target, "maven-jar-plugin-test-mjar-80-02-99.0.jar" );
+ if ( !artifact.exists() || artifact.isDirectory() )
+ {
+ System.err.println( "artifact file is missing or a directory." );
+ return false;
+ }
+
+ File testArtifact = new File ( target, "maven-jar-plugin-test-mjar-80-02-99.0-tests.jar" );
+ if ( !testArtifact.exists() || testArtifact.isDirectory() )
+ {
+ System.err.println( "testArtifact file is missing or a directory." );
+ return false;
+ }
+
+ String[] artifactNames = new String[] { "foo/project003/AppIntegrationTest.class",
+ "META-INF/MANIFEST.MF",
+ "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-02/pom.properties",
+ "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-02/pom.xml" };
+
+ Set contents = new HashSet();
+
+ JarFile jar = new JarFile( testArtifact );
+ Enumeration jarEntries = jar.entries();
+ while ( jarEntries.hasMoreElements() )
+ {
+ JarEntry entry = (JarEntry) jarEntries.nextElement();
+ if ( !entry.isDirectory() )
+ {
+ // Only compare files
+ contents.add( entry.getName() );
+ }
+ }
+
+ if ( artifactNames.length != contents.size() )
+ {
+ System.err.println( "jar content size is different from the expected content size" );
+ return false;
+ }
+ for ( int i = 0; i < artifactNames.length; i++ )
+ {
+ String artifactName = artifactNames[i];
+ if ( !contents.contains( artifactName ) )
+ {
+ System.err.println( "Artifact[" + artifactName + "] not found in jar archive" );
+ return false;
+ }
+ }
+
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-80-include/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-01/pom.xml
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Jan 1 13:40:09 2008
@@ -1 +1 @@
-LF
+native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-01/src/main/java/foo/project003/App.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Jan 1 13:40:09 2008
@@ -1 +1 @@
-LF
+native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-01/src/main/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-01/src/main/resources/META-INF/MANIFEST.MF?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-01/src/main/resources/META-INF/MANIFEST.MF (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-01/src/main/resources/META-INF/MANIFEST.MF Tue Jan 1 13:40:09 2008
@@ -1,5 +1,5 @@
-Manifest-Version: 1.0
-Archiver-Version: foobar-1.23456
-Built-By: jerome
-Build-Jdk: 1.6.0_02-ea
-
+Manifest-Version: 1.0
+Archiver-Version: foobar-1.23456
+Built-By: jerome
+Build-Jdk: 1.6.0_02-ea
+
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-01/src/main/resources/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-01/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-01/verify.bsh?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-01/verify.bsh (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-01/verify.bsh Tue Jan 1 13:40:09 2008
@@ -1,74 +1,74 @@
-
-/*
- * 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 java.util.*;
-import java.util.jar.*;
-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 artifact = new File ( target, "mjar-71-1.0.jar" );
- if ( !artifact.exists() || artifact.isDirectory() )
- {
- System.err.println( "artifact file " + file + " is missing or a directory." );
- return false;
- }
-
- JarFile jar = new JarFile( artifact );
- Enumeration jarEntries = jar.entries();
- while ( jarEntries.hasMoreElements() )
- {
- JarEntry entry = (JarEntry) jarEntries.nextElement();
- if ( !entry.isDirectory() )
- {
- // Only compare files
- if ( entry.getName().equals ("META-INF/MANIFEST.MF") )
- {
- String manifest = IOUtil.toString ( jar.getInputStream ( entry ) );
- int index = manifest.indexOf ( "Archiver-Version: foobar-1.23456" );
- if ( index <= 0 )
- {
- System.err.println ( "MANIFEST doens t contain: 'Archiver-Version: foobar-1.23456'" );
- return false;
- }
- return true;
- }
- }
- }
- System.err.println ( "MANIFEST.MF not found" );
- 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 java.util.*;
+import java.util.jar.*;
+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 artifact = new File ( target, "mjar-71-1.0.jar" );
+ if ( !artifact.exists() || artifact.isDirectory() )
+ {
+ System.err.println( "artifact file " + file + " is missing or a directory." );
+ return false;
+ }
+
+ JarFile jar = new JarFile( artifact );
+ Enumeration jarEntries = jar.entries();
+ while ( jarEntries.hasMoreElements() )
+ {
+ JarEntry entry = (JarEntry) jarEntries.nextElement();
+ if ( !entry.isDirectory() )
+ {
+ // Only compare files
+ if ( entry.getName().equals ("META-INF/MANIFEST.MF") )
+ {
+ String manifest = IOUtil.toString ( jar.getInputStream ( entry ) );
+ int index = manifest.indexOf ( "Archiver-Version: foobar-1.23456" );
+ if ( index <= 0 )
+ {
+ System.err.println ( "MANIFEST doens t contain: 'Archiver-Version: foobar-1.23456'" );
+ return false;
+ }
+ return true;
+ }
+ }
+ }
+ System.err.println ( "MANIFEST.MF not found" );
+ return false;
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-01/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-02/pom.xml
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Jan 1 13:40:09 2008
@@ -1 +1 @@
-LF
+native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-02/src/main/java/foo/project003/App.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Jan 1 13:40:09 2008
@@ -1 +1 @@
-LF
+native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-02/src/main/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-02/src/main/resources/META-INF/MANIFEST.MF?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-02/src/main/resources/META-INF/MANIFEST.MF (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-02/src/main/resources/META-INF/MANIFEST.MF Tue Jan 1 13:40:09 2008
@@ -1,5 +1,5 @@
-Manifest-Version: 1.0
-Archiver-Version: foobar-1.23456
-Built-By: jerome
-Build-Jdk: 1.6.0_02-ea
-
+Manifest-Version: 1.0
+Archiver-Version: foobar-1.23456
+Built-By: jerome
+Build-Jdk: 1.6.0_02-ea
+
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-02/src/main/resources/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
svn:eol-style = native