sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aestr...@apache.org
Subject svn commit: r1243136 - in /incubator/sis/trunk: CHANGES.txt sis-webapp/pom.xml
Date Sat, 11 Feb 2012 19:50:52 GMT
Author: aestrada
Date: Sat Feb 11 19:50:52 2012
New Revision: 1243136

URL: http://svn.apache.org/viewvc?rev=1243136&view=rev
Log:
Closed out SIS-30

Modified:
    incubator/sis/trunk/CHANGES.txt
    incubator/sis/trunk/sis-webapp/pom.xml

Modified: incubator/sis/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/sis/trunk/CHANGES.txt?rev=1243136&r1=1243135&r2=1243136&view=diff
==============================================================================
--- incubator/sis/trunk/CHANGES.txt (original)
+++ incubator/sis/trunk/CHANGES.txt Sat Feb 11 19:50:52 2012
@@ -3,6 +3,8 @@ Apache SIS Change Log
 
 Release 0.2-incubating - Current Development
 
+* SIS-30 Added Jetty Server to sis-webapp/pom.xml. To run, cd to sis-webapp/ and run [mvn
jetty:run].
+
 * SIS-27 Update sis-parent/pom.xml compile target to 1.6 (pjaol via mattmann)
 
 * SIS-29 Website must display disclaimer text (mattmann, sebb)

Modified: incubator/sis/trunk/sis-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sis/trunk/sis-webapp/pom.xml?rev=1243136&r1=1243135&r2=1243136&view=diff
==============================================================================
--- incubator/sis/trunk/sis-webapp/pom.xml (original)
+++ incubator/sis/trunk/sis-webapp/pom.xml Sat Feb 11 19:50:52 2012
@@ -1,60 +1,90 @@
 <?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">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.sis</groupId>
-    <artifactId>sis-parent</artifactId>
-    <version>0.2-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.2-incubating-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
+<!-- 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.sis</groupId>
+		<artifactId>sis-parent</artifactId>
+		<version>0.2-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.2-incubating-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.mortbay.jetty</groupId>
+				<artifactId>maven-jetty-plugin</artifactId>
+				<version>6.1.21</version>
+				<configuration>
+					<contextPath>/sis-webapp</contextPath>
+					<webApp>${basedir}/target/sis-webapp-0.2-incubating-SNAPSHOT.war</webApp>
+				</configuration>
+				<executions>
+					<execution>
+						<id>start-jetty</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<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>



Mime
View raw message