Author: desruisseaux
Date: Sat Sep 8 12:52:34 2012
New Revision: 1382295
URL: http://svn.apache.org/viewvc?rev=1382295&view=rev
Log:
Formatting without any functional change in the XML elements.
Modified:
incubator/sis/trunk/sis-app/pom.xml
incubator/sis/trunk/sis-webapp/pom.xml
Modified: incubator/sis/trunk/sis-app/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sis/trunk/sis-app/pom.xml?rev=1382295&r1=1382294&r2=1382295&view=diff
==============================================================================
--- incubator/sis/trunk/sis-app/pom.xml (original)
+++ incubator/sis/trunk/sis-app/pom.xml Sat Sep 8 12:52:34 2012
@@ -1,33 +1,35 @@
<?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 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>org.apache.sis</groupId>
<artifactId>sis-parent</artifactId>
<version>0.3-incubating-SNAPSHOT</version>
<relativePath>../sis-parent/pom.xml</relativePath>
</parent>
-
+
<artifactId>sis-app</artifactId>
<packaging>bundle</packaging>
<name>Apache SIS app</name>
@@ -40,7 +42,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -59,5 +61,5 @@
</plugin>
</plugins>
</build>
-
-</project>
\ No newline at end of file
+
+</project>
Modified: incubator/sis/trunk/sis-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sis/trunk/sis-webapp/pom.xml?rev=1382295&r1=1382294&r2=1382295&view=diff
==============================================================================
--- incubator/sis/trunk/sis-webapp/pom.xml (original)
+++ incubator/sis/trunk/sis-webapp/pom.xml Sat Sep 8 12:52:34 2012
@@ -1,93 +1,101 @@
<?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>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.sis</groupId>
- <artifactId>sis-parent</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
- <relativePath>../sis-parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>sis-webapp</artifactId>
- <packaging>war</packaging>
- <name>Apache SIS web services layer</name>
- <url>http://incubator.apache.org/sis/</url>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>org.geonames</groupId>
- <artifactId>georss-rome</artifactId>
- <version>0.9.8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sis</groupId>
- <artifactId>sis-core</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>8.0.0.M2</version>
- <configuration>
-
<webApp>${basedir}/target/sis-webapp-${project.version}.war</webApp>
- </configuration>
- <executions>
- <execution>
- <id>start-jetty</id>
-
<phase>pre-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <connectors>
- <connector
implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <port>8081</port>
- </connector>
- </connectors>
- <stopPort>18080</stopPort>
<scanIntervalSeconds>10</scanIntervalSeconds>
- <daemon>true</daemon>
- <systemProperties>
- <systemProperty>
-
<name>org.apache.commons.logging.Log</name>
-
<value>org.apache.commons.logging.impl.Jdk14Logger</value>
-
</systemProperty>
- <systemProperty>
-
<name>java.util.logging.config.file</name>
-
<value>./src/test/resources/logging.properties</value>
-
</systemProperty>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <parent>
+ <groupId>org.apache.sis</groupId>
+ <artifactId>sis-parent</artifactId>
+ <version>0.3-incubating-SNAPSHOT</version>
+ <relativePath>../sis-parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>sis-webapp</artifactId>
+ <packaging>war</packaging>
+ <name>Apache SIS web services layer</name>
+ <url>http://incubator.apache.org/sis/</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.geonames</groupId>
+ <artifactId>georss-rome</artifactId>
+ <version>0.9.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sis</groupId>
+ <artifactId>sis-core</artifactId>
+ <version>0.3-incubating-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>8.0.0.M2</version>
+ <configuration>
+ <webApp>${basedir}/target/sis-webapp-${project.version}.war</webApp>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start-jetty</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <connectors>
+ <connector
implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <port>8081</port>
+ </connector>
+ </connectors>
+ <stopPort>18080</stopPort>
<scanIntervalSeconds>10</scanIntervalSeconds>
+ <daemon>true</daemon>
+ <systemProperties>
+ <systemProperty>
+ <name>org.apache.commons.logging.Log</name>
+ <value>org.apache.commons.logging.impl.Jdk14Logger</value>
+ </systemProperty>
+ <systemProperty>
+ <name>java.util.logging.config.file</name>
+ <value>./src/test/resources/logging.properties</value>
+ </systemProperty>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
