You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2007/10/26 02:58:38 UTC
svn commit: r588459 - in /geronimo/samples/trunk/samples: jsp-examples/
jsp-examples/jsp-examples-jetty/ jsp-examples/jsp-examples-tomcat/
jsp-examples/jsp-examples-war/ servlet-examples/
servlet-examples/servlet-examples-jetty/ servlet-examples/servle...
Author: gawor
Date: Thu Oct 25 17:58:36 2007
New Revision: 588459
URL: http://svn.apache.org/viewvc?rev=588459&view=rev
Log:
moved servlet and jsp examples into samples
Added:
geronimo/samples/trunk/samples/jsp-examples/
geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/
- copied from r588321, geronimo/server/trunk/configs/jsp-examples-jetty/
geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/
- copied from r588321, geronimo/server/trunk/configs/jsp-examples-tomcat/
geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/
- copied from r588321, geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/
geronimo/samples/trunk/samples/jsp-examples/pom.xml (with props)
geronimo/samples/trunk/samples/servlet-examples/
geronimo/samples/trunk/samples/servlet-examples/pom.xml (with props)
geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/
- copied from r588321, geronimo/server/trunk/configs/servlet-examples-jetty/
geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/
- copied from r588321, geronimo/server/trunk/configs/servlet-examples-tomcat/
geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/
- copied from r588321, geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/
Modified:
geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml
geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml
geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml
geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml
geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml
geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/pom.xml
Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml?rev=588459&r1=588321&r2=588459&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml Thu Oct 25 17:58:36 2007
@@ -26,7 +26,6 @@
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>jsp-examples-jetty</artifactId>
@@ -49,8 +48,8 @@
<!--</dependency>-->
<dependency>
- <groupId>org.apache.geronimo.applications.examples</groupId>
- <artifactId>geronimo-jsp-examples</artifactId>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>jsp-examples-war</artifactId>
<version>${version}</version>
<type>war</type>
<scope>provided</scope>
@@ -98,8 +97,8 @@
<deploymentConfig>${jasperDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
- <groupId>org.apache.geronimo.applications.examples</groupId>
- <artifactId>geronimo-jsp-examples</artifactId>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>jsp-examples-war</artifactId>
<version>${version}</version>
<type>war</type>
</module>
Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml?rev=588459&r1=588321&r2=588459&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml Thu Oct 25 17:58:36 2007
@@ -26,7 +26,6 @@
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>jsp-examples-tomcat</artifactId>
@@ -41,8 +40,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.applications.examples</groupId>
- <artifactId>geronimo-jsp-examples</artifactId>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>jsp-examples-war</artifactId>
<version>${version}</version>
<type>war</type>
<scope>provided</scope>
@@ -90,8 +89,8 @@
<deploymentConfig>${jasperDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
- <groupId>org.apache.geronimo.applications.examples</groupId>
- <artifactId>geronimo-jsp-examples</artifactId>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>jsp-examples-war</artifactId>
<version>${version}</version>
<type>war</type>
</module>
Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml?rev=588459&r1=588321&r2=588459&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml Thu Oct 25 17:58:36 2007
@@ -23,13 +23,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.applications.examples</groupId>
- <artifactId>geronimo-examples</artifactId>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>applications</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>geronimo-jsp-examples</artifactId>
+ <artifactId>jsp-examples-war</artifactId>
<name>Geronimo Applications, Examples :: JSP (JSR 152)</name>
<packaging>war</packaging>
Added: geronimo/samples/trunk/samples/jsp-examples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/pom.xml?rev=588459&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/pom.xml (added)
+++ geronimo/samples/trunk/samples/jsp-examples/pom.xml Thu Oct 25 17:58:36 2007
@@ -0,0 +1,48 @@
+<?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.
+-->
+
+<!-- $Rev: 580474 $ $Date: 2007-09-28 16:15:23 -0400 (Fri, 28 Sep 2007) $ -->
+
+<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.geronimo.samples</groupId>
+ <artifactId>samples</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>jspt-examples</artifactId>
+ <name>Geronimo Samples :: JSP Examples</name>
+ <packaging>pom</packaging>
+
+ <description>
+ Geronimo JSP Examples
+ </description>
+
+ <modules>
+ <module>jsp-examples-war</module>
+ <module>jsp-examples-jetty</module>
+ <module>jsp-examples-tomcat</module>
+ </modules>
+
+</project>
Propchange: geronimo/samples/trunk/samples/jsp-examples/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/samples/trunk/samples/servlet-examples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/pom.xml?rev=588459&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/pom.xml (added)
+++ geronimo/samples/trunk/samples/servlet-examples/pom.xml Thu Oct 25 17:58:36 2007
@@ -0,0 +1,48 @@
+<?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.
+-->
+
+<!-- $Rev: 580474 $ $Date: 2007-09-28 16:15:23 -0400 (Fri, 28 Sep 2007) $ -->
+
+<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.geronimo.samples</groupId>
+ <artifactId>samples</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>servlet-examples</artifactId>
+ <name>Geronimo Samples :: Servlet Examples</name>
+ <packaging>pom</packaging>
+
+ <description>
+ Geronimo Servlet Examples
+ </description>
+
+ <modules>
+ <module>servlet-examples-war</module>
+ <module>servlet-examples-jetty</module>
+ <module>servlet-examples-tomcat</module>
+ </modules>
+
+</project>
Propchange: geronimo/samples/trunk/samples/servlet-examples/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml?rev=588459&r1=588321&r2=588459&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml Thu Oct 25 17:58:36 2007
@@ -26,7 +26,6 @@
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>servlet-examples-jetty</artifactId>
@@ -45,8 +44,8 @@
<!--</dependency>-->
<dependency>
- <groupId>org.apache.geronimo.applications.examples</groupId>
- <artifactId>geronimo-servlet-examples</artifactId>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>servlet-examples-war</artifactId>
<version>${version}</version>
<type>war</type>
<scope>provided</scope>
@@ -94,8 +93,8 @@
<deploymentConfig>${jetty6Deployer}</deploymentConfig>
</deploymentConfigs>
<module>
- <groupId>org.apache.geronimo.applications.examples</groupId>
- <artifactId>geronimo-servlet-examples</artifactId>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>servlet-examples-war</artifactId>
<version>${version}</version>
<type>war</type>
</module>
Modified: geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml?rev=588459&r1=588321&r2=588459&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml Thu Oct 25 17:58:36 2007
@@ -26,7 +26,6 @@
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>servlet-examples-tomcat</artifactId>
@@ -37,8 +36,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.applications.examples</groupId>
- <artifactId>geronimo-servlet-examples</artifactId>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>servlet-examples-war</artifactId>
<version>${version}</version>
<type>war</type>
<scope>provided</scope>
@@ -86,8 +85,8 @@
<deploymentConfig>${tomcatDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
- <groupId>org.apache.geronimo.applications.examples</groupId>
- <artifactId>geronimo-servlet-examples</artifactId>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>servlet-examples-war</artifactId>
<version>${version}</version>
<type>war</type>
</module>
Modified: geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/pom.xml?rev=588459&r1=588321&r2=588459&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/pom.xml Thu Oct 25 17:58:36 2007
@@ -23,13 +23,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.applications.examples</groupId>
- <artifactId>geronimo-examples</artifactId>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>applications</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>geronimo-servlet-examples</artifactId>
+ <artifactId>servlet-examples-war</artifactId>
<name>Geronimo Applications, Examples :: Servlet (JSR 154)</name>
<packaging>war</packaging>