Author: veithen Date: Sat Jun 13 22:31:26 2009 New Revision: 784486 URL: http://svn.apache.org/viewvc?rev=784486&view=rev Log: Replaced tabs by spaces and fixed license header.
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-osgi/axiom-osgi-build/pom.xml webservices/commons/trunk/modules/axiom/modules/axiom-osgi/axiom-osgi-run/pom.xml webservices/commons/trunk/modules/axiom/modules/axiom-osgi/pom.xml Modified: webservices/commons/trunk/modules/axiom/modules/axiom-osgi/axiom-osgi-build/pom.xml URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-osgi/axiom-osgi-build/pom.xml?rev=784486&r1=784485&r2=784486&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/modules/axiom-osgi/axiom-osgi-build/pom.xml (original) +++ webservices/commons/trunk/modules/axiom/modules/axiom-osgi/axiom-osgi-build/pom.xml Sat Jun 13 22:31:26 2009 @@ -1,95 +1,99 @@ <?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. - --> +<!-- + ~ 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"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-osgi</artifactId> - <version>1.2.9-SNAPSHOT</version> - </parent> - <artifactId>axiom-osgi-build</artifactId> - <name>Axiom OSGI Test Suite - Build</name> - <version>1.2.9-SNAPSHOT</version> - <packaging>bundle</packaging> - <description> + 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.ws.commons.axiom</groupId> + <artifactId>axiom-osgi</artifactId> + <version>1.2.9-SNAPSHOT</version> + </parent> + <artifactId>axiom-osgi-build</artifactId> + <name>Axiom OSGI Test Suite - Build</name> + <version>1.2.9-SNAPSHOT</version> + <packaging>bundle</packaging> + <description> </description> - <dependencies> - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-api</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.ipojo.junit4osgi</artifactId> - <version>1.1.0-SNAPSHOT</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <excludeDependencies>true</excludeDependencies> - <instructions> - <Export-Package>org.apache.axiom.*</Export-Package> - <Test-Suite> - org.apache.axiom.test.ServiceTest, org.apache.axiom.test.OMAbstractFactoryTest, - org.apache.axiom.test.StAXOMBuilderTest - </Test-Suite> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - <repositories> - <repository> - <id>snapshot-apache</id> - <name>Apache Snapshot repository</name> - <url>http://people.apache.org/repo/m2-snapshot-repository</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>snapshot-apache</id> - <name>Apache Snapshot repository</name> - <url>http://people.apache.org/repo/m2-snapshot-repository</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </pluginRepository> - </pluginRepositories> + <dependencies> + <dependency> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-api</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.ipojo.junit4osgi</artifactId> + <version>1.1.0-SNAPSHOT</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <excludeDependencies>true</excludeDependencies> + <instructions> + <Export-Package>org.apache.axiom.*</Export-Package> + <Test-Suite> + org.apache.axiom.test.ServiceTest, org.apache.axiom.test.OMAbstractFactoryTest, + org.apache.axiom.test.StAXOMBuilderTest + </Test-Suite> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + <repositories> + <repository> + <id>snapshot-apache</id> + <name>Apache Snapshot repository</name> + <url>http://people.apache.org/repo/m2-snapshot-repository</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>snapshot-apache</id> + <name>Apache Snapshot repository</name> + <url>http://people.apache.org/repo/m2-snapshot-repository</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </pluginRepository> + </pluginRepositories> </project> Modified: webservices/commons/trunk/modules/axiom/modules/axiom-osgi/axiom-osgi-run/pom.xml URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-osgi/axiom-osgi-run/pom.xml?rev=784486&r1=784485&r2=784486&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/modules/axiom-osgi/axiom-osgi-run/pom.xml (original) +++ webservices/commons/trunk/modules/axiom/modules/axiom-osgi/axiom-osgi-run/pom.xml Sat Jun 13 22:31:26 2009 @@ -1,137 +1,141 @@ <?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. - --> +<!-- + ~ 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"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-osgi</artifactId> - <version>1.2.9-SNAPSHOT</version> - </parent> - <artifactId>axiom-osgi-run</artifactId> - <name>Axiom OSGI Test Suite - Run</name> - <version>1.2.9-SNAPSHOT</version> - <dependencies> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-activation_1.1_spec</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-javamail_1.4_spec</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <!-- An OSGI aware version of the StAX API --> - <groupId>org.apache.servicemix.specs</groupId> - <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId> - <version>1.1.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-api</artifactId> - <version>1.2.9-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-impl</artifactId> - <version>1.2.9-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-osgi-build</artifactId> - <version>1.2.9-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-dom</artifactId> - <version>1.2.9-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-osgi-build</artifactId> - <version>1.2.9-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>stax2-api</artifactId> - <version>3.0.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>woodstox-core-asl</artifactId> - <version>4.0.1</version> - <scope>test</scope> - </dependency> + 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.ws.commons.axiom</groupId> + <artifactId>axiom-osgi</artifactId> + <version>1.2.9-SNAPSHOT</version> + </parent> + <artifactId>axiom-osgi-run</artifactId> + <name>Axiom OSGI Test Suite - Run</name> + <version>1.2.9-SNAPSHOT</version> + <dependencies> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-activation_1.1_spec</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-javamail_1.4_spec</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <!-- An OSGI aware version of the StAX API --> + <groupId>org.apache.servicemix.specs</groupId> + <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId> + <version>1.1.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-api</artifactId> + <version>1.2.9-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-impl</artifactId> + <version>1.2.9-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-osgi-build</artifactId> + <version>1.2.9-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-dom</artifactId> + <version>1.2.9-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-osgi-build</artifactId> + <version>1.2.9-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>stax2-api</artifactId> + <version>3.0.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>woodstox-core-asl</artifactId> + <version>4.0.1</version> + <scope>test</scope> + </dependency> - <!-- - I'd prefer to use these slf4j bundles rather than the springsource - repackaged commons-logging but there seems to be a bug in the version - of Apache Felix that the plugin pulls in which means slf4j won't - work. <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-nop</artifactId> <version>1.5.6</version> - <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> - <version>1.5.6</version> <scope>test</scope> </dependency> - <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> <version>1.5.6</version> - <scope>test</scope> </dependency> - --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>com.springsource.org.apache.commons.logging</artifactId> - <version>1.1.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.scr</artifactId> - <version>1.0.6</version> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-junit4osgi-plugin</artifactId> - <version>1.1.0-SNAPSHOT</version> - <executions> - <execution> - <goals> - <goal>test</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <repositories> - <repository> - <id>com.springsource.repository.bundles.external</id> - <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name> - <url>http://repository.springsource.com/maven/bundles/external</url> - </repository> - </repositories> + <!-- + I'd prefer to use these slf4j bundles rather than the springsource + repackaged commons-logging but there seems to be a bug in the version + of Apache Felix that the plugin pulls in which means slf4j won't + work. <dependency> <groupId>org.slf4j</groupId> + <artifactId>slf4j-nop</artifactId> <version>1.5.6</version> + <scope>test</scope> </dependency> <dependency> + <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> + <version>1.5.6</version> <scope>test</scope> </dependency> + <dependency> <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> <version>1.5.6</version> + <scope>test</scope> </dependency> + --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>com.springsource.org.apache.commons.logging</artifactId> + <version>1.1.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.scr</artifactId> + <version>1.0.6</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-junit4osgi-plugin</artifactId> + <version>1.1.0-SNAPSHOT</version> + <executions> + <execution> + <goals> + <goal>test</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <repositories> + <repository> + <id>com.springsource.repository.bundles.external</id> + <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name> + <url>http://repository.springsource.com/maven/bundles/external</url> + </repository> + </repositories> </project> Modified: webservices/commons/trunk/modules/axiom/modules/axiom-osgi/pom.xml URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-osgi/pom.xml?rev=784486&r1=784485&r2=784486&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/modules/axiom-osgi/pom.xml (original) +++ webservices/commons/trunk/modules/axiom/modules/axiom-osgi/pom.xml Sat Jun 13 22:31:26 2009 @@ -1,30 +1,34 @@ <?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. - --> +<!-- + ~ 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"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom</artifactId> - <version>1.2.9-SNAPSHOT</version> - </parent> - <artifactId>axiom-osgi</artifactId> - <name>Axiom OSGI Test Suite Parent</name> - <version>1.2.9-SNAPSHOT</version> -<packaging>pom</packaging> + 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.ws.commons.axiom</groupId> + <artifactId>axiom</artifactId> + <version>1.2.9-SNAPSHOT</version> + </parent> + <artifactId>axiom-osgi</artifactId> + <name>Axiom OSGI Test Suite Parent</name> + <version>1.2.9-SNAPSHOT</version> + <packaging>pom</packaging> <modules> <module>axiom-osgi-build</module> <module>axiom-osgi-run</module>