You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pr...@apache.org on 2007/01/31 22:42:52 UTC

svn commit: r502007 [3/3] - in /geronimo/samples/branches: ./ 2.0-M2/ 2.0-M2/geronimo-samples-archetype/ 2.0-M2/geronimo-samples-archetype/src/ 2.0-M2/geronimo-samples-archetype/src/main/ 2.0-M2/geronimo-samples-archetype/src/main/resources/ 2.0-M2/ger...

Added: geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/index.html?view=auto&rev=502007
==============================================================================
--- geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/index.html (added)
+++ geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/index.html Wed Jan 31 13:42:48 2007
@@ -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>A Stateless Session Sample - Calculator</title>
+  <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
+</head>
+
+<FRAMESET rows="12%,90%" title="" frameborder="no">
+    <FRAME src="./header.html" name="headerFrame" title="Header">
+    <FRAME src="./sample-docu.jsp" name="sampleDocumentFrame" title="Sample Document Description">
+</FRAMESET>
+  
+</html>

Propchange: geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/sample-docu.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/sample-docu.jsp?view=auto&rev=502007
==============================================================================
--- geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/sample-docu.jsp (added)
+++ geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/sample-docu.jsp Wed Jan 31 13:42:48 2007
@@ -0,0 +1,108 @@
+<!--
+   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=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<html>
+<head>
+  <title>A Stateless Session Sample - Calculator</title>
+  <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
+  <style type="text/css">
+  .header  { background-color:aqua; text-align:center }
+  .cell    { text-align:center } 
+  </style>
+</head>
+
+<BODY>
+  <font face="Verdana, Helvetica, Arial">
+<FORM ACTION="calculator" method="get">
+  <h2>A Stateless Session Sample</H2>
+  <H3>Calculator</h2>
+  <font style="font-size:12px">
+  <p>
+  This sample shows an EJB 3.0 Stateless session bean.
+  <%
+      String result = String.valueOf(request.getAttribute("result"));
+      result = ("null".equals(result)) ? "0" : result;
+      request.setAttribute("result", null);
+      request.removeAttribute("result");
+  %>
+
+  </p>
+  <table cols="4" border="3" id="mainTable" cellpadding="0">
+    <thead id="mainTableHead">
+    <tr>
+      <td class="header">First Number</td>
+      <td class="header">Second Number</td>
+      <td class="header">Operation</td>
+      <td class="header">Result</td>
+    </tr>
+    </thead>
+    <tr>
+      <td class="cell">
+        <INPUT TYPE="text" name="firstNumber" value="0">
+      </td>
+      <td class="cell">
+        <INPUT TYPE="text" name="secondNumber" value="0">
+      </td>
+      <td class="cell">
+        <INPUT TYPE="submit" name="operation" value="add">
+        <BR>
+        <INPUT TYPE="submit" name="operation" value="multiply">
+      </td>
+      <td class="cell"><%=result%></td>
+    </tr>
+  </table>
+</FORM>
+  <P>
+  This sample demonstrates the following new features from EJB 3.0
+  <OL>
+    <LI>Elimination of the requirement for EJB component interfaces for session beans. The required
+business interface for a session bean can be a plain Java interface rather than an EJBObject,
+EJBLocalObject, or java.rmi.Remote interface.
+    <LI>Elimination of the requirement for home interfaces for session beans.
+    <LI>Encapsulation of environmental dependencies and JNDI access through the use of annotations,
+dependency injection mechanisms, and simple lookup mechanisms.
+    <LI>Introduction of Java metadata annotations to be used as an alternative to deployment descriptors.
+  </OL>
+  <P>
+  </FONT>
+  <H3>A POJO as a business interface</H3>
+  <font style="font-size:12px">
+  Notice that the stateless session bean <A HREF="./xref/org/apache/geronimo/samples/slsb/calculator/Calculator.html" target="source_window"><CODE>Calculator.java</CODE></A> implements
+  just a simple java interface and not an EJB component interface like EJBObject, EJBLocalObject or java.rmi.Remote.
+  </FONT>
+  
+  <H3>Dependency Injection</H3>
+  <font style="font-size:12px">
+  Notice that the servlet <A HREF="./xref/org/apache/geronimo/samples/calculator/CalculatorServlet.html" target="source_window"><CODE>CalculatorServlet.java</CODE></A> 
+  declares an instance variable with an @EJB annotation. The variable is that of a session bean and it's type is the same as that of it's business interface. 
+  In earlier versions, the servlet would have done a JNDI lookup of the bean's home interface in the component's environment. 
+  It then would have had to create the instance using the create method of the home interface. 
+  However in Java EE 5.0, the servlet can just declare its dependency on the bean by just annotating the instance variable with the @EJB annotation. 
+  When the servlet instance is created during runtime, the container automatically initializes these annotated variables with an instance of an object that implements the business interface.
+  This initialization occurs before any business methods are invoked on the bean instance and after the time the bean’s EJBContext is set.
+  </FONT>
+  
+  <H3>No deployment descriptor</H3>
+  <font style="font-size:12px">
+  Notice the absence of the traditional deployment descriptor, <CODE>ejb-jar.xml</CODE>. The bean declarations that used to be done there are now done by the
+  annotations in the code.
+  </FONT>
+
+  </FONT>
+</body>
+</html>

Propchange: geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/sample-docu.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/sample-docu.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/sample-docu.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/install-sample.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/install-sample.html?view=auto&rev=502007
==============================================================================
--- geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/install-sample.html (added)
+++ geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/install-sample.html Wed Jan 31 13:42:48 2007
@@ -0,0 +1,125 @@
+<!--
+   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>Installing a Geronimo sample/title>
+  <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
+  </style>
+</head>
+
+<body leftmargin="0" topmargin="0" bgcolor="#ffffff" marginwidth="0" marginheight="0" text="#000000" link="#000000" vlink="#666666">
+<table valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://geronimo.apache.org/images/header_bg_1x86.gif">
+  <tr>
+    <td class="cell" valing="top" align="left"><img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0"></td>
+    <td class="cell" width="100%">&nbsp;</td>
+    <td class="cell" valign="top" align="right"><img src="http://geronimo.apache.org/images/subnav_angle_15x18.gif" width="15" height="18" alt="" border="0"></td>
+    <td class="cell" valign="top" align="right"><a href="http://mail-archives.apache.org/mod_mbox/geronimo-user/">
+      <img src="http://geronimo.apache.org/images/subnav_userlist_55x18.gif" width="55" height="18" alt="" border="0"></a></td>
+    <td class="cell" valign="top" align="right"><a href="http://mail-archives.apache.org/mod_mbox/geronimo-dev/">
+      <img src="http://geronimo.apache.org/images/subnav_devlist_59x18.gif" width="59" height="18" alt="" border="0"></a></td>
+    <td class="cell" valign="top" align="right"><a href="http://cwiki.apache.org/geronimo">
+      <img src="http://geronimo.apache.org/images/subnav_wiki_39x18.gif" width="39" height="18" alt="" border="0"></a></td>
+    <td class="cell" valign="top" align="right"><a href="http://issues.apache.org/jira/browse/GERONIMO">
+      <img src="http://geronimo.apache.org/images/subnav_issue_83x18.gif" width="83" height="18" alt="" border="0"></a></td>
+    <td class="cell" valign="top" align="right"><a href="http://www.epiqtech.com"><img src="http://geronimo.apache.org/images/subnav_graph_95x18.gif" width="95" height="18" alt="" border="0"></a></td>
+  </tr>
+</table>
+<table valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://geronimo.apache.org/images/menu_bgstretch_1x22.gif">
+    <tr align="left">
+        <td valign="top">
+            <a href="index.html"><img src="http://geronimo.apache.org/images/menu_home_off_63x19.gif" width="63" height="19" border="0"></a>
+        </td>
+        <td valign="top" align="left">
+            <a href="documentation.html"><img src="http://geronimo.apache.org/images/menu_doc_off_116x19.gif" width="116" height="19" border="0"></a>
+        </td>
+        <td valign="top" align="left">
+            <a href="downloads.html"><img src="http://geronimo.apache.org/images/menu_download_off_85x19.gif" width="85" height="19" border="0"></a>
+        </td>
+        <td valign="top" align="left">
+            <a href="get-involved.html"><img src="http://geronimo.apache.org/images/menu_comm_off_96x19.gif" width="96" height="19" border="0"></a>
+        </td>
+        <td valign="top" align="left">
+            <a href="development.html"><img src="http://geronimo.apache.org/images/menu_dev_off_104x19.gif" width="104" height="19" border="0"></a>
+        </td>
+        <td width="100%">
+                &nbsp;
+        </td>
+    </tr>
+</table>
+
+  <font face="Verdana, Helvetica, Arial">
+<H2>Installing a Geronimo sample</H2>
+
+  <font style="font-size:12px">
+  There are 2 ways to play with a Geronimo sample.
+  <UL>
+    <LI>install a readily available sample binary. This requires a Geronimo server to be running.
+    <LI>build the sample and install it. This requires Maven v2.0.4. 
+    The sample thus built will be deployed for you on an already running server or on a server that will be downloaded.
+  </UL>
+  </FONT>
+
+  <H3>1. Installing an available sample binary</H3>
+  <font style="font-size:12px">
+  <OL>Steps:
+  <LI>Download the sample binary
+  <LI>go to the ${geronimoHome}/bin directory. It is the directory where you have the Geronimo server unpacked.
+  <LI>start the server using <CODE>startServer.bat</CODE> or <CODE>startServer.sh</CODE>
+  <LI>deploy the downloaded sample binary using <CODE>deploy.bat --user system --password manager deploy /path/to/sample/binary/sample.ear</CODE>
+  <LI>open a browser and go to the sample's context root.
+  </OL>
+  </FONT>
+
+  
+  <H3>2. Building a sample from source</H3>
+  <font style="font-size:12px">
+    This will give you an opportunity to play with the source code. The build will also deploy the sample application into a Geronimo server.
+    You may choose an already unpacked and/or running server to deploy this sample application.
+    <p>
+    Alternatively, you may let the build download the latest Geronimo binary and unpack it.
+    By default, a downloaded server binary will be unpacked into the sample project's <CODE>target</CODE> directory.
+    Or you may choose a different installation directory.
+    <p> 
+    You may let the build download the geronimo binary from a remote repository or point it to an already downloaded binary.
+    <P>
+    By default, it will download a Geronimo binary with the jetty webcontainer. You may however choose the Geronimo binary with the tomcat webcontainer.
+  
+  <OL>Steps:
+  <LI>if you don't have Maven v2.0.4 already, download that from <A HREF="http://maven.apache.org/download.html">Apache's maven</A> site. Add maven's bin directory to your path.
+  <LI>Download the sample source zip and unpack it. 
+    <I>If your platform is Windows, it is recommended that you unpack the zip in a directory quite close to the root to prevent a Windows restriction on long path name.</I>
+  <LI>go to the directory where the sample source code has been unpacked
+  <LI>execute the command <b><CODE>mvn site</CODE</B>
+  <LI>execute the command <b><CODE>mvn</CODE></B>
+      <UL>Some optional arguments:
+          <LI>-DgeronimoHome: path to directory where a server has already been unpacked.
+          <p><LI>-DinstallDirectory: path to directory where a server has to be unpacked. If one already exists there, a later one, if available, will be downloaded and installed.
+          If a later binary isn't available, the existing server is started.  If one doesn't exist, then the downloaded one will be unpacked here.
+          <p><LI>-DassemblyId: [jetty | tomcat] by default, Geronimo with the <I>jetty</I> webcontainer will be downloaded and started. Set the value of this to <I>tomcat</I> for the tomcat webcontainer.
+          <p><LI>-DassemblyArchive: path to an assembly archive already downloaded.<P>
+      </UL>
+  <LI>start the server using <CODE>startServer.bat</CODE> or <CODE>startServer.sh</CODE>
+  <LI>open a browser and go to the sample's context root.
+  </OL>
+  </FONT>
+
+
+  </FONT>
+
+</body>
+</html>

Propchange: geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/install-sample.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/install-sample.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/install-sample.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/pom.xml?view=auto&rev=502007
==============================================================================
--- geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/pom.xml (added)
+++ geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/pom.xml Wed Jan 31 13:42:48 2007
@@ -0,0 +1,62 @@
+<?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>samples-parent</artifactId>
+        <version>2.0-M2</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>calculator-stateless-pojo</artifactId>
+    <name>Geronimo Samples :: Stateless Session :: Calculator</name>
+    <packaging>pom</packaging>
+    
+    <description>
+        Geronimo Samples for a servlet referencing a stateless session bean using dependency injection.
+    </description>
+    
+    <modules>
+        <module>calculator-stateless-ejb</module>
+        <module>calculator-stateless-war</module>
+        <module>calculator-stateless-ear</module>
+    </modules>
+
+
+    <repositories>
+        <repository>
+            <id>apache-snapshots</id>
+            <name>Apache Snapshots Repository</name>
+            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
+</project>

Propchange: geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.0-M2/samples-parent/calculator-stateless-pojo/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/2.0-M2/samples-parent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.0-M2/samples-parent/pom.xml?view=auto&rev=502007
==============================================================================
--- geronimo/samples/branches/2.0-M2/samples-parent/pom.xml (added)
+++ geronimo/samples/branches/2.0-M2/samples-parent/pom.xml Wed Jan 31 13:42:48 2007
@@ -0,0 +1,230 @@
+<?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>samples</artifactId>
+        <version>2.0-M2</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>samples-parent</artifactId>
+    <name>Geronimo Samples :: Parent</name>
+    <packaging>pom</packaging>
+    <description>
+        Geronimo Samples.
+    </description>
+    <modules>
+        <module>calculator-stateless-pojo</module>
+    </modules>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <version>1.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.0.2</version>
+                    <configuration>
+                      <!--
+                        <archiveClasses>true</archiveClasses>
+                        -->
+                        <archive>
+                            <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+                            <addMavenDescriptor>false</addMavenDescriptor>
+                        </archive>
+                    </configuration>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-ear-plugin</artifactId>
+                    <configuration>
+                      <resourcesDir>${project.build.outputDirectory}</resourcesDir>
+                        <archive>
+                            <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+                            <addMavenDescriptor>false</addMavenDescriptor>
+                        </archive>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <configuration>
+                        <archive>
+                            <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+                            <addMavenDescriptor>false</addMavenDescriptor>
+                        </archive>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.0.1</version>
+                <reportSets>
+                    <reportSet>
+                        <reports/>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.2-SNAPSHOT</version>
+                <configuration>
+                    <aggregate>true</aggregate>
+                    <minmemory>128m</minmemory>
+                    <maxmemory>512</maxmemory>
+                    <breakiterator>true</breakiterator>
+                    <quiet>true</quiet>
+                    <verbose>false</verbose>
+                    <source>1.5</source>
+                    <linksource>true</linksource>
+                    <links>
+                        <!-- JSE -->
+                        <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+                        <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
+                        <link>http://java.sun.com/j2se/1.3/docs/api/</link>
+                        
+                        <!-- JEE -->
+                        <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
+                        <link>http://java.sun.com/j2ee/sdk_1.3/techdocs/api/</link>
+                        
+                        <!-- Libraries -->
+                        <link>http://jakarta.apache.org/commons/collections/apidocs</link>
+                        <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
+                        <link>http://www.junit.org/junit/javadoc/</link>
+                        <link>http://logging.apache.org/log4j/docs/api/</link>
+                        <link>http://jakarta.apache.org/regexp/apidocs/</link>
+                        <link>http://jakarta.apache.org/velocity/api/</link>
+                    </links>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>2.0</version>
+                <configuration>
+                    <aggregate>true</aggregate>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+
+    <profiles>
+        <profile>
+            <id>user</id>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        
+                        <plugin>
+                            <groupId>org.apache.geronimo.plugins</groupId>
+                            <artifactId>geronimo-maven-plugin</artifactId>
+                            <executions>
+                                <execution>
+                                    <id>start-server</id>
+                                    <phase>install</phase>
+                                    <goals>
+                                        <goal>start</goal>
+                                    </goals>
+                                    <configuration>
+                                        <assemblies>
+                                            <assembly>
+                                                <id>jetty</id>
+                                                <groupId>org.apache.geronimo.assemblies</groupId>
+                                                <artifactId>geronimo-jetty6-jee5</artifactId>
+                                                <version>${version}</version>
+                                                <classifier>bin</classifier>
+                                                <type>zip</type>
+                                            </assembly>
+                                            <assembly>
+                                                <id>tomcat</id>
+                                                <groupId>org.apache.geronimo.assemblies</groupId>
+                                                <artifactId>geronimo-tomcat6-jee5</artifactId>
+                                                <version>${version}</version>
+                                                <classifier>bin</classifier>
+                                                <type>zip</type>
+                                            </assembly>
+                                        </assemblies>
+                                        <defaultAssemblyId>jetty</defaultAssemblyId>
+                                        <optionSets>
+                                            <optionSet>
+                                                <id>debug</id>
+                                                <options>
+                                                    <option>-Xdebug</option>
+                                                    <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
+                                                </options>
+                                            </optionSet>
+                                        </optionSets>
+                                        <background>true</background>
+                                    </configuration>
+                                </execution>
+                                <execution>
+                                    <id>deploy-ears</id>
+                                    <phase>install</phase>
+                                    <goals>
+                                        <goal>deploy-module</goal>
+                                    </goals>
+                                    <configuration>
+                                        <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+    </profiles>
+</project>
\ No newline at end of file

Propchange: geronimo/samples/branches/2.0-M2/samples-parent/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.0-M2/samples-parent/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.0-M2/samples-parent/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml