Author: pieber Date: Mon Jun 18 17:29:10 2012 New Revision: 1351419 URL: http://svn.apache.org/viewvc?rev=1351419&view=rev Log: [KARAF-1533] Add integration tests for karaf-maven-plugin:features-generate-descriptor; thx to Brian Topping for this patch
Signed-off-by: Andreas Pieber <[email protected]> Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/src/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/src/main/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/src/main/java/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/src/main/java/test/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/src/main/java/test/App.java karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-a/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-a/pom.xml karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-a/src/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-a/src/main/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-a/src/main/java/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-a/src/main/java/test/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-a/src/main/java/test/A.java karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-b/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-b/pom.xml karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-b/src/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-b/src/main/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-b/src/main/java/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-b/src/main/java/test/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-b/src/main/java/test/B.java karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-c/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-c/pom.xml karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-c/src/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-c/src/main/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-c/src/main/java/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-c/src/main/java/test/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-c/src/main/java/test/C.java karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-d/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-d/pom.xml karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-d/src/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-d/src/main/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-d/src/main/java/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-d/src/main/java/test/ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-d/src/main/java/test/D.java karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/verify.bsh Modified: karaf/trunk/tooling/karaf-maven-plugin/pom.xml Modified: karaf/trunk/tooling/karaf-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/pom.xml?rev=1351419&r1=1351418&r2=1351419&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/pom.xml (original) +++ karaf/trunk/tooling/karaf-maven-plugin/pom.xml Mon Jun 18 17:29:10 2012 @@ -152,32 +152,53 @@ <artifactId>easymock</artifactId> <scope>test</scope> </dependency> - </dependencies> - <build> - <plugins> - <!--<plugin>--> - <!--<groupId>org.codehaus.mojo</groupId>--> - <!--<artifactId>jaxb2-maven-plugin</artifactId>--> - <!--<version>1.3</version>--> - <!--<executions>--> - <!--<execution>--> - <!--<goals>--> - <!--<goal>xjc</goal>--> - <!--</goals>--> - <!--</execution>--> - <!--</executions>--> - <!--<configuration>--> - <!--<schemaDirectory>src/main/resources/org/apache/karaf/features</schemaDirectory>--> - <!--<packageName>org.apache.karaf.features.wrapper</packageName>--> - <!--<extension>true</extension>--> - <!--</configuration>--> - <!--</plugin>--> - - </plugins> - </build> - + <profiles> + <profile> + <id>ci-build-profile</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-invoker-plugin</artifactId> + <version>1.6</version> + <configuration> + <debug>true</debug> + <projectsDirectory>src/it</projectsDirectory> + <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> + <pomIncludes> + <pomInclude>*/pom.xml</pomInclude> + </pomIncludes> + <postBuildHookScript>verify</postBuildHookScript> + <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> + <!--<settingsFile>src/it/settings.xml</settingsFile>--> + <mavenOpts>-Djava.io.tmpdir=${project.build.directory}</mavenOpts> + <goals> + <goal>install</goal> + </goals> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <version>1.3</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + </profile> + </profiles> <reporting> <!--<outputDirectory>target/site</outputDirectory>--> <plugins> Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml?rev=1351419&view=auto ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml (added) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml Mon Jun 18 17:29:10 2012 @@ -0,0 +1,63 @@ +<?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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + + <groupId>test</groupId> + <artifactId>test-basic-generation</artifactId> + <version>@pom.version@</version> + <packaging>bundle</packaging> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <dependencies> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <version>@pom.version@</version> + <executions> + <execution> + <id>generate-features-file</id> + <phase>package</phase> + <goals> + <goal>features-generate-descriptor</goal> + </goals> + <configuration> + <includeTransitiveDependency>false</includeTransitiveDependency> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/src/main/java/test/App.java URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/src/main/java/test/App.java?rev=1351419&view=auto ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/src/main/java/test/App.java (added) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/src/main/java/test/App.java Mon Jun 18 17:29:10 2012 @@ -0,0 +1,32 @@ +/* + * 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. + */ + +package test; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh?rev=1351419&view=auto ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh (added) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh Mon Jun 18 17:29:10 2012 @@ -0,0 +1,34 @@ +/* + * 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 org.custommonkey.xmlunit.*; +import java.io.*; +import java.lang.*; + +String control = "<features xmlns=\"http://karaf.apache.org/xmlns/features/v1.0.0\"; name=\"test-basic-generation\"/>"; + +File generated = new File( basedir, "target/feature/feature.xml" ); +StringReader sr = new StringReader(control); +try { + XMLAssert.assertXMLEqual(sr, new FileReader(generated)); +} catch (AssertionError ignored) { + return false; +} + +return true; Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml?rev=1351419&view=auto ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml (added) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml Mon Jun 18 17:29:10 2012 @@ -0,0 +1,65 @@ +<?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 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";> + <!-- invalid model version to make build fail --> + <modelVersion>4.0.0</modelVersion> + <groupId>test</groupId> + <artifactId>test-recursive</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <modules> + <module>recursive-module-a</module> + <module>recursive-module-b</module> + <module>recursive-module-c</module> + <module>recursive-module-d</module> + </modules> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <version>@pom.version@</version> + <executions> + <execution> + <id>generate-features-file</id> + <phase>package</phase> + <goals> + <goal>features-generate-descriptor</goal> + </goals> + <configuration> + <includeTransitiveDependency>false</includeTransitiveDependency> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-a/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-a/pom.xml?rev=1351419&view=auto ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-a/pom.xml (added) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-a/pom.xml Mon Jun 18 17:29:10 2012 @@ -0,0 +1,53 @@ +<?xml version="1.0"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>test</groupId> + <artifactId>test-recursive</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>test</groupId> + <artifactId>recursive-module-a</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>bundle</packaging> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <dependencies> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <extensions>true</extensions> + </plugin> + </plugins> + </build> +</project> Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-a/src/main/java/test/A.java URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-a/src/main/java/test/A.java?rev=1351419&view=auto ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-a/src/main/java/test/A.java (added) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-a/src/main/java/test/A.java Mon Jun 18 17:29:10 2012 @@ -0,0 +1,25 @@ +/* + * 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. + */ + +package test.a; + +public class A +{ + public static String ASTRING = "A-string"; +} Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-b/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-b/pom.xml?rev=1351419&view=auto ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-b/pom.xml (added) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-b/pom.xml Mon Jun 18 17:29:10 2012 @@ -0,0 +1,54 @@ +<?xml version="1.0"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>test</groupId> + <artifactId>test-recursive</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>test</groupId> + <artifactId>recursive-module-b</artifactId> + <version>1.0-SNAPSHOT</version> + + <packaging>bundle</packaging> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <dependencies> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <extensions>true</extensions> + </plugin> + </plugins> + </build> +</project> Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-b/src/main/java/test/B.java URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-b/src/main/java/test/B.java?rev=1351419&view=auto ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-b/src/main/java/test/B.java (added) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-b/src/main/java/test/B.java Mon Jun 18 17:29:10 2012 @@ -0,0 +1,25 @@ +/* + * 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. + */ + +package test.b; + +public class B +{ + public static String BSTRING = "B-string"; +} Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-c/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-c/pom.xml?rev=1351419&view=auto ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-c/pom.xml (added) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-c/pom.xml Mon Jun 18 17:29:10 2012 @@ -0,0 +1,64 @@ +<?xml version="1.0"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>test</groupId> + <artifactId>test-recursive</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>test</groupId> + <artifactId>recursive-module-c</artifactId> + <version>1.0-SNAPSHOT</version> + + <packaging>bundle</packaging> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <dependencies> + <dependency> + <groupId>test</groupId> + <artifactId>recursive-module-a</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>test</groupId> + <artifactId>recursive-module-b</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <extensions>true</extensions> + </plugin> + </plugins> + </build> +</project> Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-c/src/main/java/test/C.java URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-c/src/main/java/test/C.java?rev=1351419&view=auto ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-c/src/main/java/test/C.java (added) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-c/src/main/java/test/C.java Mon Jun 18 17:29:10 2012 @@ -0,0 +1,30 @@ +/* + * 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. + */ + +package test.c; + +import test.a.*; +import test.b.*; + +public class C +{ + public static String createStringWithDependencies() { + return A.ASTRING + " " + B.BSTRING + " " + "C-string"; + } +} Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-d/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-d/pom.xml?rev=1351419&view=auto ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-d/pom.xml (added) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-d/pom.xml Mon Jun 18 17:29:10 2012 @@ -0,0 +1,59 @@ +<?xml version="1.0"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>test</groupId> + <artifactId>test-recursive</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>test</groupId> + <artifactId>recursive-module-d</artifactId> + <version>1.0-SNAPSHOT</version> + + <packaging>bundle</packaging> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <dependencies> + <dependency> + <groupId>test</groupId> + <artifactId>recursive-module-c</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <extensions>true</extensions> + </plugin> + </plugins> + </build> +</project> Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-d/src/main/java/test/D.java URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-d/src/main/java/test/D.java?rev=1351419&view=auto ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-d/src/main/java/test/D.java (added) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/recursive-module-d/src/main/java/test/D.java Mon Jun 18 17:29:10 2012 @@ -0,0 +1,29 @@ +/* + * 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. + */ + +package test.d; + +import test.c.*; + +public class D +{ + public String createStringWithDependencies() { + return C.createStringWithDependencies() + " " + "D-string"; + } +} Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/verify.bsh URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/verify.bsh?rev=1351419&view=auto ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/verify.bsh (added) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/verify.bsh Mon Jun 18 17:29:10 2012 @@ -0,0 +1,34 @@ +/* + * 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 org.custommonkey.xmlunit.*; +import java.io.*; +import java.lang.*; + +//String control = "<features xmlns=\"http://karaf.apache.org/xmlns/features/v1.0.0\"; name=\"test-basic-generation\"/>"; +// +//File generated = new File( basedir, "target/feature/feature.xml" ); +//StringReader sr = new StringReader(control); +//try { +// XMLAssert.assertXMLEqual(sr, new FileReader(generated)); +//} catch (AssertionError ignored) { +// return false; +//} + +return true;
