Modified: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-02/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-02/verify.bsh?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-02/verify.bsh (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/mjar-71-02/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-02-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 contains:
'Archiver-Version: foobar-1.23456', but shouldn't" );
- 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-02-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 contains:
'Archiver-Version: foobar-1.23456', but shouldn't" );
+ 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-02/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-90/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/mjar-90/pom.xml?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/mjar-90/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/mjar-90/pom.xml Tue Jan 1
13:40:09 2008
@@ -53,10 +53,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-90/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-90/src/main/java/Foo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-jar-plugin/src/it/mjar-90/src/test/java/FooTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-90/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/mjar-90/verify.bsh?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/mjar-90/verify.bsh (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/mjar-90/verify.bsh Tue Jan 1
13:40:09 2008
@@ -1,57 +1,57 @@
-
-/*
- * 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-90-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-90-99.0-tests.jar" );
- if ( testArtifact.exists() )
- {
- System.err.println( "testArtifact file has been created with
maven.Test.skip=true." );
- 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-90-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-90-99.0-tests.jar" );
+ if ( testArtifact.exists() )
+ {
+ System.err.println( "testArtifact file has been created with
maven.Test.skip=true." );
+ return false;
+ }
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/mjar-90/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/project-004/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/project-004/pom.xml?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/project-004/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/project-004/pom.xml Tue Jan 1
13:40:09 2008
@@ -49,10 +49,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/project-004/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-jar-plugin/src/it/project-004/src/main/java/TestCompile1.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-jar-plugin/src/it/project-004/src/main/java/service/TestInterface.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-jar-plugin/src/it/project-004/src/main/java/service/impl/TestImplementation.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-jar-plugin/src/it/project-004/src/main/resources/notIncluded.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/project-004/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/project-004/verify.bsh?rev=607923&r1=607922&r2=607923&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/project-004/verify.bsh
(original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/project-004/verify.bsh Tue Jan
1 13:40:09 2008
@@ -1,127 +1,127 @@
-
-/*
- * 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-project-004-99.0.jar" );
- if ( !artifact.exists() || artifact.isDirectory() )
- {
- System.err.println( "target file is missing or a directory." );
- return false;
- }
-
- String[] artifactNames = new String[] { "service/TestInterface.class",
- "service/impl/TestImplementation.class", "TestCompile1.class",
"notIncluded.xml", "META-INF/MANIFEST.MF",
-
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.properties",
-
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/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;
- }
- }
-
- // second jar
-
- artifact = new File ( target,
"maven-jar-plugin-test-project-004-99.0-service.jar" );
- if ( !artifact.exists() || artifact.isDirectory() )
- {
- System.err.println( "target file is missing or a directory." );
- return false;
- }
-
- artifactNames = new String[] { "service/TestInterface.class",
- "META-INF/MANIFEST.MF",
-
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.properties",
-
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.xml"
};
-
- contents = new HashSet();
-
- jar = new JarFile( artifact );
- 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-project-004-99.0.jar" );
+ if ( !artifact.exists() || artifact.isDirectory() )
+ {
+ System.err.println( "target file is missing or a directory." );
+ return false;
+ }
+
+ String[] artifactNames = new String[] { "service/TestInterface.class",
+ "service/impl/TestImplementation.class", "TestCompile1.class",
"notIncluded.xml", "META-INF/MANIFEST.MF",
+
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.properties",
+
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/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;
+ }
+ }
+
+ // second jar
+
+ artifact = new File ( target,
"maven-jar-plugin-test-project-004-99.0-service.jar" );
+ if ( !artifact.exists() || artifact.isDirectory() )
+ {
+ System.err.println( "target file is missing or a directory." );
+ return false;
+ }
+
+ artifactNames = new String[] { "service/TestInterface.class",
+ "META-INF/MANIFEST.MF",
+
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.properties",
+
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.xml"
};
+
+ contents = new HashSet();
+
+ jar = new JarFile( artifact );
+ 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/project-004/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
