You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by hu...@apache.org on 2010/04/07 14:50:40 UTC
svn commit: r931528 - in /incubator/aries/trunk/eba-maven-plugin/src:
it/default/ it/default/src/main/eba/
test/remote-repo/org/apache/maven/test/maven-artifact01/1.0-SNAPSHOT/
test/remote-repo/org/apache/maven/test/maven-artifact02/1.0-SNAPSHOT/
test/...
Author: hughesj
Date: Wed Apr 7 12:50:40 2010
New Revision: 931528
URL: http://svn.apache.org/viewvc?rev=931528&view=rev
Log:
ARIES-267 fix the eba-maven-plugin itests and add some license headers to please RAT
Modified:
incubator/aries/trunk/eba-maven-plugin/src/it/default/pom.xml
incubator/aries/trunk/eba-maven-plugin/src/it/default/src/main/eba/SomeResource.txt
incubator/aries/trunk/eba-maven-plugin/src/it/default/verify.bsh
incubator/aries/trunk/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact01/1.0-SNAPSHOT/maven-artifact01-1.0-SNAPSHOT.pom
incubator/aries/trunk/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact02/1.0-SNAPSHOT/maven-artifact02-1.0-SNAPSHOT.pom
incubator/aries/trunk/eba-maven-plugin/src/test/resources/unit/basic-eba-test/plugin-config.xml
incubator/aries/trunk/eba-maven-plugin/src/test/resources/unit/basic-eba-with-descriptor/plugin-config.xml
incubator/aries/trunk/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/plugin-config.xml
Modified: incubator/aries/trunk/eba-maven-plugin/src/it/default/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/eba-maven-plugin/src/it/default/pom.xml?rev=931528&r1=931527&r2=931528&view=diff
==============================================================================
--- incubator/aries/trunk/eba-maven-plugin/src/it/default/pom.xml (original)
+++ incubator/aries/trunk/eba-maven-plugin/src/it/default/pom.xml Wed Apr 7 12:50:40 2010
@@ -33,13 +33,13 @@ under the License.
<build>
<plugins>
<plugin>
- <groupId>org.apache.aries.application</groupId>
+ <groupId>org.apache.aries</groupId>
<artifactId>eba-maven-plugin</artifactId>
<version>@project.version@</version>
<extensions>true</extensions>
<configuration>
<includeJar>false</includeJar>
- <applicationManifestFile>src/main/custom/application.mf</applicationManifestFile>
+ <applicationManifestFile>src/main/custom/APPLICATION.MF</applicationManifestFile>
</configuration>
</plugin>
</plugins>
Modified: incubator/aries/trunk/eba-maven-plugin/src/it/default/src/main/eba/SomeResource.txt
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/eba-maven-plugin/src/it/default/src/main/eba/SomeResource.txt?rev=931528&r1=931527&r2=931528&view=diff
==============================================================================
--- incubator/aries/trunk/eba-maven-plugin/src/it/default/src/main/eba/SomeResource.txt (original)
+++ incubator/aries/trunk/eba-maven-plugin/src/it/default/src/main/eba/SomeResource.txt Wed Apr 7 12:50:40 2010
@@ -0,0 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
Modified: incubator/aries/trunk/eba-maven-plugin/src/it/default/verify.bsh
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/eba-maven-plugin/src/it/default/verify.bsh?rev=931528&r1=931527&r2=931528&view=diff
==============================================================================
--- incubator/aries/trunk/eba-maven-plugin/src/it/default/verify.bsh (original)
+++ incubator/aries/trunk/eba-maven-plugin/src/it/default/verify.bsh Wed Apr 7 12:50:40 2010
@@ -1,3 +1,21 @@
+/*
+ * 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.*;
@@ -16,7 +34,7 @@ try
JarFile jar = new JarFile( jarFile );
String[] includedEntries = {
- "META-INF/application.mf",
+ "META-INF/APPLICATION.MF",
"SomeResource.txt",
};
for ( String included : includedEntries )
Modified: incubator/aries/trunk/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact01/1.0-SNAPSHOT/maven-artifact01-1.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact01/1.0-SNAPSHOT/maven-artifact01-1.0-SNAPSHOT.pom?rev=931528&r1=931527&r2=931528&view=diff
==============================================================================
--- incubator/aries/trunk/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact01/1.0-SNAPSHOT/maven-artifact01-1.0-SNAPSHOT.pom (original)
+++ incubator/aries/trunk/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact01/1.0-SNAPSHOT/maven-artifact01-1.0-SNAPSHOT.pom Wed Apr 7 12:50:40 2010
@@ -1,6 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.test</groupId>
<artifactId>maven-artifact01</artifactId>
<version>1.0-SNAPSHOT</version>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/aries/trunk/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact02/1.0-SNAPSHOT/maven-artifact02-1.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact02/1.0-SNAPSHOT/maven-artifact02-1.0-SNAPSHOT.pom?rev=931528&r1=931527&r2=931528&view=diff
==============================================================================
--- incubator/aries/trunk/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact02/1.0-SNAPSHOT/maven-artifact02-1.0-SNAPSHOT.pom (original)
+++ incubator/aries/trunk/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact02/1.0-SNAPSHOT/maven-artifact02-1.0-SNAPSHOT.pom Wed Apr 7 12:50:40 2010
@@ -1,6 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.test</groupId>
<artifactId>maven-artifact02</artifactId>
<version>1.0-SNAPSHOT</version>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/aries/trunk/eba-maven-plugin/src/test/resources/unit/basic-eba-test/plugin-config.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/eba-maven-plugin/src/test/resources/unit/basic-eba-test/plugin-config.xml?rev=931528&r1=931527&r2=931528&view=diff
==============================================================================
--- incubator/aries/trunk/eba-maven-plugin/src/test/resources/unit/basic-eba-test/plugin-config.xml (original)
+++ incubator/aries/trunk/eba-maven-plugin/src/test/resources/unit/basic-eba-test/plugin-config.xml Wed Apr 7 12:50:40 2010
@@ -24,7 +24,7 @@ under the License.
<artifactId>eba-maven-plugin</artifactId>
<configuration>
<ebaSourceDirectory>${basedir}/src/test/resources/unit/basic-eba-test/src/main/eba</ebaSourceDirectory>
- <applicationManifestFile>${basedir}/src/test/resources/unit/basic-eba-test/src/main/eba/META-INF/application.mf</applicationManifestFile>
+ <applicationManifestFile>${basedir}/src/test/resources/unit/basic-eba-test/src/main/eba/META-INF/APPLICATION.MF</applicationManifestFile>
<includeJar>true</includeJar>
<addMavenDescriptor>true</addMavenDescriptor>
<includeEmptyDirs>true</includeEmptyDirs>
Modified: incubator/aries/trunk/eba-maven-plugin/src/test/resources/unit/basic-eba-with-descriptor/plugin-config.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/eba-maven-plugin/src/test/resources/unit/basic-eba-with-descriptor/plugin-config.xml?rev=931528&r1=931527&r2=931528&view=diff
==============================================================================
--- incubator/aries/trunk/eba-maven-plugin/src/test/resources/unit/basic-eba-with-descriptor/plugin-config.xml (original)
+++ incubator/aries/trunk/eba-maven-plugin/src/test/resources/unit/basic-eba-with-descriptor/plugin-config.xml Wed Apr 7 12:50:40 2010
@@ -24,7 +24,7 @@ under the License.
<artifactId>eba-maven-plugin</artifactId>
<configuration>
<ebaSourceDirectory>${basedir}/src/test/resources/unit/basic-eba-with-descriptor/src/main/eba</ebaSourceDirectory>
- <applicationManifestFile>${basedir}/src/test/resources/unit/basic-eba-with-descriptor/src/main/eba/META-INF/application.mf</applicationManifestFile>
+ <applicationManifestFile>${basedir}/src/test/resources/unit/basic-eba-with-descriptor/src/main/eba/META-INF/APPLICATION.MF</applicationManifestFile>
<includeJar>false</includeJar>
<addMavenDescriptor>true</addMavenDescriptor>
<includeEmptyDirs>true</includeEmptyDirs>
Modified: incubator/aries/trunk/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/plugin-config.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/plugin-config.xml?rev=931528&r1=931527&r2=931528&view=diff
==============================================================================
--- incubator/aries/trunk/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/plugin-config.xml (original)
+++ incubator/aries/trunk/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/plugin-config.xml Wed Apr 7 12:50:40 2010
@@ -24,7 +24,7 @@ under the License.
<artifactId>eba-maven-plugin</artifactId>
<configuration>
<ebaSourceDirectory>${basedir}/src/test/resources/unit/basic-eba-with-manifest/src/main/eba</ebaSourceDirectory>
- <applicationManifestFile>${basedir}/src/test/resources/unit/basic-eba-with-manifest/src/main/eba/META-INF/application.mf</applicationManifestFile>
+ <applicationManifestFile>${basedir}/src/test/resources/unit/basic-eba-with-manifest/src/main/eba/META-INF/APPLICATION.MF</applicationManifestFile>
<includeJar>false</includeJar>
<addMavenDescriptor>true</addMavenDescriptor>
<includeEmptyDirs>true</includeEmptyDirs>