You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/06/06 22:53:33 UTC
svn commit: r664120 [11/13] - in /geronimo/samples/trunk/samples: ./
app-per-port/ app-per-port/app-per-port-connector-war/
app-per-port/app-per-port-connector-war/src/main/webapp/WEB-INF/
app-per-port/app-per-port-ear/ app-per-port/app-per-port-tomcat...
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/pom.xml Fri Jun 6 13:53:24 2008
@@ -61,7 +61,7 @@
<description>Geronimo Sample EAR for myphonebook</description>
<version>5</version>
<modules>
- <ejbModule>
+ <ejbModule>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>myphonebook-ejb</artifactId>
<bundleFileName>myphonebook-ejb-${version}.jar</bundleFileName>
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/src/main/resources/META-INF/geronimo-application.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/src/main/resources/META-INF/geronimo-application.xml Fri Jun 6 13:53:24 2008
@@ -17,23 +17,23 @@
specific language governing permissions and limitations
under the License.
-->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"
- xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
- application-name="t6">
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${pom.groupId}</sys:groupId>
- <sys:artifactId>${pom.artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>ear</sys:type>
- </sys:moduleId>
- </sys:environment>
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
+ application-name="t6">
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>${pom.groupId}</sys:groupId>
+ <sys:artifactId>${pom.artifactId}</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>ear</sys:type>
+ </sys:moduleId>
+ </sys:environment>
- <module>
- <connector>tranql-connector-ra-1.3.rar</connector>
- <alt-dd>PhoneBookPool.xml</alt-dd>
- </module>
+ <module>
+ <connector>tranql-connector-ra-1.3.rar</connector>
+ <alt-dd>PhoneBookPool.xml</alt-dd>
+ </module>
</application>
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/java/org/apache/geronimo/samples/myphonebookpak/MyPhonebookBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/java/org/apache/geronimo/samples/myphonebookpak/MyPhonebookBean.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/java/org/apache/geronimo/samples/myphonebookpak/MyPhonebookBean.java (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/java/org/apache/geronimo/samples/myphonebookpak/MyPhonebookBean.java Fri Jun 6 13:53:24 2008
@@ -18,29 +18,27 @@
package org.apache.geronimo.samples.myphonebookpak;
import javax.ejb.Stateless;
-import javax.persistence.PersistenceUnit;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
-
-import org.apache.geronimo.samples.myphonebookpak.PhoneBook;
+import javax.persistence.PersistenceUnit;
@Stateless
public class MyPhonebookBean implements MyPhonebookLocal {
- @PersistenceUnit(unitName="PhonePU")
- protected EntityManagerFactory emf;
+ @PersistenceUnit(unitName = "PhonePU")
+ protected EntityManagerFactory emf;
+
+ public MyPhonebookBean() {
- public MyPhonebookBean() {
+ }
- }
-
- public PhoneBook findByPrimaryKey(String name) {
- EntityManager em = emf.createEntityManager();
+ public PhoneBook findByPrimaryKey(String name) {
+ EntityManager em = emf.createEntityManager();
- PhoneBook phonebook = (PhoneBook)em.find(PhoneBook.class, name);
+ PhoneBook phonebook = (PhoneBook) em.find(PhoneBook.class, name);
- em.close();
+ em.close();
- return phonebook;
- }
+ return phonebook;
+ }
}
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/java/org/apache/geronimo/samples/myphonebookpak/MyPhonebookLocal.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/java/org/apache/geronimo/samples/myphonebookpak/MyPhonebookLocal.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/java/org/apache/geronimo/samples/myphonebookpak/MyPhonebookLocal.java (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/java/org/apache/geronimo/samples/myphonebookpak/MyPhonebookLocal.java Fri Jun 6 13:53:24 2008
@@ -17,8 +17,6 @@
package org.apache.geronimo.samples.myphonebookpak;
-import org.apache.geronimo.samples.myphonebookpak.PhoneBook;
-
public interface MyPhonebookLocal {
- public PhoneBook findByPrimaryKey(String name);
+ public PhoneBook findByPrimaryKey(String name);
}
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/java/org/apache/geronimo/samples/myphonebookpak/PhoneBook.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/java/org/apache/geronimo/samples/myphonebookpak/PhoneBook.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/java/org/apache/geronimo/samples/myphonebookpak/PhoneBook.java (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/java/org/apache/geronimo/samples/myphonebookpak/PhoneBook.java Fri Jun 6 13:53:24 2008
@@ -19,41 +19,41 @@
import java.io.Serializable;
-import javax.persistence.Id;
import javax.persistence.Entity;
+import javax.persistence.Id;
import javax.persistence.Table;
@Entity
@Table(name = "phonebook")
public class PhoneBook implements Serializable {
- private String number;
- private String name;
+ private String number;
+ private String name;
- public PhoneBook() {
+ public PhoneBook() {
- }
+ }
- public PhoneBook(String name, String number) {
- this.name = name;
- this.number = number;
- }
-
- @Id
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getNumber() {
- return number;
- }
-
- public void setNumber(String number) {
- this.number = number;
- }
+ public PhoneBook(String name, String number) {
+ this.name = name;
+ this.number = number;
+ }
+
+ @Id
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getNumber() {
+ return number;
+ }
+
+ public void setNumber(String number) {
+ this.number = number;
+ }
}
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/resources/META-INF/openejb-jar.xml Fri Jun 6 13:53:24 2008
@@ -18,17 +18,17 @@
under the License.
-->
<openejb-jar
- xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
- xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1"
- xmlns:pkgen="http://www.openejb.org/xml/ns/pkgen-2.0"
- xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
- 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>jar</sys:type>
- </sys:moduleId>
- </sys:environment>
+ xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
+ xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1"
+ xmlns:pkgen="http://www.openejb.org/xml/ns/pkgen-2.0"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
+ 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>jar</sys:type>
+ </sys:moduleId>
+ </sys:environment>
</openejb-jar>
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml Fri Jun 6 13:53:24 2008
@@ -111,7 +111,7 @@
<filtering>true</filtering>
</resource>
</resources>
-
+
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
@@ -137,21 +137,21 @@
</useMavenDependencies>
<category>Sample</category>
<!--<instance>-->
- <!--<plugin-artifact>-->
- <!--<prerequisite>-->
- <!--<id>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>jetty6</artifactId>-->
- <!--</id>-->
- <!--<resource-type>Web Container</resource-type>-->
- <!--<description>-->
- <!--This version of the application works with the Geronimo/Jetty distribution. -->
- <!--It is not intended to run in the Geronimo/Tomcat distribution. -->
- <!--There is a separate version of the application that works with Tomcat. -->
- <!--Please install the version appropriate to your Geronimo distribution.-->
- <!--</description> -->
- <!--</prerequisite>-->
- <!--</plugin-artifact>-->
+ <!--<plugin-artifact>-->
+ <!--<prerequisite>-->
+ <!--<id>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>jetty6</artifactId>-->
+ <!--</id>-->
+ <!--<resource-type>Web Container</resource-type>-->
+ <!--<description>-->
+ <!--This version of the application works with the Geronimo/Jetty distribution. -->
+ <!--It is not intended to run in the Geronimo/Tomcat distribution. -->
+ <!--There is a separate version of the application that works with Tomcat. -->
+ <!--Please install the version appropriate to your Geronimo distribution.-->
+ <!--</description> -->
+ <!--</prerequisite>-->
+ <!--</plugin-artifact>-->
<!--</instance>-->
</configuration>
</plugin>
@@ -162,7 +162,7 @@
<profile>
<id>it</id>
<!--<properties>-->
- <!--<it-server>jetty</it-server>-->
+ <!--<it-server>jetty</it-server>-->
<!--</properties>-->
<build>
<plugins>
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml Fri Jun 6 13:53:24 2008
@@ -51,7 +51,7 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
@@ -110,7 +110,7 @@
<filtering>true</filtering>
</resource>
</resources>
-
+
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
@@ -136,32 +136,32 @@
</useMavenDependencies>
<category>Sample</category>
<!--<instance>-->
- <!--<plugin-artifact>-->
- <!--<prerequisite>-->
- <!--<id>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>tomcat6</artifactId>-->
- <!--</id>-->
- <!--<resource-type>Web Container</resource-type>-->
- <!--<description>-->
- <!--This version of the application works with the Geronimo/Tomcat distribution. -->
- <!--It is not intended to run in the Geronimo/Jetty distribution. -->
- <!--There is a separate version of the application that works with Jetty. -->
- <!--Please install the version appropriate to your Geronimo distribution.-->
- <!--</description> -->
- <!--</prerequisite>-->
- <!--</plugin-artifact>-->
+ <!--<plugin-artifact>-->
+ <!--<prerequisite>-->
+ <!--<id>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>tomcat6</artifactId>-->
+ <!--</id>-->
+ <!--<resource-type>Web Container</resource-type>-->
+ <!--<description>-->
+ <!--This version of the application works with the Geronimo/Tomcat distribution. -->
+ <!--It is not intended to run in the Geronimo/Jetty distribution. -->
+ <!--There is a separate version of the application that works with Jetty. -->
+ <!--Please install the version appropriate to your Geronimo distribution.-->
+ <!--</description> -->
+ <!--</prerequisite>-->
+ <!--</plugin-artifact>-->
<!--</instance>-->
</configuration>
</plugin>
</plugins>
</build>
-
+
<profiles>
<profile>
<id>it</id>
<!--<properties>-->
- <!--<it-server>tomcat</it-server>-->
+ <!--<it-server>tomcat</it-server>-->
<!--</properties>-->
<build>
<plugins>
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml Fri Jun 6 13:53:24 2008
@@ -20,5 +20,5 @@
<!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-
+
</application>
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-war/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-war/pom.xml Fri Jun 6 13:53:24 2008
@@ -44,11 +44,11 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -59,7 +59,7 @@
</goals>
<configuration>
<tasks>
- <echo>Copying site directory from parent</echo>
+ <echo>Copying site directory from parent</echo>
<copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
<fileset dir="${pom.basedir}/../docs"/>
</copy>
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Jun 6 13:53:24 2008
@@ -17,14 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${pom.groupId}</sys:groupId>
- <sys:artifactId>${pom.artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>war</sys:type>
- </sys:moduleId>
- </sys:environment>
- <context-root>/myphonebook</context-root>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>${pom.groupId}</sys:groupId>
+ <sys:artifactId>${pom.artifactId}</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>war</sys:type>
+ </sys:moduleId>
+ </sys:environment>
+ <context-root>/myphonebook</context-root>
</web-app>
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/WEB-INF/web.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/WEB-INF/web.xml Fri Jun 6 13:53:24 2008
@@ -18,13 +18,13 @@
under the License.
-->
<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>MyPhonebookWeb</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- </welcome-file-list>
- <ejb-local-ref>
- <ejb-ref-name>ejb/MyPhonebookBean</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local>org.apache.geronimo.samples.myphonebookpak.MyPhonebookLocal</local>
- </ejb-local-ref>
+ <display-name>MyPhonebookWeb</display-name>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/MyPhonebookBean</ejb-ref-name>
+ <ejb-ref-type>Entity</ejb-ref-type>
+ <local>org.apache.geronimo.samples.myphonebookpak.MyPhonebookLocal</local>
+ </ejb-local-ref>
</web-app>
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/header.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/header.html (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/header.html Fri Jun 6 13:53:24 2008
@@ -16,40 +16,42 @@
-->
<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>
+<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>
+<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
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/index.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/index.html (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/index.html Fri Jun 6 13:53:24 2008
@@ -17,13 +17,13 @@
<!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=iso-8859-1" http-equiv="Content-Type">
+ <title>Apache Geronimo Sample Application</title>
+ <meta content="text/html; CHARSET=iso-8859-1" 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="./index.jsp" name="sampleDocumentFrame" title="Sample Document Description" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
</FRAMESET>
-
+
</html>
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/index.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/index.jsp (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/index.jsp Fri Jun 6 13:53:24 2008
@@ -1,53 +1,58 @@
<!--
- 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
+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
+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.
+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.
-->
-<%@ page contentType="text/html" import="org.apache.geronimo.samples.myphonebookpak.*, javax.naming.* " %>
+<%@ page contentType="text/html" import="javax.naming.Context, javax.naming.InitialContext " %>
+<%@ page import="org.apache.geronimo.samples.myphonebookpak.MyPhonebookLocal" %>
+<%@ page import="org.apache.geronimo.samples.myphonebookpak.PhoneBook" %>
<%
- String searchName = "";
- if (request.getParameter("searchname") != null) {
- searchName=request.getParameter("searchname");
- }
+ String searchName = "";
+ if (request.getParameter("searchname") != null) {
+ searchName = request.getParameter("searchname");
+ }
%>
-<html><head><title>Phonebook</title></head><body>
+<html>
+<head><title>Phonebook</title></head>
+<body>
<form action="index.jsp">
-<b>Search number</b>:<br>
-Enter name: <input type="text" name="searchname" value="<%=searchName%>">
-<input type="submit" value="Search">
-(Test with <a href="index.jsp?searchname=Joe">Joe</a>)
+ <b>Search number</b>:<br>
+ Enter name: <input type="text" name="searchname" value="<%=searchName%>">
+ <input type="submit" value="Search">
+ (Test with <a href="index.jsp?searchname=Joe">Joe</a>)
</form>
<%
- if (! searchName.equals("")) {
- String number="";
- try {
- Context context = new InitialContext();
- MyPhonebookLocal myPhonebookLocal = (MyPhonebookLocal)context.lookup("java:comp/env/ejb/MyPhonebookBean");
- PhoneBook phonebook = myPhonebookLocal.findByPrimaryKey(searchName);
- if(phonebook != null) {
- number = phonebook.getNumber();
- }
- }
- catch (Exception e) {
- number=e.toString();
- }
- out.println("This is the number returned from the EJB when searching for '"+searchName+"' : " + number);
- }
+ if (!searchName.equals("")) {
+ String number = "";
+ try {
+ Context context = new InitialContext();
+ MyPhonebookLocal myPhonebookLocal = (MyPhonebookLocal) context.lookup("java:comp/env/ejb/MyPhonebookBean");
+ PhoneBook phonebook = myPhonebookLocal.findByPrimaryKey(searchName);
+ if (phonebook != null) {
+ number = phonebook.getNumber();
+ }
+ }
+ catch (Exception e) {
+ number = e.toString();
+ }
+ out.println("This is the number returned from the EJB when searching for '" + searchName + "' : " + number);
+ }
%>
-</body></html>
+</body>
+</html>
Modified: geronimo/samples/trunk/samples/myphonebook/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/pom.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/pom.xml Fri Jun 6 13:53:24 2008
@@ -21,23 +21,23 @@
<!-- $Rev: 550875 $ $Date: 2007-06-26 13:40:09 -0400 (Tue, 26 Jun 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.2-SNAPSHOT</version>
</parent>
-
+
<artifactId>myphonebook</artifactId>
<name>Geronimo Samples :: myphonebook</name>
<packaging>pom</packaging>
-
+
<description>
Geronimo myphonebook sample created from an archetype.
</description>
-
+
<modules>
<module>myphonebook-ejb</module>
<module>myphonebook-war</module>
@@ -45,24 +45,24 @@
<module>myphonebook-jetty</module>
<module>myphonebook-tomcat</module>
</modules>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
- <version>1.1</version>
- <type>jar</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.1</version>
- <type>jar</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
@@ -70,7 +70,7 @@
<artifactId>maven-site-plugin</artifactId>
<inherited>false</inherited>
<configuration>
- <outputDirectory>${project.basedir}/docs</outputDirectory>
+ <outputDirectory>${project.basedir}/docs</outputDirectory>
</configuration>
</plugin>
</plugins>
Modified: geronimo/samples/trunk/samples/mytime/mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-ear/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-ear/pom.xml Fri Jun 6 13:53:24 2008
@@ -37,7 +37,7 @@
<description>Geronimo Samples. EAR Module</description>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>mytime-war</artifactId>
<version>${version}</version>
@@ -61,7 +61,7 @@
<description>Geronimo Sample EAR for mytime</description>
<version>5</version>
<modules>
- <ejbModule>
+ <ejbModule>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>mytime-ejb</artifactId>
<bundleFileName>mytime-ejb-${version}.jar</bundleFileName>
Modified: geronimo/samples/trunk/samples/mytime/mytime-ejb/src/main/java/org/apache/geronimo/samples/mytimepak/MyTimeBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-ejb/src/main/java/org/apache/geronimo/samples/mytimepak/MyTimeBean.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-ejb/src/main/java/org/apache/geronimo/samples/mytimepak/MyTimeBean.java (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-ejb/src/main/java/org/apache/geronimo/samples/mytimepak/MyTimeBean.java Fri Jun 6 13:53:24 2008
@@ -21,8 +21,8 @@
@Stateless
public class MyTimeBean implements MyTimeLocal {
- public String getTime() {
- String s = new java.util.Date().toString();
- return s;
- }
+ public String getTime() {
+ String s = new java.util.Date().toString();
+ return s;
+ }
}
Modified: geronimo/samples/trunk/samples/mytime/mytime-ejb/src/main/java/org/apache/geronimo/samples/mytimepak/MyTimeLocal.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-ejb/src/main/java/org/apache/geronimo/samples/mytimepak/MyTimeLocal.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-ejb/src/main/java/org/apache/geronimo/samples/mytimepak/MyTimeLocal.java (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-ejb/src/main/java/org/apache/geronimo/samples/mytimepak/MyTimeLocal.java Fri Jun 6 13:53:24 2008
@@ -18,5 +18,5 @@
package org.apache.geronimo.samples.mytimepak;
public interface MyTimeLocal {
- public java.lang.String getTime() ;
+ public java.lang.String getTime();
}
Modified: geronimo/samples/trunk/samples/mytime/mytime-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-ejb/src/main/resources/META-INF/openejb-jar.xml Fri Jun 6 13:53:24 2008
@@ -16,17 +16,17 @@
limitations under the License.
-->
<openejb-jar
- xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
- xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1"
- xmlns:pkgen="http://www.openejb.org/xml/ns/pkgen-2.0"
- xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
- 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>jar</sys:type>
- </sys:moduleId>
- </sys:environment>
+ xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
+ xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1"
+ xmlns:pkgen="http://www.openejb.org/xml/ns/pkgen-2.0"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
+ 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>jar</sys:type>
+ </sys:moduleId>
+ </sys:environment>
</openejb-jar>
Modified: geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml Fri Jun 6 13:53:24 2008
@@ -104,7 +104,7 @@
<filtering>true</filtering>
</resource>
</resources>
-
+
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
@@ -130,21 +130,21 @@
</useMavenDependencies>
<category>Sample</category>
<!--<instance>-->
- <!--<plugin-artifact>-->
- <!--<prerequisite>-->
- <!--<id>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>jetty6</artifactId>-->
- <!--</id>-->
- <!--<resource-type>Web Container</resource-type>-->
- <!--<description>-->
- <!--This version of the application works with the Geronimo/Jetty distribution. -->
- <!--It is not intended to run in the Geronimo/Tomcat distribution. -->
- <!--There is a separate version of the application that works with Tomcat. -->
- <!--Please install the version appropriate to your Geronimo distribution.-->
- <!--</description> -->
- <!--</prerequisite>-->
- <!--</plugin-artifact>-->
+ <!--<plugin-artifact>-->
+ <!--<prerequisite>-->
+ <!--<id>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>jetty6</artifactId>-->
+ <!--</id>-->
+ <!--<resource-type>Web Container</resource-type>-->
+ <!--<description>-->
+ <!--This version of the application works with the Geronimo/Jetty distribution. -->
+ <!--It is not intended to run in the Geronimo/Tomcat distribution. -->
+ <!--There is a separate version of the application that works with Tomcat. -->
+ <!--Please install the version appropriate to your Geronimo distribution.-->
+ <!--</description> -->
+ <!--</prerequisite>-->
+ <!--</plugin-artifact>-->
<!--</instance>-->
</configuration>
</plugin>
@@ -155,7 +155,7 @@
<profile>
<id>it</id>
<!--<properties>-->
- <!--<it-server>jetty</it-server>-->
+ <!--<it-server>jetty</it-server>-->
<!--</properties>-->
<build>
<plugins>
Modified: geronimo/samples/trunk/samples/mytime/mytime-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-jetty/src/main/plan/plan.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-jetty/src/main/plan/plan.xml Fri Jun 6 13:53:24 2008
@@ -20,5 +20,5 @@
<!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-
+
</application>
Modified: geronimo/samples/trunk/samples/mytime/mytime-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-tomcat/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-tomcat/pom.xml Fri Jun 6 13:53:24 2008
@@ -45,7 +45,7 @@
<type>ear</type>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
@@ -104,7 +104,7 @@
<filtering>true</filtering>
</resource>
</resources>
-
+
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
@@ -130,32 +130,32 @@
</useMavenDependencies>
<category>Sample</category>
<!--<instance>-->
- <!--<plugin-artifact>-->
- <!--<prerequisite>-->
- <!--<id>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>tomcat6</artifactId>-->
- <!--</id>-->
- <!--<resource-type>Web Container</resource-type>-->
- <!--<description>-->
- <!--This version of the application works with the Geronimo/Tomcat distribution. -->
- <!--It is not intended to run in the Geronimo/Jetty distribution. -->
- <!--There is a separate version of the application that works with Jetty. -->
- <!--Please install the version appropriate to your Geronimo distribution.-->
- <!--</description> -->
- <!--</prerequisite>-->
- <!--</plugin-artifact>-->
+ <!--<plugin-artifact>-->
+ <!--<prerequisite>-->
+ <!--<id>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>tomcat6</artifactId>-->
+ <!--</id>-->
+ <!--<resource-type>Web Container</resource-type>-->
+ <!--<description>-->
+ <!--This version of the application works with the Geronimo/Tomcat distribution. -->
+ <!--It is not intended to run in the Geronimo/Jetty distribution. -->
+ <!--There is a separate version of the application that works with Jetty. -->
+ <!--Please install the version appropriate to your Geronimo distribution.-->
+ <!--</description> -->
+ <!--</prerequisite>-->
+ <!--</plugin-artifact>-->
<!--</instance>-->
</configuration>
</plugin>
</plugins>
</build>
-
+
<profiles>
<profile>
<id>it</id>
<!--<properties>-->
- <!--<it-server>tomcat</it-server>-->
+ <!--<it-server>tomcat</it-server>-->
<!--</properties>-->
<build>
<plugins>
Modified: geronimo/samples/trunk/samples/mytime/mytime-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-tomcat/src/main/plan/plan.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-tomcat/src/main/plan/plan.xml Fri Jun 6 13:53:24 2008
@@ -20,5 +20,5 @@
<!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-
+
</application>
Modified: geronimo/samples/trunk/samples/mytime/mytime-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-war/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-war/pom.xml Fri Jun 6 13:53:24 2008
@@ -44,11 +44,11 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -59,7 +59,7 @@
</goals>
<configuration>
<tasks>
- <echo>Copying site directory from parent</echo>
+ <echo>Copying site directory from parent</echo>
<copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
<fileset dir="${pom.basedir}/../docs"/>
</copy>
Modified: geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Jun 6 13:53:24 2008
@@ -15,14 +15,15 @@
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-1.1" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${pom.groupId}</sys:groupId>
- <sys:artifactId>${pom.artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>war</sys:type>
- </sys:moduleId>
- </sys:environment>
- <context-root>/mytime</context-root>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>${pom.groupId}</sys:groupId>
+ <sys:artifactId>${pom.artifactId}</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>war</sys:type>
+ </sys:moduleId>
+ </sys:environment>
+ <context-root>/mytime</context-root>
</web-app>
\ No newline at end of file
Modified: geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/WEB-INF/web.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/WEB-INF/web.xml Fri Jun 6 13:53:24 2008
@@ -16,14 +16,14 @@
limitations under the License.
-->
<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>MyTimeWeb</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- </welcome-file-list>
- <!-- To refer local EJB's -->
- <ejb-local-ref>
- <ejb-ref-name>ejb/MyTimeBean</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local>org.apache.geronimo.samples.mytimepak.MyTimeLocal</local>
- </ejb-local-ref>
+ <display-name>MyTimeWeb</display-name>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+ <!-- To refer local EJB's -->
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/MyTimeBean</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
+ <local>org.apache.geronimo.samples.mytimepak.MyTimeLocal</local>
+ </ejb-local-ref>
</web-app>
Modified: geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/header.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/header.html (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/header.html Fri Jun 6 13:53:24 2008
@@ -16,40 +16,42 @@
-->
<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>
+<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>
+<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
Modified: geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/index.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/index.html (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/index.html Fri Jun 6 13:53:24 2008
@@ -17,13 +17,13 @@
<!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=iso-8859-1" http-equiv="Content-Type">
+ <title>Apache Geronimo Sample Application</title>
+ <meta content="text/html; CHARSET=iso-8859-1" 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="./index.jsp" name="sampleDocumentFrame" title="Sample Document Description" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
</FRAMESET>
-
+
</html>
Modified: geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/index.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/index.jsp (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/index.jsp Fri Jun 6 13:53:24 2008
@@ -1,36 +1,40 @@
-<%@ page contentType="text/html" import="org.apache.geronimo.samples.mytimepak.*, javax.naming.* " %>
+<%@ page contentType="text/html" import="javax.naming.Context, javax.naming.InitialContext " %>
+<%@ page import="org.apache.geronimo.samples.mytimepak.MyTimeLocal" %>
<!--
- 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><title>Time</title></head><body>
+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><title>Time</title></head>
+<body>
<%
- String s="-"; // Just declare a string
- try {
- // This creates a context, it can be used to lookup EJBs. Using normal RMI you would
- // have to know port number and stuff. The InitialContext holds info like
- // server names, ports and stuff I guess.
- Context context = new InitialContext();
- // MyTimeLocalHome is a reference to the EJB
- MyTimeLocal myTimeLocal = (MyTimeLocal)context.lookup("java:comp/env/ejb/MyTimeBean");
- // So, just go ahead and call a method (in this case the only method).
- s = myTimeLocal.getTime();
- }
- catch (Exception e) {
- s=e.toString();
- }
+ String s = "-"; // Just declare a string
+ try {
+ // This creates a context, it can be used to lookup EJBs. Using normal RMI you would
+ // have to know port number and stuff. The InitialContext holds info like
+ // server names, ports and stuff I guess.
+ Context context = new InitialContext();
+ // MyTimeLocalHome is a reference to the EJB
+ MyTimeLocal myTimeLocal = (MyTimeLocal) context.lookup("java:comp/env/ejb/MyTimeBean");
+ // So, just go ahead and call a method (in this case the only method).
+ s = myTimeLocal.getTime();
+ }
+ catch (Exception e) {
+ s = e.toString();
+ }
%>
This is the time returned from the EJB: <%=s%>
-</body></html>
+</body>
+</html>
Modified: geronimo/samples/trunk/samples/mytime/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/pom.xml (original)
+++ geronimo/samples/trunk/samples/mytime/pom.xml Fri Jun 6 13:53:24 2008
@@ -21,24 +21,24 @@
<!-- $Rev: 550875 $ $Date: 2007-06-26 13:40:09 -0400 (Tue, 26 Jun 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.2-SNAPSHOT</version>
</parent>
-
+
<artifactId>mytime</artifactId>
<name>Geronimo Samples :: mytime</name>
<packaging>pom</packaging>
-
+
<description>
Geronimo mytime sample created from an archetype.
</description>
-
- <modules>
+
+ <modules>
<module>mytime-ejb</module>
<module>mytime-war</module>
<module>mytime-ear</module>
@@ -46,13 +46,13 @@
<module>mytime-tomcat</module>
</modules>
- <build>
+ <build>
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<inherited>false</inherited>
<configuration>
- <outputDirectory>${project.basedir}/docs</outputDirectory>
+ <outputDirectory>${project.basedir}/docs</outputDirectory>
</configuration>
</plugin>
</plugins>
Modified: geronimo/samples/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/pom.xml (original)
+++ geronimo/samples/trunk/samples/pom.xml Fri Jun 6 13:53:24 2008
@@ -16,7 +16,8 @@
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">
+--><!-- $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>
@@ -31,8 +32,8 @@
</description>
<properties>
- <!--<geronimoVersion>2.1</geronimoVersion>-->
- <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+ <!--<geronimoVersion>2.1</geronimoVersion>-->
+ <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
@@ -54,9 +55,9 @@
<modules>
<module>sample-datasource</module>
<module>customer-service</module>
-<!--
- <module>async-http</module>
--->
+ <!--
+ <module>async-http</module>
+ -->
<module>bank</module>
<module>calculator-stateless-pojo</module>
<module>dbtester</module>
@@ -130,7 +131,7 @@
<directory>${pom.basedir}/src/main/webapp/WEB-INF</directory>
<targetPath>WEB-INF</targetPath>
<filtering>true</filtering>
- </resource>
+ </resource>
</webResources>
</configuration>
</plugin>
@@ -160,7 +161,7 @@
</pluginManagement>
<plugins>
- <plugin>
+ <plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>tools-maven-plugin</artifactId>
@@ -245,10 +246,10 @@
<links>
<!-- JSE -->
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-
+
<!-- JEE -->
<link>http://java.sun.com/javaee/5/docs/api/</link>
-
+
<!-- Libraries -->
<link>http://jakarta.apache.org/commons/collections/apidocs</link>
<link>http://jakarta.apache.org/commons/logging/apidocs/</link>
Modified: geronimo/samples/trunk/samples/sample-datasource/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sample-datasource/src/main/plan/plan.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sample-datasource/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/sample-datasource/src/main/plan/plan.xml Fri Jun 6 13:53:24 2008
@@ -27,7 +27,7 @@
<name>SampleTxDatasource</name>
<config-property-setting name="DatabaseName">SampleDatabase</config-property-setting>
<config-property-setting name="CreateDatabase">true</config-property-setting>
- <connectionmanager>
+ <connectionmanager>
<xa-transaction>
<transaction-caching/>
</xa-transaction>
@@ -42,7 +42,7 @@
<name>SampleNoTxDatasource</name>
<config-property-setting name="DatabaseName">SampleDatabase</config-property-setting>
<config-property-setting name="CreateDatabase">true</config-property-setting>
- <connectionmanager>
+ <connectionmanager>
<no-transaction/>
<single-pool>
<max-size>10</max-size>
Modified: geronimo/samples/trunk/samples/sendmail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/pom.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/pom.xml Fri Jun 6 13:53:24 2008
@@ -21,36 +21,36 @@
<!-- $Rev: 550875 $ $Date: 2007-06-26 13:40:09 -0400 (Tue, 26 Jun 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.2-SNAPSHOT</version>
</parent>
-
+
<artifactId>sendmail</artifactId>
<name>Geronimo Samples :: sendmail</name>
<packaging>pom</packaging>
-
+
<description>
Geronimo sendmail sample created from an archetype.
</description>
-
- <modules>
+
+ <modules>
<module>sendmail-war</module>
<module>sendmail-jetty</module>
<module>sendmail-tomcat</module>
</modules>
- <build>
+ <build>
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<inherited>false</inherited>
<configuration>
- <outputDirectory>${project.basedir}/docs</outputDirectory>
+ <outputDirectory>${project.basedir}/docs</outputDirectory>
</configuration>
</plugin>
</plugins>
Modified: geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml Fri Jun 6 13:53:24 2008
@@ -89,7 +89,7 @@
<filtering>true</filtering>
</resource>
</resources>
-
+
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
@@ -113,21 +113,21 @@
</useMavenDependencies>
<category>Sample</category>
<!--<instance>-->
- <!--<plugin-artifact>-->
- <!--<prerequisite>-->
- <!--<id>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>jetty6</artifactId>-->
- <!--</id>-->
- <!--<resource-type>Web Container</resource-type>-->
- <!--<description>-->
- <!--This version of the application works with the Geronimo/Jetty distribution. -->
- <!--It is not intended to run in the Geronimo/Tomcat distribution. -->
- <!--There is a separate version of the application that works with Tomcat. -->
- <!--Please install the version appropriate to your Geronimo distribution.-->
- <!--</description> -->
- <!--</prerequisite>-->
- <!--</plugin-artifact>-->
+ <!--<plugin-artifact>-->
+ <!--<prerequisite>-->
+ <!--<id>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>jetty6</artifactId>-->
+ <!--</id>-->
+ <!--<resource-type>Web Container</resource-type>-->
+ <!--<description>-->
+ <!--This version of the application works with the Geronimo/Jetty distribution. -->
+ <!--It is not intended to run in the Geronimo/Tomcat distribution. -->
+ <!--There is a separate version of the application that works with Tomcat. -->
+ <!--Please install the version appropriate to your Geronimo distribution.-->
+ <!--</description> -->
+ <!--</prerequisite>-->
+ <!--</plugin-artifact>-->
<!--</instance>-->
</configuration>
</plugin>
@@ -138,7 +138,7 @@
<profile>
<id>it</id>
<!--<properties>-->
- <!--<it-server>jetty-minimal</it-server>-->
+ <!--<it-server>jetty-minimal</it-server>-->
<!--</properties>-->
<build>
<plugins>
Modified: geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml Fri Jun 6 13:53:24 2008
@@ -45,7 +45,7 @@
<type>war</type>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
@@ -89,7 +89,7 @@
<filtering>true</filtering>
</resource>
</resources>
-
+
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
@@ -113,32 +113,32 @@
</useMavenDependencies>
<category>Sample</category>
<!--<instance>-->
- <!--<plugin-artifact>-->
- <!--<prerequisite>-->
- <!--<id>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>tomcat6</artifactId>-->
- <!--</id>-->
- <!--<resource-type>Web Container</resource-type>-->
- <!--<description>-->
- <!--This version of the application works with the Geronimo/Tomcat distribution. -->
- <!--It is not intended to run in the Geronimo/Jetty distribution. -->
- <!--There is a separate version of the application that works with Jetty. -->
- <!--Please install the version appropriate to your Geronimo distribution.-->
- <!--</description> -->
- <!--</prerequisite>-->
- <!--</plugin-artifact>-->
+ <!--<plugin-artifact>-->
+ <!--<prerequisite>-->
+ <!--<id>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>tomcat6</artifactId>-->
+ <!--</id>-->
+ <!--<resource-type>Web Container</resource-type>-->
+ <!--<description>-->
+ <!--This version of the application works with the Geronimo/Tomcat distribution. -->
+ <!--It is not intended to run in the Geronimo/Jetty distribution. -->
+ <!--There is a separate version of the application that works with Jetty. -->
+ <!--Please install the version appropriate to your Geronimo distribution.-->
+ <!--</description> -->
+ <!--</prerequisite>-->
+ <!--</plugin-artifact>-->
<!--</instance>-->
</configuration>
</plugin>
</plugins>
</build>
-
+
<profiles>
<profile>
<id>it</id>
<!--<properties>-->
- <!--<it-server>tomcat-minimal</it-server>-->
+ <!--<it-server>tomcat-minimal</it-server>-->
<!--</properties>-->
<build>
<plugins>
Modified: geronimo/samples/trunk/samples/sendmail/sendmail-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-war/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-war/pom.xml Fri Jun 6 13:53:24 2008
@@ -38,11 +38,11 @@
<dependencies>
</dependencies>
-
+
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -53,7 +53,7 @@
</goals>
<configuration>
<tasks>
- <echo>Copying site directory from parent</echo>
+ <echo>Copying site directory from parent</echo>
<copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
<fileset dir="${pom.basedir}/../docs"/>
</copy>
Modified: geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Jun 6 13:53:24 2008
@@ -24,7 +24,7 @@
<artifactId>${pom.artifactId}</artifactId>
<version>${version}</version>
<type>war</type>
- </moduleId>
+ </moduleId>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/WEB-INF/web.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/WEB-INF/web.xml Fri Jun 6 13:53:24 2008
@@ -18,9 +18,9 @@
under the License.
-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
<display-name>Send Mail Webapp</display-name>
<welcome-file-list>
<welcome-file>index.html</welcome-file>
Modified: geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/header.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/header.html (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/header.html Fri Jun 6 13:53:24 2008
@@ -16,40 +16,42 @@
-->
<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>
+<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>
+<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
Modified: geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/index.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/index.html (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/index.html Fri Jun 6 13:53:24 2008
@@ -17,13 +17,13 @@
<!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=iso-8859-1" http-equiv="Content-Type">
+ <title>Apache Geronimo Sample Application</title>
+ <meta content="text/html; CHARSET=iso-8859-1" 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="./index.jsp" name="sampleDocumentFrame" title="Sample Document Description" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
</FRAMESET>
-
+
</html>