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/04/26 08:48:24 UTC

svn commit: r937938 [1/2] - in /geronimo/samples/trunk/samples/javaee6: ./ jpa20demo-javaee6/ jpa20demo-javaee6/jpa20demo-javaee6-jetty/ jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/ jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/main/ jpa20demo-javaee...

Author: xiaming
Date: Mon Apr 26 06:48:22 2010
New Revision: 937938

URL: http://svn.apache.org/viewvc?rev=937938&view=rev
Log:
GERONIMO-5266 A sample using JSF and criteria API of JPA 2.0

Added:
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/main/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/main/plan/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/main/plan/plan.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/pom.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/src/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/src/main/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/src/main/plan/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/src/main/plan/plan.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/ejb/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/ejb/MessageFacade.java   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/entity/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/entity/Message.java   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/managedbean/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/managedbean/MessageView.java   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_eclipselink.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_hibernate.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/WEB-INF/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/WEB-INF/web.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/index.xhtml
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_center.xhtml   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_left.xhtml   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_right.xhtml   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/css/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/css/default.css   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/header.html   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/index.html   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/sample-docu.jsp   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/pom.xml   (with props)
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/src/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/src/main/
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/src/main/resources/
Modified:
    geronimo/samples/trunk/samples/javaee6/pom.xml

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml Mon Apr 26 06:48:22 2010
@@ -0,0 +1,125 @@
+<?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>jpa20demo-javaee6</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jpa20demo-javaee6-jetty</artifactId>
+    <name>Geronimo Samples :: jpa20demo-javaee6 Plugin for Jetty</name>
+    <packaging>car</packaging>
+
+    <description>Geronimo Samples. jpa20demo-javaee6 Plugin for Jetty</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>jpa20demo-javaee6-ear</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>${jetty}-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <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>
+                    <module>
+                        <groupId>org.apache.geronimo.samples</groupId>
+                        <artifactId>jpa20demo-javaee6-ear</artifactId>
+                        <version>${version}</version>
+                        <type>war</type>
+                    </module>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
+

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

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

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

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/main/plan/plan.xml?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/main/plan/plan.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/main/plan/plan.xml Mon Apr 26 06:48:22 2010
@@ -0,0 +1,34 @@
+<?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/jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/pom.xml?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/pom.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/pom.xml Mon Apr 26 06:48:22 2010
@@ -0,0 +1,125 @@
+<?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>jpa20demo-javaee6</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jpa20demo-javaee6-tomcat</artifactId>
+    <name>Geronimo Samples :: jpa20demo-javaee6 Plugin for Tomcat</name>
+    <packaging>car</packaging>
+
+    <description>Geronimo Samples. jpa20demo-javaee6 Plugin for Tomcat</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>jpa20demo-javaee6-war</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat7-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <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>
+                    <module>
+                        <groupId>org.apache.geronimo.samples</groupId>
+                        <artifactId>jpa20demo-javaee6-ear</artifactId>
+                        <version>${version}</version>
+                        <type>war</type>
+                    </module>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>
+

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

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

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

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/src/main/plan/plan.xml?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/src/main/plan/plan.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/src/main/plan/plan.xml Mon Apr 26 06:48:22 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" 
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
+         xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+  <sys:environment>
+    <sys:moduleId>
+      <sys:groupId>org.apache.geronimo.samples</sys:groupId>
+      <sys:artifactId>jpa20demo-javaee6</sys:artifactId>
+      <sys:version>${version}</sys:version>
+      <sys:type>car</sys:type>
+    </sys:moduleId>
+    <sys:dependencies/>
+    <sys:hidden-classes/>
+    <sys:non-overridable-classes/>
+  </sys:environment>
+
+  <context-root>/jpa20demo-javaee6</context-root>
+
+</web-app>

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

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

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

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml Mon Apr 26 06:48:22 2010
@@ -0,0 +1,192 @@
+<?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>jpa20demo-javaee6</artifactId>
+		<version>3.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>jpa20demo-javaee6-war</artifactId>
+	<name>Geronimo Samples :: jpa20demo-javaee6 :: WAR</name>
+	<packaging>war</packaging>
+
+	<description>Geronimo Samples. WEB Module</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.myfaces.core</groupId>
+			<artifactId>myfaces-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jpa_2.0_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>process-resources</phase>
+						<id>copy-parent-site</id>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<echo>Copying site directory from parent</echo>
+								<copy
+									todir="${project.build.directory}/${pom.artifactId}-3.0-SNAPSHOT"
+									failonerror="false" overwrite="true">
+									<fileset dir="${pom.basedir}/../docs" />
+								</copy>
+							</tasks>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<archiveClasses>false</archiveClasses>                    
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<profiles>
+		<profile>
+			<id>openjpa</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>process-resources</phase>
+								<id>rename-persistence-file</id>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<tasks>
+										<echo>Rename persistence-openjpa.xml to persistence.xml</echo>
+										<copy
+											file="${basedir}/src/main/resources/META-INF/persistence_openjpa.xml"
+											tofile="${project.build.directory}/${pom.artifactId}-${version}/WEB-INF/classes/META-INF/persistence.xml"
+											overwrite="true" />
+									</tasks>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>hibernate</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+				<property>
+					<name>JPAProvider</name>
+					<value>hibernate</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>process-resources</phase>
+								<id>rename-persistence-file</id>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<tasks>
+										<echo>Rename persistence-hibernate.xml to persistence.xml</echo>
+										<copy
+											file="${basedir}/src/main/resources/META-INF/persistence_hibernate.xml"
+											tofile="${project.build.directory}/${pom.artifactId}-${version}/WEB-INF/classes/META-INF/persistence.xml"
+											overwrite="true" />
+									</tasks>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>eclipselink</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+				<property>
+					<name>JPAProvider</name>
+					<value>eclipselink</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>process-resources</phase>
+								<id>rename-persistence-file</id>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<tasks>
+										<echo>Rename persistence-eclipselink.xml to persistence.xml</echo>
+										<copy
+											file="${basedir}/src/main/resources/META-INF/persistence_eclipselink.xml"
+											tofile="${project.build.directory}/${pom.artifactId}-${version}/WEB-INF/classes/META-INF/persistence.xml"
+											overwrite="true" />
+									</tasks>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>

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

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

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

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/ejb/MessageFacade.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/ejb/MessageFacade.java?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/ejb/MessageFacade.java (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/ejb/MessageFacade.java Mon Apr 26 06:48:22 2010
@@ -0,0 +1,76 @@
+/**
+ *  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.jpa20demo.ejb;
+
+import org.apache.geronimo.samples.javaee6.jpa20demo.entity.Message;
+
+import java.util.List;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.CriteriaBuilder;
+
+@Stateless
+public class MessageFacade {
+	@PersistenceContext(unitName = "jpa20demo_PU")
+	private EntityManager em;
+
+	public void create(Message message) {
+		em.persist(message);
+	}
+
+	public void edit(Message message) {
+		em.merge(message);
+	}
+
+	public void remove(Message message) {
+		em.remove(em.merge(message));
+	}
+
+	public Message find(Object id) {
+		return em.find(Message.class, id);
+	}
+
+	public List<Message> findAll() {
+		CriteriaQuery cq = em.getCriteriaBuilder().createQuery();
+		cq.select(cq.from(Message.class));
+		return em.createQuery(cq).getResultList();
+	}
+
+	public List<Message> findRange(int[] range) {
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+		CriteriaQuery cq = cb.createQuery();
+		cq.select(cq.from(Message.class));
+		Query q = em.createQuery(cq);
+		q.setMaxResults(range[1] - range[0]);
+		q.setFirstResult(range[0]);
+		return q.getResultList();
+	}
+
+	public int count() {
+		CriteriaQuery cq = em.getCriteriaBuilder().createQuery();
+		Root<Message> rt = cq.from(Message.class);
+		cq.select(em.getCriteriaBuilder().count(rt));
+		Query q = em.createQuery(cq);
+		return ((Long) q.getSingleResult()).intValue();
+	}
+
+}

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/ejb/MessageFacade.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/ejb/MessageFacade.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/ejb/MessageFacade.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/entity/Message.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/entity/Message.java?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/entity/Message.java (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/entity/Message.java Mon Apr 26 06:48:22 2010
@@ -0,0 +1,77 @@
+/**
+ *  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.jpa20demo.entity;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Message implements Serializable {
+	private static final long serialVersionUID = 1L;
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private Long id;
+	private String message;
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	
+	public int hashCode() {
+		int hash = 0;
+		hash += (id != null ? id.hashCode() : 0);
+		return hash;
+	}
+
+	
+	public boolean equals(Object object) {
+		// TODO: Warning - this method won't work in the case the id fields are
+		// not set
+		if (!(object instanceof Message)) {
+			return false;
+		}
+		Message other = (Message) object;
+		if ((this.id == null && other.id != null)
+				|| (this.id != null && !this.id.equals(other.id))) {
+			return false;
+		}
+		return true;
+	}
+
+	
+	public String toString() {
+		return "entities.Message[id=" + id + " , " + this.message + "]";
+	}
+
+}

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/entity/Message.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/entity/Message.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/entity/Message.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/managedbean/MessageView.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/managedbean/MessageView.java?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/managedbean/MessageView.java (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/managedbean/MessageView.java Mon Apr 26 06:48:22 2010
@@ -0,0 +1,126 @@
+/**
+ *  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.jpa20demo.managedbean;
+
+import org.apache.geronimo.samples.javaee6.jpa20demo.ejb.MessageFacade;
+import org.apache.geronimo.samples.javaee6.jpa20demo.entity.Message;
+
+import java.util.List;
+import javax.ejb.EJB;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
+import javax.faces.context.FacesContext;
+import javax.servlet.http.HttpServletRequest;
+
+@ManagedBean(name = "MessageView")
+@RequestScoped
+public class MessageView {
+
+	@EJB
+	private MessageFacade messageFacade;
+	private Message message;
+	private int[] range;
+	private List<Message> rangeList;
+	private int start;
+	private int end;
+
+	public void setEnd(int end) {
+        if (end >= 0 && end >= this.start)
+		    this.end = end;
+        else
+            this.end = this.start;
+		range[1] = this.end;
+	}
+
+	public void setStart(int start) {
+        if (start >= 0)
+    		this.start = start;
+        else
+            this.start = 0;
+		range[0] = this.start;
+	}
+
+	public int getEnd() {
+		return end;
+	}
+
+	public int getStart() {
+		return start;
+	}
+
+	public int[] getRange() {
+		return range;
+	}
+
+	public List getdAll() {
+		return findAll();
+	}
+
+	public List getRangeList() {
+		return rangeList;
+	}
+
+	/** Creates a new instance of MessageView */
+	public MessageView() {
+		this.message = new Message();
+		range = new int[2];
+		range[0] = start;
+		range[1] = end;
+	}
+
+	// Calls getMessage to retrieve the message
+
+	public Message getMessage() {
+		return message;
+	}
+
+	// Returns the total number of messages
+	public int getNumberOfMessages() {
+		return messageFacade.findAll().size();
+	}
+
+	// Saves the message and then returns the string "theend"
+	public String postMessage() {
+
+		this.messageFacade.create(message);
+		return "index";
+	}
+
+	public String removeMessage() {
+		HttpServletRequest request = (HttpServletRequest) FacesContext
+				.getCurrentInstance().getExternalContext().getRequest();
+		this.message = this.messageFacade.find(Long.parseLong(request
+				.getParameter("messageId")));
+		this.messageFacade.remove(message);
+		return "index";
+	}
+
+	public List<Message> findAll() {
+		return this.messageFacade.findAll();
+	}
+
+	public String findRange() {
+		HttpServletRequest request = (HttpServletRequest) FacesContext
+				.getCurrentInstance().getExternalContext().getRequest();
+		rangeList = this.messageFacade.findRange(range);
+		return "index";
+	}
+
+	public int getCount() {
+		return this.messageFacade.count();
+	}
+}

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/managedbean/MessageView.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/managedbean/MessageView.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/managedbean/MessageView.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_eclipselink.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_eclipselink.xml?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_eclipselink.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_eclipselink.xml Mon Apr 26 06:48:22 2010
@@ -0,0 +1,36 @@
+<?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.
+-->
+
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+  <persistence-unit name="jpa20demo_PU" transaction-type="JTA">
+    <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+    <class>org.apache.geronimo.samples.javaee6.jpa20demo.entity.Message</class>
+    <exclude-unlisted-classes>true</exclude-unlisted-classes>
+    <properties>
+      <property name="eclipselink.jdbc.platform" value="org.eclipse.persistence.platform.database.DerbyPlatform"/>
+      <property name="eclipselink.jdbc.driver" value="org.apache.derby.jdbc.ClientDriver"/>
+      <property name="eclipselink.target-database" value="Derby"/>            
+      <property name="eclipselink.jdbc.url" value="jdbc:derby://localhost:1527/jpa20demodb;create=true"/>
+      <property name="eclipselink.jdbc.user" value="APP"/>
+      <property name="eclipselink.jdbc.password" value="APP"/>
+      <property name="eclipselink.logging.level" value="FINEST"/>            
+      <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/>
+      <property name="eclipselink.ddl-generation.output-mode" value="database"/>      
+    </properties>
+  </persistence-unit>
+</persistence>

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_eclipselink.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_eclipselink.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_eclipselink.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_hibernate.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_hibernate.xml?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_hibernate.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_hibernate.xml Mon Apr 26 06:48:22 2010
@@ -0,0 +1,34 @@
+<?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.
+-->
+
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+  <persistence-unit name="jpa20demo_PU" transaction-type="JTA">
+    <provider>org.hibernate.ejb.HibernatePersistence</provider>
+    <class>org.apache.geronimo.samples.javaee6.jpa20demo.entity.Message</class>
+    <exclude-unlisted-classes>true</exclude-unlisted-classes>
+    <properties>
+      <property name="hibernate.connection.driver_class" value="org.apache.derby.jdbc.ClientDriver"/>
+      <property name="hibernate.connection.url" value="jdbc:derby://localhost:1527/jpa20demodb"/>
+      <property name="hibernate.connection.username" value="APP"/>
+      <property name="hibernate.connection.password" value="APP"/>
+      <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/>
+      <property name="hibernate.show_sql" value="true"/>
+      <property name="hibernate.hbm2ddl.auto" value="create"/>
+    </properties>
+  </persistence-unit>
+</persistence>

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_hibernate.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_hibernate.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_hibernate.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml Mon Apr 26 06:48:22 2010
@@ -0,0 +1,35 @@
+<?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.
+-->
+
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+  <persistence-unit name="jpa20demo_PU" transaction-type="JTA">
+    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>    
+    <class>org.apache.geronimo.samples.javaee6.jpa20demo.entity.Message</class>
+    <exclude-unlisted-classes>true</exclude-unlisted-classes>
+    <properties>
+      <property name="openjpa.jdbc.DBDictionary " value="derby"/>
+      <property name="openjpa.ConnectionURL" value="jdbc:derby://localhost:1527/jpa20demodb"/>
+      <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.ClientDriver"/>
+      <property name="openjpa.ConnectionUserName" value="APP"/>
+      <property name="openjpa.ConnectionPassword" value="APP"/>      
+      <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=1)"/>      
+      <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
+      <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"/>      
+    </properties>
+  </persistence-unit>
+</persistence>

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml Mon Apr 26 06:48:22 2010
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" 
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
+         xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+  <sys:environment>
+    <sys:moduleId>
+      <sys:groupId>org.apache.geronimo.samples</sys:groupId>
+      <sys:artifactId>jpa20demo-javaee6</sys:artifactId>
+      <sys:version>${version}</sys:version>
+      <sys:type>car</sys:type>
+    </sys:moduleId>
+    <sys:dependencies/>
+    <sys:hidden-classes/>
+    <sys:non-overridable-classes/>
+  </sys:environment>
+
+  <context-root>/jpa20demo-javaee6</context-root>
+
+</web-app>

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

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

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

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/WEB-INF/web.xml?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/WEB-INF/web.xml Mon Apr 26 06:48:22 2010
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="jpa20demo-javaee6">
+
+    <description>jpa20demo-javaee6 Sample</description>
+    <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>faces/criteriaapi/index.xhtml</welcome-file>-->
+    </welcome-file-list>
+
+</web-app>

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

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

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

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/index.xhtml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/index.xhtml?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/index.xhtml (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/index.xhtml Mon Apr 26 06:48:22 2010
@@ -0,0 +1,51 @@
+<?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:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core">
+
+    <h:head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <link href="../css/default.css" rel="stylesheet" type="text/css" />
+        <title>Criteria API Demo</title>
+    </h:head>
+
+    <h:body>
+
+        <div id="top">
+            <ui:insert name="top">JPA 2.0 Demo - Criteria API</ui:insert>
+        </div>
+        <div>
+            <div id="left">
+                <ui:include src="view/criteria_left.xhtml"/>
+            </div>
+            <div>
+                <div id="right">
+                    <ui:include src="view/criteria_right.xhtml"/>
+                </div>
+                <div class="right_content">
+                    <ui:include src="view/criteria_center.xhtml"/>
+                </div>
+            </div>
+        </div>                
+    </h:body>
+</html>

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_center.xhtml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_center.xhtml?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_center.xhtml (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_center.xhtml Mon Apr 26 06:48:22 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"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:f="http://java.sun.com/jsf/core">
+    <ui:insert name="content">
+        <f:view>
+            <h:form>
+                <h1><h:outputText value="Post message Here!"/></h1>
+                <h:outputLabel value="Message is: "/>
+                <h:inputText value="#{MessageView.message.message}">
+                    <f:ajax event="keyup" execute="@this" render="out2"/>
+                </h:inputText>
+                <br/>
+                <h:outputText id="out2" value="The message in upper case is : #{MessageView.message.message.toUpperCase()}"/>
+                <br/>
+                <h:commandButton action="#{MessageView.postMessage}" value="Post Message"/>
+            </h:form>
+        </f:view>
+        <br/><br/>
+        <f:view>
+            <h:form>
+                <h1>
+                    <h:outputText value="Retrieve message here!"/>
+                </h1>
+                <h:outputText value="Retrieve messages which index is from"/>
+                <h:inputText value="#{MessageView.start}" size="4">
+                    <!--<f:ajax event="keyup" execute="@this" render="out1"/>-->
+                </h:inputText>
+                <h:outputText value="to"/>
+                <h:inputText value="#{MessageView.end}" size="4">
+                    <!--<f:ajax event="keyup" execute="@this" render="out1"/>-->
+                </h:inputText>
+                <br/>
+                <h:commandButton action="#{MessageView.findRange}" value="Retrieve"/>
+                <br/>
+                <h:dataTable  id="out1" value="#{MessageView.rangeList}" var="item">
+                    <h:column>
+                        <f:facet name="header">
+                            <h:outputText value="ID"/>
+                        </f:facet>
+                        <h:outputText value="#{item.id}"/>
+                    </h:column>                    
+                    <h:column>
+                        <f:facet name="header">
+                            <h:outputText value="Message"/>
+                        </f:facet>
+                        <h:outputText value="#{item.message}"/>
+                    </h:column>                    
+                </h:dataTable>
+            </h:form>
+        </f:view>
+    </ui:insert>
+</html>
+

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_center.xhtml
------------------------------------------------------------------------------
    svn:executable = *

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_left.xhtml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_left.xhtml?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_left.xhtml (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_left.xhtml Mon Apr 26 06:48:22 2010
@@ -0,0 +1,52 @@
+<?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"
+      xmlns:f="http://java.sun.com/jsf/core">
+    <f:view>
+        <h:form>
+            <h3><h:outputText value="Message List"/></h3>
+            <h:dataTable value="#{MessageView.dAll}" var="item">
+                <h:column>
+                    <f:facet name="header">
+                        <h:outputText value="ID"/>
+                    </f:facet>
+                    <h:outputText value="#{item.id}"/>
+                </h:column>
+                <h:column>
+                    <f:facet name="header">
+                        <h:outputText value="Message"/>
+                    </f:facet>
+                    <h:outputText value="#{item.message}"/>
+                </h:column>                
+                <h:column>
+                    <f:facet name="header">
+                        <h:outputText value="Action"/>
+                    </f:facet>
+                    <h:commandLink action="#{MessageView.removeMessage}" value="Remove">
+                        <f:param  name="messageId"     value="#{item.id}"/>
+                    </h:commandLink>
+                </h:column>
+            </h:dataTable>
+        </h:form>
+    </f:view>
+</html>
+

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_left.xhtml
------------------------------------------------------------------------------
    svn:executable = *

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_right.xhtml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_right.xhtml?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_right.xhtml (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_right.xhtml Mon Apr 26 06:48:22 2010
@@ -0,0 +1,32 @@
+<?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"
+      xmlns:ui="http://java.sun.com/jsf/facelets">
+    <ui:insert name="right">
+        <h:outputLabel value="The size of message collection is #{MessageView.numberOfMessages}!"/>
+        <br/>
+        <h:outputLabel value="The count of query result set is #{MessageView.count}!"/>
+        <br/>
+        <h:outputLabel value="They should be same!"/>
+    </ui:insert>
+</html>
+

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/criteriaapi/view/criteria_right.xhtml
------------------------------------------------------------------------------
    svn:executable = *

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/css/default.css
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/css/default.css?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/css/default.css (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/css/default.css Mon Apr 26 06:48:22 2010
@@ -0,0 +1,61 @@
+/*
+* 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.
+*/
+body {
+    background-color: #ffffff;
+    font-size: 11px;
+    font-family: Verdana, arial, sans-serif;
+    color: #000000;  
+    font-weight: normal;
+}
+
+
+#top {
+    position: relative;
+    background-color: #036fab;
+    color: white;
+    padding: 5px;
+    margin: 0px 0px 10px 0px;
+}
+
+
+#left {
+    position: relative;
+    float: left;
+    background-color: #ece300;
+    padding: 5px;
+    width: 20%;
+}
+
+#right {
+    position: relative;
+    float: right;
+    background-color: #ece300;
+    padding: 5px;
+    width: 20%;
+}
+
+.right_content {
+    background-color: #dddddd;
+    padding: 5px;
+    margin: 0px 170px 0px 170px;
+}
+
+
+
+
+
+

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/css/default.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/css/default.css
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/css/default.css
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/css/default.css
------------------------------------------------------------------------------
    svn:mime-type = text/css

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

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

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

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

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

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

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

Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/sample-docu.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/sample-docu.jsp?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/sample-docu.jsp (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/sample-docu.jsp Mon Apr 26 06:48:22 2010
@@ -0,0 +1,32 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd class="cell"">
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<html>
+<head>
+  <title>Sample of jpa20demo-javaee6</title>
+  <meta content="text/html; CHARSET=UTF-8" http-equiv="Content-Type">
+</head>
+
+<BODY>
+  <font face="Verdana, Helvetica, Arial">
+<ul>
+<li><a href="faces/criteriaapi/index.xhtml">Criteria API Demo</a></li>
+</ul>
+  </FONT>
+</body>
+</html>

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/sample-docu.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/sample-docu.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/webapp/sample-docu.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain