Author: jdcasey
Date: Tue Sep 21 20:36:24 2010
New Revision: 999613
URL: http://svn.apache.org/viewvc?rev=999613&view=rev
Log:
[MASSEMBLY-360] adding files I missed last commit, and adding an IT for
spring-file aggregation.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/resources/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/resources/META-INF/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/resources/META-INF/services/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/resources/META-INF/services/test.Test
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/assemble/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/resources/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/resources/META-INF/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/resources/META-INF/services/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/resources/META-INF/services/test.Test
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/verify.bsh
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.handlers
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.schemas
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/assemble/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.handlers
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.schemas
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/AppTest.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.bsh
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolutionException.java
(with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,17 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>test</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>child1</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/java/test/App.java?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/java/test/App.java
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/resources/META-INF/services/test.Test
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/resources/META-INF/services/test.Test?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/resources/META-INF/services/test.Test
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/resources/META-INF/services/test.Test
Tue Sep 21 20:36:24 2010
@@ -0,0 +1 @@
+test.Foo
\ No newline at end of file
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,38 @@
+package test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,49 @@
+<?xml version='1.0'?>
+<project>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>test</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>child2</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>child1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-binary-assembly</id>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/assemble/bin.xml?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/assemble/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/assemble/bin.xml
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,24 @@
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>bin</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <containerDescriptorHandlers>
+ <containerDescriptorHandler>
+ <handlerName>metaInf-services</handlerName>
+ </containerDescriptorHandler>
+ </containerDescriptorHandlers>
+ <dependencySets>
+ <dependencySet>
+ <unpack>true</unpack>
+ <outputDirectory>.</outputDirectory>
+ <scope>test</scope>
+ <excludes>
+ <exclude>junit:junit</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/java/test/App.java?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/java/test/App.java
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/resources/META-INF/services/test.Test
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/resources/META-INF/services/test.Test?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/resources/META-INF/services/test.Test
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/resources/META-INF/services/test.Test
Tue Sep 21 20:36:24 2010
@@ -0,0 +1 @@
+test.Bar
\ No newline at end of file
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,38 @@
+package test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/goals.txt?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/goals.txt
Tue Sep 21 20:36:24 2010
@@ -0,0 +1 @@
+package
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/pom.xml?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/pom.xml
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <modules>
+ <module>child1</module>
+ <module>child2</module>
+ </modules>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/verify.bsh?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/verify.bsh
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,53 @@
+import java.io.*;
+import java.util.jar.*;
+
+try
+{
+ boolean fooFound = false;
+ boolean barFound = false;
+
+ JarFile file = new JarFile( new File( basedir,
"child2/target/child2-1.0-SNAPSHOT-bin.jar" ) );
+ JarEntry entry = file.getEntry( "META-INF/services/test.Test" );
+ if ( entry == null )
+ {
+ return false;
+ }
+
+ BufferedReader br = new BufferedReader( new InputStreamReader(
file.getInputStream( entry ) ) );
+
+ String line = null;
+ while( ( line = br.readLine() ) != null )
+ {
+ if ( line.equals( "test.Foo" ) )
+ {
+ fooFound = true;
+ }
+ else if ( line.equals( "test.Bar" ) )
+ {
+ barFound = true;
+ }
+
+ if ( fooFound && barFound )
+ {
+ break;
+ }
+ }
+
+ if ( !fooFound )
+ {
+ System.out.println( "Cannot find entry 'test.Foo' in: " + entry.getName()
);
+ }
+
+ if ( !barFound )
+ {
+ System.out.println( "Cannot find entry 'test.Bar' in: " + entry.getName()
);
+ }
+
+ return fooFound && barFound;
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+}
+
+return false;
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,17 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>test</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>child1</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/java/test/App.java?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/java/test/App.java
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.handlers
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.handlers?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.handlers
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.handlers
Tue Sep 21 20:36:24 2010
@@ -0,0 +1 @@
+http\://www.springframework.org/schema/aop=org.springframework.aop.config.AopNamespaceHandler1
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.handlers
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.schemas?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.schemas
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.schemas
Tue Sep 21 20:36:24 2010
@@ -0,0 +1 @@
+http\://www.springframework.org/schema/aop/spring-aop-2.0.xsd=org/springframework/aop/config/spring-aop-3.0.xsd
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.schemas
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,38 @@
+package test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/pom.xml?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/pom.xml
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,49 @@
+<?xml version='1.0'?>
+<project>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>test</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>child2</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>child1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-binary-assembly</id>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/assemble/bin.xml?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/assemble/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/assemble/bin.xml
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,24 @@
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>bin</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <containerDescriptorHandlers>
+ <containerDescriptorHandler>
+ <handlerName>metaInf-spring</handlerName>
+ </containerDescriptorHandler>
+ </containerDescriptorHandlers>
+ <dependencySets>
+ <dependencySet>
+ <unpack>true</unpack>
+ <outputDirectory>.</outputDirectory>
+ <scope>test</scope>
+ <excludes>
+ <exclude>junit:junit</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/java/test/App.java?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/java/test/App.java
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.handlers
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.handlers?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.handlers
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.handlers
Tue Sep 21 20:36:24 2010
@@ -0,0 +1 @@
+http\://www.springframework.org/schema/context=org.springframework.context.config.ContextNamespaceHandler1
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.handlers
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.schemas?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.schemas
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.schemas
Tue Sep 21 20:36:24 2010
@@ -0,0 +1 @@
+http\://www.springframework.org/schema/aop/spring-aop-2.0.xsd=org/springframework/aop/config/spring-aop-4.0.xsd
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.schemas
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/AppTest.java?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/AppTest.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/AppTest.java
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,38 @@
+package test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/goals.txt?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/goals.txt
Tue Sep 21 20:36:24 2010
@@ -0,0 +1 @@
+package
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/pom.xml?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/pom.xml
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <modules>
+ <module>child1</module>
+ <module>child2</module>
+ </modules>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.bsh?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.bsh
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,100 @@
+import java.io.*;
+import java.util.jar.*;
+
+try
+{
+ JarFile file = new JarFile( new File( basedir,
"child2/target/child2-1.0-SNAPSHOT-bin.jar" ) );
+ JarEntry handlerEntry = file.getEntry( "META-INF/spring.handlers" );
+ if ( handlerEntry == null )
+ {
+ return false;
+ }
+
+ BufferedReader br = new BufferedReader( new InputStreamReader(
file.getInputStream( handlerEntry ) ) );
+
+ boolean aopFound = false;
+ boolean ctxFound = false;
+
+ String line = null;
+ while( ( line = br.readLine() ) != null )
+ {
+ if ( line.endsWith( "AopNamespaceHandler1" ) )
+ {
+ aopFound = true;
+ }
+ else if ( line.endsWith( "ContextNamespaceHandler1" ) )
+ {
+ ctxFound = true;
+ }
+
+ if ( aopFound && ctxFound )
+ {
+ break;
+ }
+ }
+
+ if ( !aopFound )
+ {
+ System.out.println( "Cannot find entry 'AopNamespaceHandler1' in: " +
handlerEntry.getName() );
+ return false;
+ }
+
+ br.close();
+
+ if ( !ctxFound )
+ {
+ System.out.println( "Cannot find entry 'ContextNamespaceHandler1' in: " +
handlerEntry.getName() );
+ return false;
+ }
+
+ JarEntry schemaEntry = file.getEntry( "META-INF/spring.schemas" );
+ if ( schemaEntry == null )
+ {
+ return false;
+ }
+
+ br = new BufferedReader( new InputStreamReader( file.getInputStream(
schemaEntry ) ) );
+
+ boolean found30 = false;
+ boolean found40 = false;
+
+ String line = null;
+ while( ( line = br.readLine() ) != null )
+ {
+ if ( line.endsWith( "spring-aop-3.0.xsd" ) )
+ {
+ found30 = true;
+ }
+ else if ( line.endsWith( "spring-aop-4.0.xsd" ) )
+ {
+ found40 = true;
+ }
+
+ if ( found30 && found40 )
+ {
+ break;
+ }
+ }
+
+ br.close();
+
+ if ( !found30 )
+ {
+ System.out.println( "Cannot find entry 'spring-aop-3.0.xsd' in: " +
schemaEntry.getName() );
+ return false;
+ }
+
+ if ( !found40 )
+ {
+ System.out.println( "Cannot find entry 'spring-aop-4.0.xsd' in: " +
schemaEntry.getName() );
+ return false;
+ }
+
+ return true;
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+}
+
+return false;
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolutionException.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolutionException.java?rev=999613&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolutionException.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolutionException.java
Tue Sep 21 20:36:24 2010
@@ -0,0 +1,41 @@
+package org.apache.maven.plugin.assembly.artifact;
+
+/*
+ * 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.
+ */
+
+/**
+ * @version $Id$
+ */
+public class DependencyResolutionException
+ extends Exception
+{
+
+ private static final long serialVersionUID = 1L;
+
+ public DependencyResolutionException( final String message, final
Throwable error )
+ {
+ super( message, error );
+ }
+
+ public DependencyResolutionException( final String message )
+ {
+ super( message );
+ }
+
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolutionException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java?rev=999613&r1=999612&r2=999613&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java
Tue Sep 21 20:36:24 2010
@@ -25,7 +25,7 @@ public class MetaInfSpringHandler
extends AbstractLineAggregatingHandler
{
- private static final String SPRING_PATH_PREFIX = "/META-INF";
+ private static final String SPRING_PATH_PREFIX = "META-INF/";
@Override
protected String getOutputPathPrefix( final FileInfo fileInfo )
