You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/05/05 07:01:11 UTC
svn commit: r941146 - in /geronimo/samples/trunk/samples/javaee6: ./
jarresource-javaee6/ jarresource-javaee6/jarresource-javaee6-jar/
jarresource-javaee6/jarresource-javaee6-jar/src/
jarresource-javaee6/jarresource-javaee6-jar/src/main/ jarresource-ja...
Author: xiaming
Date: Wed May 5 05:01:10 2010
New Revision: 941146
URL: http://svn.apache.org/viewvc?rev=941146&view=rev
Log:
GERONIMO-5237 A sample to demo jar resources feature of servlet 3.0
Added:
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/pom.xml (with props)
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/header.html (with props)
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/index.html (with props)
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/jarresource.jsp (with props)
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/pom.xml (with props)
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/src/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/src/main/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/src/main/plan/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/src/main/plan/plan.xml (with props)
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/pom.xml (with props)
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/src/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/src/main/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/src/main/plan/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/src/main/plan/plan.xml (with props)
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml (with props)
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/WEB-INF/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml (with props)
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/WEB-INF/web.xml (with props)
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/pom.xml (with props)
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/src/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/src/main/
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/src/main/resources/
Modified:
geronimo/samples/trunk/samples/javaee6/pom.xml
Added: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/pom.xml?rev=941146&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/pom.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/pom.xml Wed May 5 05:01:10 2010
@@ -0,0 +1,41 @@
+<?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$ $Date$ -->
+
+<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>jarresource-javaee6</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jarresource-javaee6-jar</artifactId>
+ <name>Geronimo Samples :: jarresource-javaee6 :: JAR</name>
+ <packaging>jar</packaging>
+
+ <description>Geronimo Samples. A Module Including META-INF/resources</description>
+
+
+</project>
+
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/header.html?rev=941146&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/header.html (added)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/header.html Wed May 5 05:01:10 2010
@@ -0,0 +1,55 @@
+<!--
+ 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.
+-->
+
+<html>
+ <head>
+ <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+ <link rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
+ <script src="http://geronimo.apache.org/functions.js" type="text/javascript"></script><title>Apache Geronimo Sample Applications</title>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+ </head>
+
+ <body onload="init()">
+
+ <table valign="top" background="http://geronimo.apache.org/images/header_bg_1x86.gif" border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tbody>
+ <tr>
+ <td valing="top" align="left">
+ <a href="http://geronimo.apache.org/"><img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0"></a>
+ </td>
+ <td width="100%">
+
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <table border="0" cellpadding="2" cellspacing="0" width="100%">
+ <tbody>
+ <tr class="topBar">
+ <td class="topBarDiv" align="left" nowrap="true" valign="middle" width="100%">
+ <a href="http://geronimo.apache.org/" title="Apache Geronimo Home" target="_blank">Apache Geronimo Home</a> | <a href="http://cwiki.apache.org/geronimo/" title="Geronimo Documentation"target="_blank">Documentation</a> | <a href="http://cwiki.apache.org/GMOxSAMPLES/" title="Sample Applications"target="_blank">Sample Applications</a>
+ </td>
+ <td class="topBarDiv" align="left" nowrap="true" valign="middle">
+ <a href="xref/index.html" target="source_window">Source Code</a> | <a href="apidocs/index.html" target="source_window">Java Docs</a>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ </body>
+</html>
\ No newline at end of file
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/header.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/header.html
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/header.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/index.html?rev=941146&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/index.html (added)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/index.html Wed May 5 05:01:10 2010
@@ -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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd class="cell"">
+<html>
+<head>
+ <title>Apache Geronimo Sample Application</title>
+ <meta content="text/html; CHARSET=UTF-8" http-equiv="Content-Type">
+</head>
+
+<FRAMESET rows="86px,*" frameborder="0">
+ <FRAME src="./header.html" name="headerFrame" title="Header" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
+ <FRAME src="./jarresource.jsp" name="sampleDocumentFrame" title="Sample Document Description" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
+</FRAMESET>
+
+</html>
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/index.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/index.html
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/index.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/jarresource.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/jarresource.jsp?rev=941146&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/jarresource.jsp (added)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/jarresource.jsp Wed May 5 05:01:10 2010
@@ -0,0 +1,35 @@
+<!--
+ 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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd class="cell"">
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<html>
+<head>
+ <title>Sample for jarresource-javaee6</title>
+ <meta content="text/html; CHARSET=UTF-8" http-equiv="Content-Type">
+</head>
+
+<BODY>
+ <font face="Verdana, Helvetica, Arial">
+
+ This is a JSP executed inside a jar file of the web module.
+
+ </FONT>
+<br/>
+The remote host is <%=request.getRemoteHost()%>.
+<br/>
+</body>
+</html>
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/jarresource.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/jarresource.jsp
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jar/src/main/resources/META-INF/resources/jarresource.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/pom.xml?rev=941146&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/pom.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/pom.xml Wed May 5 05:01:10 2010
@@ -0,0 +1,108 @@
+<?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$ $Date$ -->
+
+<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>jarresource-javaee6</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jarresource-javaee6-jetty</artifactId>
+ <name>Geronimo Samples :: jarresource-javaee6 Plugin for Jetty</name>
+ <packaging>car</packaging>
+
+ <description>Geronimo Samples. jarresource-javaee6 Plugin for Jetty</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>jarresource-javaee6-war</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>${jetty}-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <deploymentConfigs>
+ <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+ <deploymentConfig>${jettyDeployer}</deploymentConfig>
+ <deploymentConfig>${jasperDeployer}</deploymentConfig>
+ </deploymentConfigs>
+ <module>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>jarresource-javaee6-ear</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </module>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/src/main/plan/plan.xml?rev=941146&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/src/main/plan/plan.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/src/main/plan/plan.xml Wed May 5 05:01:10 2010
@@ -0,0 +1,41 @@
+<?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$ $Date$ -->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>${pom.groupId}</sys:groupId>
+ <sys:artifactId>${pom.artifactId}</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>car</sys:type>
+ </sys:moduleId>
+ <sys:dependencies/>
+ <sys:hidden-classes/>
+ <sys:non-overridable-classes/>
+ </sys:environment>
+
+ <context-root>/${pom.artifactId}</context-root>
+
+</web-app>
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/pom.xml?rev=941146&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/pom.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/pom.xml Wed May 5 05:01:10 2010
@@ -0,0 +1,108 @@
+<?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$ $Date$ -->
+
+<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>jarresource-javaee6</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jarresource-javaee6-tomcat</artifactId>
+ <name>Geronimo Samples :: jarresource-javaee6 Plugin for Tomcat</name>
+ <packaging>car</packaging>
+
+ <description>Geronimo Samples. jarresource-javaee6 Plugin for Tomcat</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>jarresource-javaee6-ear</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat7-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <deploymentConfigs>
+ <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+ <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+ <deploymentConfig>${jasperDeployer}</deploymentConfig>
+ </deploymentConfigs>
+ <module>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>jarresource-javaee6-ear</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <type>ear</type>
+ </module>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/src/main/plan/plan.xml?rev=941146&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/src/main/plan/plan.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/src/main/plan/plan.xml Wed May 5 05:01:10 2010
@@ -0,0 +1,41 @@
+<?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$ $Date$ -->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>${pom.groupId}</sys:groupId>
+ <sys:artifactId>${pom.artifactId}</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>car</sys:type>
+ </sys:moduleId>
+ <sys:dependencies/>
+ <sys:hidden-classes/>
+ <sys:non-overridable-classes/>
+ </sys:environment>
+
+ <context-root>/${pom.artifactId}</context-root>
+
+</web-app>
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml?rev=941146&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml Wed May 5 05:01:10 2010
@@ -0,0 +1,79 @@
+<?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$ $Date$ -->
+
+<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>jarresource-javaee6</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jarresource-javaee6-war</artifactId>
+ <name>Geronimo Samples :: jarresource-javaee6 :: WAR</name>
+ <packaging>war</packaging>
+
+ <description>Geronimo Samples. WEB Module</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>jarresource-javaee6-jar</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <id>copy-parent-site</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <echo>Copying site directory from parent</echo>
+ <copy todir="${project.build.directory}/${pom.artifactId}-3.0-SNAPSHOT" failonerror="false" overwrite="true">
+ <fileset dir="${pom.basedir}/../docs" />
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <archiveClasses>false</archiveClasses>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=941146&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml Wed May 5 05:01:10 2010
@@ -0,0 +1,39 @@
+<?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.
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>org.apache.geronimo.samples</sys:groupId>
+ <sys:artifactId>jarresource-javaee6</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>car</sys:type>
+ </sys:moduleId>
+ <sys:dependencies/>
+ <sys:hidden-classes/>
+ <sys:non-overridable-classes/>
+ </sys:environment>
+
+ <context-root>/jarresource-javaee6</context-root>
+
+</web-app>
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/WEB-INF/web.xml?rev=941146&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/WEB-INF/web.xml Wed May 5 05:01:10 2010
@@ -0,0 +1,30 @@
+<?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$ $Date$ -->
+
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="jarresource-javaee6">
+
+ <description>jarresource-javaee6 Servlet Sample</description>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/pom.xml?rev=941146&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/pom.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/pom.xml Wed May 5 05:01:10 2010
@@ -0,0 +1,81 @@
+<?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$ $Date$ -->
+
+<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>javaee6</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jarresource-javaee6</artifactId>
+ <name>Geronimo Samples :: jarresource-javaee6</name>
+ <packaging>pom</packaging>
+
+ <description>
+ Geronimo jarresource-javaee6 sample created from an archetype.
+ </description>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>false</inherited>
+ <configuration>
+ <outputDirectory>${project.basedir}/docs</outputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>jarresource-javaee6-jar</module>
+ <module>jarresource-javaee6-war</module>
+ <module>jarresource-javaee6-jetty</module>
+ <module>jarresource-javaee6-tomcat</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>jarresource-javaee6-jar</module>
+ <module>jarresource-javaee6-war</module>
+ </modules>
+ </profile>
+ </profiles>
+</project>
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/samples/trunk/samples/javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/pom.xml?rev=941146&r1=941145&r2=941146&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/pom.xml Wed May 5 05:01:10 2010
@@ -159,6 +159,7 @@
<module>jpa20demo-javaee6</module>
<module>fileupload-javaee6</module>
<module>converter-javaee6</module>
+ <module>jarresource-javaee6</module>
</modules>
</profile>
<profile>
@@ -175,6 +176,7 @@
<module>jpa20demo-javaee6</module>
<module>fileupload-javaee6</module>
<module>converter-javaee6</module>
+ <module>jarresource-javaee6</module>
</modules>
</profile>
</profiles>