You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/05/06 05:55:39 UTC

svn commit: r941568 [1/2] - in /geronimo/samples/trunk/samples/javaee6: ./ singletonejb-javaee6/ singletonejb-javaee6/singletonejb-javaee6-jetty/ singletonejb-javaee6/singletonejb-javaee6-jetty/src/ singletonejb-javaee6/singletonejb-javaee6-jetty/src/m...

Author: xiaming
Date: Thu May  6 03:55:38 2010
New Revision: 941568

URL: http://svn.apache.org/viewvc?rev=941568&view=rev
Log:
GERONIMO-5273 A calculator sample to demo singleton EJB provided by Tang Yin Qi

Added:
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/pom.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/AddCalculatorBackBean.java   (with props)
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/SubtractCalculatorBackBean.java   (with props)
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/StatefulCalculator.java   (with props)
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/META-INF/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/META-INF/MANIFEST.MF
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/SubtractCal.xhtml
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/WEB-INF/
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/WEB-INF/web.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/header.html   (with props)
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.html   (with props)
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.xhtml
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/sample-docu.jsp   (with props)
Modified:
    geronimo/samples/trunk/samples/javaee6/pom.xml

Modified: geronimo/samples/trunk/samples/javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/pom.xml?rev=941568&r1=941567&r2=941568&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/pom.xml Thu May  6 03:55:38 2010
@@ -154,7 +154,7 @@
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            <modules>
+            <modules>				
                 <module>cviewer-javaee6</module>
                 <module>jpa20demo-javaee6</module>
                 <module>fileupload-javaee6</module>
@@ -162,6 +162,7 @@
                 <module>converter-javaee6</module>
                 <module>jarresource-javaee6</module>
                 <module>webfragment-javaee6</module>
+                <module>singletonejb-javaee6</module>
             </modules>
         </profile>
         <profile>
@@ -181,7 +182,8 @@
                 <module>converter-javaee6</module>
                 <module>jarresource-javaee6</module>
                 <module>webfragment-javaee6</module>
+                <module>singletonejb-javaee6</module>
             </modules>
         </profile>
     </profiles>  
-</project>
\ No newline at end of file
+</project>

Added: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/pom.xml?rev=941568&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/pom.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/pom.xml Thu May  6 03:55:38 2010
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>javaee6</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>singletonejb-javaee6</artifactId>
+    <name>Geronimo Samples :: singletonejb-javaee6</name>
+    <packaging>pom</packaging>
+    <version>3.0-SNAPSHOT</version>
+    
+    <description>
+        Geronimo singletonejb-javaee6 sample created from an archetype.
+    </description>
+    
+   <modules>
+   
+    </modules>
+
+   <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <inherited>false</inherited>
+                <configuration>
+                  <outputDirectory>${project.basedir}/docs</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+	
+	   <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+			     <module>singletonejb-javaee6-war</module>
+				<module>singletonejb-javaee6-jetty</module>
+				<module>singletonejb-javaee6-tomcat</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>no-plugin</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>        
+                <property>
+                    <name>buildPlugin</name>
+                    <value>false</value>
+                </property>        
+            </activation>
+            <modules>
+                <module>singletonejb-javaee6-war</module>
+            </modules>
+        </profile>
+    </profiles> 
+</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>javaee6</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>singletonejb-javaee6</artifactId>
+    <name>Geronimo Samples :: singletonejb-javaee6</name>
+    <packaging>pom</packaging>
+    <version>3.0-SNAPSHOT</version>
+    
+    <description>
+        Geronimo singletonejb-javaee6 sample created from an archetype.
+    </description>
+    
+   <modules>
+   
+    </modules>
+
+   <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <inherited>false</inherited>
+                <configuration>
+                  <outputDirectory>${project.basedir}/docs</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+	
+	   <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+			     <module>singletonejb-javaee6-war</module>
+				<module>singletonejb-javaee6-jetty</module>
+				<module>singletonejb-javaee6-tomcat</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>no-plugin</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>        
+                <property>
+                    <name>buildPlugin</name>
+                    <value>false</value>
+                </property>        
+            </activation>
+            <modules>
+                <module>singletonejb-javaee6-war</module>
+            </modules>
+        </profile>
+    </profiles> 
+</project>

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml?rev=941568&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml Thu May  6 03:55:38 2010
@@ -0,0 +1,232 @@
+<?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>singletonejb-javaee6</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>singletonejb-javaee6-jetty</artifactId>
+    <name>Geronimo Samples :: singletonejb-javaee6 Plugin for Jetty</name>
+    <packaging>car</packaging>
+
+    <description>Geronimo Samples. singletonejb-javaee6 Plugin for Jetty</description>
+
+    <dependencies>
+        
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>${jetty}-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${jpaDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+              
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Sample</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
+
+<?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>singletonejb-javaee6</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>singletonejb-javaee6-jetty</artifactId>
+    <name>Geronimo Samples :: singletonejb-javaee6 Plugin for Jetty</name>
+    <packaging>car</packaging>
+
+    <description>Geronimo Samples. singletonejb-javaee6 Plugin for Jetty</description>
+
+    <dependencies>
+        
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>${jetty}-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${jpaDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+              
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Sample</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
+

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml?rev=941568&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml Thu May  6 03:55:38 2010
@@ -0,0 +1,68 @@
+<?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$ -->
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+
+   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+      <dep:moduleId>
+         <dep:groupId>${pom.groupId}</dep:groupId>
+         <dep:artifactId>${pom.artifactId}</dep:artifactId>
+         <dep:version>3.0-SNAPSHOT</dep:version>
+         <dep:type>car</dep:type>
+      </dep:moduleId>
+
+   </dep:environment>
+   
+</application>
+<?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$ -->
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+
+   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+      <dep:moduleId>
+         <dep:groupId>${pom.groupId}</dep:groupId>
+         <dep:artifactId>${pom.artifactId}</dep:artifactId>
+         <dep:version>3.0-SNAPSHOT</dep:version>
+         <dep:type>car</dep:type>
+      </dep:moduleId>
+
+   </dep:environment>
+   
+</application>

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml?rev=941568&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml Thu May  6 03:55:38 2010
@@ -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>singletonejb-javaee6</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>singletonejb-javaee6-tomcat</artifactId>
+    <name>Geronimo Samples :: singletonejb-javaee6 Plugin for Tomcat</name>
+    <packaging>car</packaging>
+
+    <description>Geronimo Samples. singletonejb-javaee6 Plugin for Tomcat</description>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat7-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${jpaDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+               
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Sample</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>
+
+<?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>singletonejb-javaee6</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>singletonejb-javaee6-tomcat</artifactId>
+    <name>Geronimo Samples :: singletonejb-javaee6 Plugin for Tomcat</name>
+    <packaging>car</packaging>
+
+    <description>Geronimo Samples. singletonejb-javaee6 Plugin for Tomcat</description>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat7-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${jpaDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+               
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Sample</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>
+

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml?rev=941568&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml Thu May  6 03:55:38 2010
@@ -0,0 +1,68 @@
+<?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$ -->
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+
+   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+      <dep:moduleId>
+         <dep:groupId>${pom.groupId}</dep:groupId>
+         <dep:artifactId>${pom.artifactId}</dep:artifactId>
+         <dep:version>3.0-SNAPSHOT</dep:version>
+         <dep:type>car</dep:type>
+      </dep:moduleId>
+
+   </dep:environment>
+   
+</application>
+<?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$ -->
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+
+   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+      <dep:moduleId>
+         <dep:groupId>${pom.groupId}</dep:groupId>
+         <dep:artifactId>${pom.artifactId}</dep:artifactId>
+         <dep:version>3.0-SNAPSHOT</dep:version>
+         <dep:type>car</dep:type>
+      </dep:moduleId>
+
+   </dep:environment>
+   
+</application>

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml?rev=941568&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml Thu May  6 03:55:38 2010
@@ -0,0 +1,160 @@
+<?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>singletonejb-javaee6</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>singletonejb-javaee6-war</artifactId>
+    <name>Geronimo Samples :: singletonejb-javaee6 :: WAR</name>
+    <packaging>war</packaging>
+
+    <description>Geronimo Samples. WEB Module</description>
+
+    <dependencies>
+	
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-ejb_3.1_spec</artifactId>
+			<version>1.0</version>
+		</dependency>
+		
+		<dependency>
+		    <groupId>org.apache.myfaces.core</groupId>
+			<artifactId>myfaces-api</artifactId>
+			<version>2.0.0</version>
+		</dependency>
+		
+	</dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <id>copy-parent-site</id>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                              <echo>Copying site directory from parent</echo>
+                                <copy todir="${project.build.directory}/${pom.artifactId}-3.0-SNAPSHOT" failonerror="false" overwrite="true">
+                                    <fileset dir="${pom.basedir}/../docs" />
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+<?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>singletonejb-javaee6</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>singletonejb-javaee6-war</artifactId>
+    <name>Geronimo Samples :: singletonejb-javaee6 :: WAR</name>
+    <packaging>war</packaging>
+
+    <description>Geronimo Samples. WEB Module</description>
+
+    <dependencies>
+	
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-ejb_3.1_spec</artifactId>
+			<version>1.0</version>
+		</dependency>
+		
+		<dependency>
+		    <groupId>org.apache.myfaces.core</groupId>
+			<artifactId>myfaces-api</artifactId>
+			<version>2.0.0</version>
+		</dependency>
+		
+	</dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <id>copy-parent-site</id>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                              <echo>Copying site directory from parent</echo>
+                                <copy todir="${project.build.directory}/${pom.artifactId}-3.0-SNAPSHOT" failonerror="false" overwrite="true">
+                                    <fileset dir="${pom.basedir}/../docs" />
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/AddCalculatorBackBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/AddCalculatorBackBean.java?rev=941568&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/AddCalculatorBackBean.java (added)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/AddCalculatorBackBean.java Thu May  6 03:55:38 2010
@@ -0,0 +1,142 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+ /*
+    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.
+*/
+package org.apache.geronimo.samples.javaee6.SingletonEJB.backbeans;
+
+import org.apache.geronimo.samples.javaee6.SingletonEJB.sessionBeans.StatefulCalculator;
+import javax.ejb.EJB;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
+
+
+@ManagedBean(name = "AddCalculatorBackBean")
+@RequestScoped
+public class AddCalculatorBackBean {
+
+    @EJB
+    private StatefulCalculator calculatorfacade;
+    private String currentInput = "0.0";
+    private String output;
+
+    /** Creates a new instance of AddCalculatorBackBean */
+    public AddCalculatorBackBean() {
+        currentInput = "1.0";
+    }
+
+    public String add() {
+        calculatorfacade.add(Double.parseDouble(currentInput));
+        this.output = calculatorfacade.getOutput();
+//    this.output="added";
+        return "index";
+    }
+
+    public String getCurrentInput() {
+        return currentInput;
+    }
+
+    public void setCurrentInput(String currentInput) {
+        this.currentInput = currentInput;
+    }
+
+    public String getOutput() {
+        return this.output;
+    }
+
+    public void setOutput(String output) {
+        this.output = output;
+    }
+
+    public String goToSubtract() {
+        return "SubtractCal";
+    }
+}
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+ /*
+    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.
+*/
+package org.apache.geronimo.samples.javaee6.SingletonEJB.backbeans;
+
+import org.apache.geronimo.samples.javaee6.SingletonEJB.sessionBeans.StatefulCalculator;
+import javax.ejb.EJB;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
+
+
+@ManagedBean(name = "AddCalculatorBackBean")
+@RequestScoped
+public class AddCalculatorBackBean {
+
+    @EJB
+    private StatefulCalculator calculatorfacade;
+    private String currentInput = "0.0";
+    private String output;
+
+    /** Creates a new instance of AddCalculatorBackBean */
+    public AddCalculatorBackBean() {
+        currentInput = "1.0";
+    }
+
+    public String add() {
+        calculatorfacade.add(Double.parseDouble(currentInput));
+        this.output = calculatorfacade.getOutput();
+//    this.output="added";
+        return "index";
+    }
+
+    public String getCurrentInput() {
+        return currentInput;
+    }
+
+    public void setCurrentInput(String currentInput) {
+        this.currentInput = currentInput;
+    }
+
+    public String getOutput() {
+        return this.output;
+    }
+
+    public void setOutput(String output) {
+        this.output = output;
+    }
+
+    public String goToSubtract() {
+        return "SubtractCal";
+    }
+}

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/AddCalculatorBackBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/AddCalculatorBackBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/AddCalculatorBackBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/SubtractCalculatorBackBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/SubtractCalculatorBackBean.java?rev=941568&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/SubtractCalculatorBackBean.java (added)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/SubtractCalculatorBackBean.java Thu May  6 03:55:38 2010
@@ -0,0 +1,142 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+ /*
+    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.
+*/
+package org.apache.geronimo.samples.javaee6.SingletonEJB.backbeans;
+
+import org.apache.geronimo.samples.javaee6.SingletonEJB.sessionBeans.StatefulCalculator;
+import javax.ejb.EJB;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
+
+
+@ManagedBean(name = "SubtractSingletonCalculatorBackBean")
+@RequestScoped
+public class SubtractCalculatorBackBean {
+
+    @EJB
+    private StatefulCalculator calculatorfacade;
+    private String currentInput = "0.0";
+    private String output;
+
+    /** Creates a new instance of SingletonCalculatorBackBean */
+    public SubtractCalculatorBackBean() {
+        currentInput = "1.0";
+    }
+
+    public String subtract() {
+        calculatorfacade.sub(Double.parseDouble(currentInput));
+        this.output = calculatorfacade.getOutput();
+//    this.output="added";
+        return "SubtractCal";
+    }
+
+    public String getCurrentInput() {
+        return currentInput;
+    }
+
+    public void setCurrentInput(String currentInput) {
+        this.currentInput = currentInput;
+    }
+
+    public String getOutput() {
+        return this.output;
+    }
+
+    public void setOutput(String output) {
+        this.output = output;
+    }
+
+    public String goToAdd() {
+        return "index";
+    }
+}
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+ /*
+    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.
+*/
+package org.apache.geronimo.samples.javaee6.SingletonEJB.backbeans;
+
+import org.apache.geronimo.samples.javaee6.SingletonEJB.sessionBeans.StatefulCalculator;
+import javax.ejb.EJB;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
+
+
+@ManagedBean(name = "SubtractSingletonCalculatorBackBean")
+@RequestScoped
+public class SubtractCalculatorBackBean {
+
+    @EJB
+    private StatefulCalculator calculatorfacade;
+    private String currentInput = "0.0";
+    private String output;
+
+    /** Creates a new instance of SingletonCalculatorBackBean */
+    public SubtractCalculatorBackBean() {
+        currentInput = "1.0";
+    }
+
+    public String subtract() {
+        calculatorfacade.sub(Double.parseDouble(currentInput));
+        this.output = calculatorfacade.getOutput();
+//    this.output="added";
+        return "SubtractCal";
+    }
+
+    public String getCurrentInput() {
+        return currentInput;
+    }
+
+    public void setCurrentInput(String currentInput) {
+        this.currentInput = currentInput;
+    }
+
+    public String getOutput() {
+        return this.output;
+    }
+
+    public void setOutput(String output) {
+        this.output = output;
+    }
+
+    public String goToAdd() {
+        return "index";
+    }
+}

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/SubtractCalculatorBackBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/SubtractCalculatorBackBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/SubtractCalculatorBackBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/StatefulCalculator.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/StatefulCalculator.java?rev=941568&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/StatefulCalculator.java (added)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/StatefulCalculator.java Thu May  6 03:55:38 2010
@@ -0,0 +1,108 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+ 
+/*
+    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.
+*/
+package org.apache.geronimo.samples.javaee6.SingletonEJB.sessionBeans;
+
+import javax.ejb.Singleton;
+
+
+@Singleton
+public class StatefulCalculator {
+
+    // Add business logic below. (Right-click in editor and choose
+    // "Insert Code > Add Business Method")
+    String output = "Start the calculator process:<br/>";
+    double result = 0;
+
+    public double add(double d) {
+        double tmp = result + d;
+        this.output += result + " + " + d + " equals " + tmp + "<br/>";
+        result = tmp;
+        return result;
+    }
+
+    public String getOutput() {
+        return this.output;
+    }
+
+    public double sub(double d) {
+        double tmp = result - d;
+        this.output += result + " - " + d + " equals " + tmp + "<br/>";
+        result = tmp;
+        return result;
+    }
+}
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+ 
+/*
+    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.
+*/
+package org.apache.geronimo.samples.javaee6.SingletonEJB.sessionBeans;
+
+import javax.ejb.Singleton;
+
+
+@Singleton
+public class StatefulCalculator {
+
+    // Add business logic below. (Right-click in editor and choose
+    // "Insert Code > Add Business Method")
+    String output = "Start the calculator process:<br/>";
+    double result = 0;
+
+    public double add(double d) {
+        double tmp = result + d;
+        this.output += result + " + " + d + " equals " + tmp + "<br/>";
+        result = tmp;
+        return result;
+    }
+
+    public String getOutput() {
+        return this.output;
+    }
+
+    public double sub(double d) {
+        double tmp = result - d;
+        this.output += result + " - " + d + " equals " + tmp + "<br/>";
+        result = tmp;
+        return result;
+    }
+}

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/StatefulCalculator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/StatefulCalculator.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/StatefulCalculator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/META-INF/MANIFEST.MF?rev=941568&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/META-INF/MANIFEST.MF (added)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/META-INF/MANIFEST.MF Thu May  6 03:55:38 2010
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+
+Manifest-Version: 1.0
+

Added: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/SubtractCal.xhtml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/SubtractCal.xhtml?rev=941568&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/SubtractCal.xhtml (added)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/SubtractCal.xhtml Thu May  6 03:55:38 2010
@@ -0,0 +1,74 @@
+<?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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html">
+    <h:head>
+        <title>Facelet Title</title>
+    </h:head>
+
+    <h:body>
+        <h:form>
+            <h:outputText value="Subtract Calculator"/>
+            <hr/>
+            <h:inputText value="#{SubtractSingletonCalculatorBackBean.currentInput}"/>
+            <h:commandButton action="#{SubtractSingletonCalculatorBackBean.subtract}" value="subtract"/>
+            <br/>
+            <h:outputText escape="false" value="#{SubtractSingletonCalculatorBackBean.output}"/>
+            <h:commandLink value="Go to Add Calculator" action="#{SubtractSingletonCalculatorBackBean.goToAdd}"/>
+        </h:form>
+    </h:body>
+	
+</html>
+<?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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html">
+    <h:head>
+        <title>Facelet Title</title>
+    </h:head>
+
+    <h:body>
+        <h:form>
+            <h:outputText value="Subtract Calculator"/>
+            <hr/>
+            <h:inputText value="#{SubtractSingletonCalculatorBackBean.currentInput}"/>
+            <h:commandButton action="#{SubtractSingletonCalculatorBackBean.subtract}" value="subtract"/>
+            <br/>
+            <h:outputText escape="false" value="#{SubtractSingletonCalculatorBackBean.output}"/>
+            <h:commandLink value="Go to Add Calculator" action="#{SubtractSingletonCalculatorBackBean.goToAdd}"/>
+        </h:form>
+    </h:body>
+	
+</html>
\ No newline at end of file

Added: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/WEB-INF/web.xml?rev=941568&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/WEB-INF/web.xml Thu May  6 03:55:38 2010
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+    <context-param>
+        <param-name>javax.faces.PROJECT_STAGE</param-name>
+        <param-value>Development</param-value>
+    </context-param>
+    <servlet>
+        <servlet-name>Faces Servlet</servlet-name>
+        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>/faces/*</url-pattern>
+    </servlet-mapping>
+    <session-config>
+        <session-timeout>
+            30
+        </session-timeout>
+    </session-config>
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+</web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+    <context-param>
+        <param-name>javax.faces.PROJECT_STAGE</param-name>
+        <param-value>Development</param-value>
+    </context-param>
+    <servlet>
+        <servlet-name>Faces Servlet</servlet-name>
+        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>/faces/*</url-pattern>
+    </servlet-mapping>
+    <session-config>
+        <session-timeout>
+            30
+        </session-timeout>
+    </session-config>
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+</web-app>

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/header.html?rev=941568&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/header.html (added)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/header.html Thu May  6 03:55:38 2010
@@ -0,0 +1,110 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<html>
+    <head>
+        <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+        <link rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">   
+        <script src="http://geronimo.apache.org/functions.js" type="text/javascript"></script><title>Apache Geronimo Sample Applications</title>
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    </head>
+    
+    <body onload="init()">
+        
+        <table valign="top" background="http://geronimo.apache.org/images/header_bg_1x86.gif" border="0" cellpadding="0" cellspacing="0" width="100%">
+            <tbody>
+                <tr>
+                    <td valing="top" align="left">
+                        <a href="http://geronimo.apache.org/"><img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0"></a>
+                    </td>
+                    <td width="100%">
+                        &nbsp;
+                    </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%">
+                        &nbsp;<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>&nbsp;&nbsp;
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+
+    </body>
+</html>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<html>
+    <head>
+        <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+        <link rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">   
+        <script src="http://geronimo.apache.org/functions.js" type="text/javascript"></script><title>Apache Geronimo Sample Applications</title>
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    </head>
+    
+    <body onload="init()">
+        
+        <table valign="top" background="http://geronimo.apache.org/images/header_bg_1x86.gif" border="0" cellpadding="0" cellspacing="0" width="100%">
+            <tbody>
+                <tr>
+                    <td valing="top" align="left">
+                        <a href="http://geronimo.apache.org/"><img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0"></a>
+                    </td>
+                    <td width="100%">
+                        &nbsp;
+                    </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%">
+                        &nbsp;<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>&nbsp;&nbsp;
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+
+    </body>
+</html>
\ No newline at end of file

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.html?rev=941568&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.html (added)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.html Thu May  6 03:55:38 2010
@@ -0,0 +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
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd class="cell"">
+<html>
+<head>
+  <title>Apache Geronimo Sample Application</title>
+  <meta content="text/html; CHARSET=UTF-8" http-equiv="Content-Type">
+</head>
+
+<FRAMESET  rows="86px,*" frameborder="0">
+	<FRAME src="./header.html" name="headerFrame" title="Header" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
+    <FRAME src="./faces/index.xhtml" name="sampleDocumentFrame" title="Sample Document Description" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="yes">
+</FRAMESET>
+  
+</html>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd class="cell"">
+<html>
+<head>
+  <title>Apache Geronimo Sample Application</title>
+  <meta content="text/html; CHARSET=UTF-8" http-equiv="Content-Type">
+</head>
+
+<FRAMESET  rows="86px,*" frameborder="0">
+	<FRAME src="./header.html" name="headerFrame" title="Header" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
+    <FRAME src="./faces/index.xhtml" name="sampleDocumentFrame" title="Sample Document Description" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="yes">
+</FRAMESET>
+  
+</html>

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:mime-type = text/html