geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From viol...@apache.org
Subject svn commit: r1078686 [5/6] - in /geronimo/samples/trunk: ./ geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/ geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/...
Date Mon, 07 Mar 2011 05:17:15 GMT
Modified: geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-war/src/main/webapp/index.xhtml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-war/src/main/webapp/index.xhtml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-war/src/main/webapp/index.xhtml (original)
+++ geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-war/src/main/webapp/index.xhtml Mon Mar  7 05:17:11 2011
@@ -17,70 +17,70 @@
 -->
 <!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"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:c="http://java.sun.com/jsp/jstl/core">
+    xmlns:h="http://java.sun.com/jsf/html"
+    xmlns:f="http://java.sun.com/jsf/core"
+    xmlns:ui="http://java.sun.com/jsf/facelets"
+    xmlns:c="http://java.sun.com/jsp/jstl/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>Converter Sample</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <link href="./css/default.css" rel="stylesheet"
+        type="text/css" />
+    <title>Converter Sample</title>
 </h:head>
 
 <h:body>
 
 
-	<div id="top" class="top"><ui:insert name="top">Converter - A JSF and AJAX Example</ui:insert>
-	</div>
-	<div>
-	<div id="left"><ui:insert name="left">
-		<h:commandButton id="button1" value="Show Exchange Rate"
-			onclick="jsf.ajax.request(this, event, {execute: 'button1', render: 'pg1'}); return false;"
-			actionListener="#{ConverterBean.toggle}" />
-		<h:panelGroup id="pg1">
-			<h:dataTable id="out1" value="#{ConverterBean.currencyList}" var="item"
-				rendered="#{ConverterBean.render}">
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="Currency" />
-					</f:facet>
-					<h:outputText value="#{item.name}" />
-				</h:column>
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="Rate" />
-					</f:facet>
-					<h:outputText value="#{item.rate}" />
-				</h:column>
-			</h:dataTable>
-		</h:panelGroup>
-	</ui:insert></div>
-	<div id="content" class="left_content"><ui:insert name="content">
-		<h:form>
-			<h:outputText value="RMB:"/>
-			<h:inputText value="#{ConverterBean.value}">
-				<f:ajax event="keyup" execute="@this" render="out1" />
-			</h:inputText>
-
-			<h:dataTable id="out1" value="#{ConverterBean.convertedList}" var="item">
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="Currency" />
-					</f:facet>
-					<h:outputText value="#{item.name}" />
-				</h:column>
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="Actual Value" />
-					</f:facet>
-					<h:outputText value="#{item.actualValue}" />
-				</h:column>
-			</h:dataTable>
-		</h:form>
-	</ui:insert></div>
-	</div>
+    <div id="top" class="top"><ui:insert name="top">Converter - A JSF and AJAX Example</ui:insert>
+    </div>
+    <div>
+    <div id="left"><ui:insert name="left">
+        <h:commandButton id="button1" value="Show Exchange Rate"
+            onclick="jsf.ajax.request(this, event, {execute: 'button1', render: 'pg1'}); return false;"
+            actionListener="#{ConverterBean.toggle}" />
+        <h:panelGroup id="pg1">
+            <h:dataTable id="out1" value="#{ConverterBean.currencyList}" var="item"
+                rendered="#{ConverterBean.render}">
+                <h:column>
+                    <f:facet name="header">
+                        <h:outputText value="Currency" />
+                    </f:facet>
+                    <h:outputText value="#{item.name}" />
+                </h:column>
+                <h:column>
+                    <f:facet name="header">
+                        <h:outputText value="Rate" />
+                    </f:facet>
+                    <h:outputText value="#{item.rate}" />
+                </h:column>
+            </h:dataTable>
+        </h:panelGroup>
+    </ui:insert></div>
+    <div id="content" class="left_content"><ui:insert name="content">
+        <h:form>
+            <h:outputText value="RMB:"/>
+            <h:inputText value="#{ConverterBean.value}">
+                <f:ajax event="keyup" execute="@this" render="out1" />
+            </h:inputText>
+
+            <h:dataTable id="out1" value="#{ConverterBean.convertedList}" var="item">
+                <h:column>
+                    <f:facet name="header">
+                        <h:outputText value="Currency" />
+                    </f:facet>
+                    <h:outputText value="#{item.name}" />
+                </h:column>
+                <h:column>
+                    <f:facet name="header">
+                        <h:outputText value="Actual Value" />
+                    </f:facet>
+                    <h:outputText value="#{item.actualValue}" />
+                </h:column>
+            </h:dataTable>
+        </h:form>
+    </ui:insert></div>
+    </div>
 </h:body>
 
 </html>

Modified: geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/cviewer/CviewerServletListener.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/cviewer/CviewerServletListener.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/cviewer/CviewerServletListener.java (original)
+++ geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/cviewer/CviewerServletListener.java Mon Mar  7 05:17:11 2011
@@ -29,22 +29,22 @@ import javax.servlet.annotation.WebListe
 @WebListener()
 public class CviewerServletListener implements ServletContextListener {
 
-	public void contextInitialized(ServletContextEvent sce) {
-		ServletContext sc = sce.getServletContext();
-		// Regist servlet
-		ServletRegistration sr = sc.addServlet("ClassViewer",
-				"org.apache.geronimo.samples.javaee6.cviewer.CViewerServlet");
-		sr.addMapping("/ClassViewer");
+    public void contextInitialized(ServletContextEvent sce) {
+        ServletContext sc = sce.getServletContext();
+        // Regist servlet
+        ServletRegistration sr = sc.addServlet("ClassViewer",
+                "org.apache.geronimo.samples.javaee6.cviewer.CViewerServlet");
+        sr.addMapping("/ClassViewer");
 
-		// Register Filter
-		FilterRegistration fr = sc.addFilter("CViewerFilter",
-				"org.apache.geronimo.samples.javaee6.cviewer.CviewerFilter");
-		fr.addMappingForServletNames(EnumSet.of(DispatcherType.REQUEST), true,
-				"ClassViewer");
+        // Register Filter
+        FilterRegistration fr = sc.addFilter("CViewerFilter",
+                "org.apache.geronimo.samples.javaee6.cviewer.CviewerFilter");
+        fr.addMappingForServletNames(EnumSet.of(DispatcherType.REQUEST), true,
+                "ClassViewer");
 
-	}
+    }
 
-	public void contextDestroyed(ServletContextEvent sce) {
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
+    public void contextDestroyed(ServletContextEvent sce) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
 }

Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/pom.xml Mon Mar  7 05:17:11 2011
@@ -1,181 +1,181 @@
 <?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$
-	-->
+    <!--
+        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">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.apache.geronimo.samples</groupId>
-		<artifactId>ejbtimer-javaee6</artifactId>
-		<version>3.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>ejbtimer-javaee6-war</artifactId>
-	<name>Geronimo Samples :: ejbtimer-javaee6 :: WAR</name>
-	<packaging>war</packaging>
-
-	<description>Geronimo Samples. WEB Module</description>
-
-	<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>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jpa_2.0_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-	
-		<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>
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>ejbtimer-javaee6</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>ejbtimer-javaee6-war</artifactId>
+    <name>Geronimo Samples :: ejbtimer-javaee6 :: WAR</name>
+    <packaging>war</packaging>
+
+    <description>Geronimo Samples. WEB Module</description>
+
+    <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>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    
+        <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>

Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/entity/Log.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/entity/Log.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/entity/Log.java (original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/entity/Log.java Mon Mar  7 05:17:11 2011
@@ -23,62 +23,62 @@ import javax.persistence.Id;
 
 @Entity
 public class Log implements Serializable {
-	private static final long serialVersionUID = 1L;
-	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
-	private Long id;
-	String createTime;
-	String event;
-
-	public String getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getEvent() {
-		return event;
-	}
-
-	public void setEvent(String event) {
-		this.event = event;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	@Override
-	public int hashCode() {
-		int hash = 0;
-		hash += (id != null ? id.hashCode() : 0);
-		return hash;
-	}
-
-	@Override
-	public boolean equals(Object object) {
-		// TODO: Warning - this method won't work in the case the id fields are
-		// not set
-		if (!(object instanceof Log)) {
-			return false;
-		}
-		Log other = (Log) object;
-		if ((this.id == null && other.id != null)
-				|| (this.id != null && !this.id.equals(other.id))) {
-			return false;
-		}
-		return true;
-	}
-
-	@Override
-	public String toString() {
-		return "com.test.entity.Log[id=" + id + "]";
-	}
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+    String createTime;
+    String event;
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getEvent() {
+        return event;
+    }
+
+    public void setEvent(String event) {
+        this.event = event;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (id != null ? id.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are
+        // not set
+        if (!(object instanceof Log)) {
+            return false;
+        }
+        Log other = (Log) object;
+        if ((this.id == null && other.id != null)
+                || (this.id != null && !this.id.equals(other.id))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "com.test.entity.Log[id=" + id + "]";
+    }
 
 }

Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/servlets/showLog.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/servlets/showLog.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/servlets/showLog.java (original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/servlets/showLog.java Mon Mar  7 05:17:11 2011
@@ -29,96 +29,96 @@ import org.apache.geronimo.samples.javae
 @WebServlet(name = "showLog", urlPatterns = { "/showLog" })
 public class showLog extends HttpServlet {
 
-	@EJB
-	private logFacade facade;
+    @EJB
+    private logFacade facade;
 
-	/**
-	 * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
-	 * methods.
-	 * 
-	 * @param request
-	 *            servlet request
-	 * @param response
-	 *            servlet response
-	 * @throws ServletException
-	 *             if a servlet-specific error occurs
-	 * @throws IOException
-	 *             if an I/O error occurs
-	 */
-	protected void processRequest(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException, IOException {
-		response.setContentType("text/html;charset=UTF-8");
-		PrintWriter out = response.getWriter();
-		try {
-			out.println("<html>");
-			out.println("<head>");
-			out.println("<title>Servlet showLog</title>");
-			out.println("</head>");
-			out.println("<body>");
-			out.println("<h1>Currently,there are " + facade.count()
-					+ " log records.</h1>");
-			List<Log> logList = facade.findAll();
-			out.println("<table border=1>");
-			out.println("<tr><th>Log ID</th><th>Event Time</th><th>Event</th></tr>");
-			for (Log log : logList) {
-				out.println("<tr><td>" + log.getId() + "</td><td>"
-						+ log.getCreateTime() + "</td><td>" + log.getEvent()
-						+ "</td></tr>");
-			}
-			out.println("</table>");
-			out.println("</body>");
-			out.println("</html>");
-
-		} finally {
-			out.close();
-		}
-	}
-
-	// <editor-fold defaultstate="collapsed"
-	// desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
-	/**
-	 * Handles the HTTP <code>GET</code> method.
-	 * 
-	 * @param request
-	 *            servlet request
-	 * @param response
-	 *            servlet response
-	 * @throws ServletException
-	 *             if a servlet-specific error occurs
-	 * @throws IOException
-	 *             if an I/O error occurs
-	 */
-	@Override
-	protected void doGet(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException, IOException {
-		processRequest(request, response);
-	}
-
-	/**
-	 * Handles the HTTP <code>POST</code> method.
-	 * 
-	 * @param request
-	 *            servlet request
-	 * @param response
-	 *            servlet response
-	 * @throws ServletException
-	 *             if a servlet-specific error occurs
-	 * @throws IOException
-	 *             if an I/O error occurs
-	 */
-	@Override
-	protected void doPost(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException, IOException {
-		processRequest(request, response);
-	}
-
-	/**
-	 * Returns a short description of the servlet.
-	 * 
-	 * @return a String containing servlet description
-	 */
-	@Override
-	public String getServletInfo() {
-		return "Short description";
-	}// </editor-fold>
+    /**
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
+     * methods.
+     * 
+     * @param request
+     *            servlet request
+     * @param response
+     *            servlet response
+     * @throws ServletException
+     *             if a servlet-specific error occurs
+     * @throws IOException
+     *             if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request,
+            HttpServletResponse response) throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        PrintWriter out = response.getWriter();
+        try {
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet showLog</title>");
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Currently,there are " + facade.count()
+                    + " log records.</h1>");
+            List<Log> logList = facade.findAll();
+            out.println("<table border=1>");
+            out.println("<tr><th>Log ID</th><th>Event Time</th><th>Event</th></tr>");
+            for (Log log : logList) {
+                out.println("<tr><td>" + log.getId() + "</td><td>"
+                        + log.getCreateTime() + "</td><td>" + log.getEvent()
+                        + "</td></tr>");
+            }
+            out.println("</table>");
+            out.println("</body>");
+            out.println("</html>");
+
+        } finally {
+            out.close();
+        }
+    }
+
+    // <editor-fold defaultstate="collapsed"
+    // desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /**
+     * Handles the HTTP <code>GET</code> method.
+     * 
+     * @param request
+     *            servlet request
+     * @param response
+     *            servlet response
+     * @throws ServletException
+     *             if a servlet-specific error occurs
+     * @throws IOException
+     *             if an I/O error occurs
+     */
+    @Override
+    protected void doGet(HttpServletRequest request,
+            HttpServletResponse response) throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    /**
+     * Handles the HTTP <code>POST</code> method.
+     * 
+     * @param request
+     *            servlet request
+     * @param response
+     *            servlet response
+     * @throws ServletException
+     *             if a servlet-specific error occurs
+     * @throws IOException
+     *             if an I/O error occurs
+     */
+    @Override
+    protected void doPost(HttpServletRequest request,
+            HttpServletResponse response) throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    /**
+     * Returns a short description of the servlet.
+     * 
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
 }

Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/sessionBean/logFacade.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/sessionBean/logFacade.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/sessionBean/logFacade.java (original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/sessionBean/logFacade.java Mon Mar  7 05:17:11 2011
@@ -26,20 +26,20 @@ import org.apache.geronimo.samples.javae
 @Stateless
 public class logFacade {
 
-	@PersistenceContext(unitName = "EJBTimerPU")
-	private EntityManager em;
+    @PersistenceContext(unitName = "EJBTimerPU")
+    private EntityManager em;
 
-	public List<Log> findAll() {
-		CriteriaQuery cq = em.getCriteriaBuilder().createQuery();
-		cq.select(cq.from(Log.class));
-		return em.createQuery(cq).getResultList();
-	}
+    public List<Log> findAll() {
+        CriteriaQuery cq = em.getCriteriaBuilder().createQuery();
+        cq.select(cq.from(Log.class));
+        return em.createQuery(cq).getResultList();
+    }
 
-	public int count() {
-		CriteriaQuery cq = em.getCriteriaBuilder().createQuery();
-		Root<Log> rt = cq.from(Log.class);
-		cq.select(em.getCriteriaBuilder().count(rt));
-		Query q = em.createQuery(cq);
-		return ((Long) q.getSingleResult()).intValue();
-	}
+    public int count() {
+        CriteriaQuery cq = em.getCriteriaBuilder().createQuery();
+        Root<Log> rt = cq.from(Log.class);
+        cq.select(em.getCriteriaBuilder().count(rt));
+        Query q = em.createQuery(cq);
+        return ((Long) q.getSingleResult()).intValue();
+    }
 }

Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/sessionBean/scheduleTask.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/sessionBean/scheduleTask.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/sessionBean/scheduleTask.java (original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/sessionBean/scheduleTask.java Mon Mar  7 05:17:11 2011
@@ -32,75 +32,75 @@ import org.apache.geronimo.samples.javae
 @Stateless
 public class scheduleTask {
 
-	@PersistenceContext(unitName = "EJBTimerPU")
-	private EntityManager em;
-	
-	@Schedule(minute = "*/3",hour = "*")
-	public void beginNew() {
-		clearLogs();
-		logIntoDB("Begin new logs in the next 3 minutes.");
-	}
-
-	@Schedule(second = "*/7", minute = "*", hour = "*")
-	public void test_automatic_timer() {
-		logIntoDB("Every 7 seconds,backup the system");
-	}
-
-	// wake you up everyMorning at 7:50 from Monday to Friday
-
-	@Schedule(minute = "50", hour = "7", dayOfWeek = "Mon,Tue,Wed,Thu,Fri")
-	public void wakeup() {
-		logIntoDB("wake you up@7:50");
-	}
-
-	@Schedule(minute = "*/2", hour = "*")
-	public void backup() {
-		logIntoDB("Send a mail every two minites");
-	}
-
-	@Schedule(second = "*/15", minute = "*", hour = "*")
-	public void attack() {
-		logIntoDB("Try to connect or attack a website every 15 seconds");
-	}
-
-	@Schedule(hour = "14", dayOfMonth = "last")
-	public void cleanup() {
-		logIntoDB("clean up all the dirty info in DB at 2:00pm of the end of month");
-	}
-
-	@Schedule(hour = "15/1", dayOfWeek = "Sat,Sun")
-	public void nofifyFifteen() {
-		logIntoDB("On Sat and Sunday,from 3:00 pm, you will get notified every hour ");
-	}
-
-	// Fool friends at each April 1st.
-
-	@Schedule(dayOfMonth = "1", month = "Apr")
-	public void foolFriends() {
-		logIntoDB("Today is fool's day.All your friends will get this information");
-	}
-
-	public void logIntoDB(String event) {
-		Date dt = new Date();
-		DateFormat df = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
-		String nowTime = df.format(dt);
-		Log log = new Log();
-		log.setCreateTime(nowTime);
-		log.setEvent(event);
-		System.out.println("event");
-		em.persist(log);
-	}
-	
-	public void clearLogs() {
-		Query query = em.createQuery("select l from Log l");
-		List result = query.getResultList();
-		Iterator<Log> iterator = result.iterator();
-		while (iterator.hasNext()) {
-			Log log = iterator.next();
-			em.remove(log);
-		}
-		em.flush();
-		logIntoDB("Logs of the last 3 minutes have been cleared.");
-	}
+    @PersistenceContext(unitName = "EJBTimerPU")
+    private EntityManager em;
+    
+    @Schedule(minute = "*/3",hour = "*")
+    public void beginNew() {
+        clearLogs();
+        logIntoDB("Begin new logs in the next 3 minutes.");
+    }
+
+    @Schedule(second = "*/7", minute = "*", hour = "*")
+    public void test_automatic_timer() {
+        logIntoDB("Every 7 seconds,backup the system");
+    }
+
+    // wake you up everyMorning at 7:50 from Monday to Friday
+
+    @Schedule(minute = "50", hour = "7", dayOfWeek = "Mon,Tue,Wed,Thu,Fri")
+    public void wakeup() {
+        logIntoDB("wake you up@7:50");
+    }
+
+    @Schedule(minute = "*/2", hour = "*")
+    public void backup() {
+        logIntoDB("Send a mail every two minites");
+    }
+
+    @Schedule(second = "*/15", minute = "*", hour = "*")
+    public void attack() {
+        logIntoDB("Try to connect or attack a website every 15 seconds");
+    }
+
+    @Schedule(hour = "14", dayOfMonth = "last")
+    public void cleanup() {
+        logIntoDB("clean up all the dirty info in DB at 2:00pm of the end of month");
+    }
+
+    @Schedule(hour = "15/1", dayOfWeek = "Sat,Sun")
+    public void nofifyFifteen() {
+        logIntoDB("On Sat and Sunday,from 3:00 pm, you will get notified every hour ");
+    }
+
+    // Fool friends at each April 1st.
+
+    @Schedule(dayOfMonth = "1", month = "Apr")
+    public void foolFriends() {
+        logIntoDB("Today is fool's day.All your friends will get this information");
+    }
+
+    public void logIntoDB(String event) {
+        Date dt = new Date();
+        DateFormat df = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+        String nowTime = df.format(dt);
+        Log log = new Log();
+        log.setCreateTime(nowTime);
+        log.setEvent(event);
+        System.out.println("event");
+        em.persist(log);
+    }
+    
+    public void clearLogs() {
+        Query query = em.createQuery("select l from Log l");
+        List result = query.getResultList();
+        Iterator<Log> iterator = result.iterator();
+        while (iterator.hasNext()) {
+            Log log = iterator.next();
+            em.remove(log);
+        }
+        em.flush();
+        logIntoDB("Logs of the last 3 minutes have been cleared.");
+    }
 
 }

Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml Mon Mar  7 05:17:11 2011
@@ -1,36 +1,36 @@
 
-	<!--
-		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.
-	-->
+    <!--
+        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">
+    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>ejbtimer-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>
+    <sys:environment>
+        <sys:moduleId>
+            <sys:groupId>org.apache.geronimo.samples</sys:groupId>
+            <sys:artifactId>ejbtimer-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>/ejbtimer-javaee6</context-root>
+    <context-root>/ejbtimer-javaee6</context-root>
 
 </web-app>

Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/WEB-INF/web.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/WEB-INF/web.xml Mon Mar  7 05:17:11 2011
@@ -1,32 +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
+    <!--
+        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.
-	-->
+        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$
-	-->
+    <!--
+        $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"
-	metadata-complete="false" id="cviewer-javaee6">
+    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"
+    metadata-complete="false" id="cviewer-javaee6">
 
-	<description>${pom.name}</description>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-	</welcome-file-list>
+    <description>${pom.name}</description>
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
 
 </web-app>

Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/header.html?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/header.html (original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/header.html Mon Mar  7 05:17:11 2011
@@ -18,11 +18,11 @@
 <html>
 <head>
 <link type="text/css" rel="stylesheet"
-	href="http://geronimo.apache.org/style/default.css">
+    href="http://geronimo.apache.org/style/default.css">
 <link rel="SHORTCUT ICON"
-	href="http://geronimo.apache.org/images/favicon.ico">
+    href="http://geronimo.apache.org/images/favicon.ico">
 <script src="http://geronimo.apache.org/functions.js"
-	type="text/javascript"></script>
+    type="text/javascript"></script>
 <title>Apache Geronimo Sample Applications</title>
 <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 </head>
@@ -30,35 +30,35 @@
 <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>
+    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>
+    <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>

Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/intro.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/intro.html?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/intro.html (original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/intro.html Mon Mar  7 05:17:11 2011
@@ -25,14 +25,14 @@
 you can schedule your tasks using linux-cron-like style</h2>
 <h3>In this case,we have predifined a few tasks for you.</h3>
 <ul>
-	<li>Every 7 seconds,backup the system</li>
-	<li>Wake you up@7:50 everyday</li>
-	<li>Send a mail every two minutes</li>
-	<li>Try to connect or attack a website every 15 seconds</li>
-	<li>Clean up all the dirty info in DB at 2:00pm of the end of
-	month</li>
-	<li>Get notified every hour on Sat and Sunday,from 3:00 pm</li>
-	<li>Fool your friends on each April fool's day</li>
+    <li>Every 7 seconds,backup the system</li>
+    <li>Wake you up@7:50 everyday</li>
+    <li>Send a mail every two minutes</li>
+    <li>Try to connect or attack a website every 15 seconds</li>
+    <li>Clean up all the dirty info in DB at 2:00pm of the end of
+    month</li>
+    <li>Get notified every hour on Sat and Sunday,from 3:00 pm</li>
+    <li>Fool your friends on each April fool's day</li>
 </ul>
 <a href="showLog">Check the log list</a>
 </body>

Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/pom.xml Mon Mar  7 05:17:11 2011
@@ -1,90 +1,90 @@
 <?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$
-	-->
+    <!--
+        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">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.apache.geronimo.samples</groupId>
-		<artifactId>javaee6</artifactId>
-		<version>3.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>ejbtimer-javaee6</artifactId>
-	<name>Geronimo Samples :: ejbtimer-javaee6</name>
-	<packaging>pom</packaging>
-	<version>3.0-SNAPSHOT</version>
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>javaee6</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>ejbtimer-javaee6</artifactId>
+    <name>Geronimo Samples :: ejbtimer-javaee6</name>
+    <packaging>pom</packaging>
+    <version>3.0-SNAPSHOT</version>
 
-	<description>
+    <description>
         Geronimo ejbtimer-javaee6 sample created from an archetype.
     </description>
 
 
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-site-plugin</artifactId>
-				<inherited>false</inherited>
-				<configuration>
-					<outputDirectory>${project.basedir}/docs</outputDirectory>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>default</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<modules>
-				<module>ejbtimer-javaee6-war</module>
-				<module>ejbtimer-javaee6-jetty</module>
-				<module>ejbtimer-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>ejbtimer-javaee6-war</module>
-			</modules>
-		</profile>
+    <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>ejbtimer-javaee6-war</module>
+                <module>ejbtimer-javaee6-jetty</module>
+                <module>ejbtimer-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>ejbtimer-javaee6-war</module>
+            </modules>
+        </profile>
         <profile>
-			<id>all-subprojects</id>
-			
-			<modules>
-				<module>ejbtimer-javaee6-war</module>
-				<module>ejbtimer-javaee6-jetty</module>
-				<module>ejbtimer-javaee6-tomcat</module>
-			</modules>
-		</profile>
-	</profiles>
+            <id>all-subprojects</id>
+            
+            <modules>
+                <module>ejbtimer-javaee6-war</module>
+                <module>ejbtimer-javaee6-jetty</module>
+                <module>ejbtimer-javaee6-tomcat</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/MessageFilter.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/MessageFilter.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/MessageFilter.java (original)
+++ geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/MessageFilter.java Mon Mar  7 05:17:11 2011
@@ -32,109 +32,109 @@ import javax.servlet.http.Part;
 @WebFilter(filterName = "MessageFilter", urlPatterns = { "/showServlet" })
 public class MessageFilter implements Filter {
 
-	private FilterConfig filterConfig;
+    private FilterConfig filterConfig;
 
-	public MessageFilter() {
-	}
+    public MessageFilter() {
+    }
 
-	public void doFilter(ServletRequest request, ServletResponse response,
-			FilterChain chain) throws IOException, ServletException {
+    public void doFilter(ServletRequest request, ServletResponse response,
+            FilterChain chain) throws IOException, ServletException {
 
-		String message = "";
-		HttpServletRequest httpServletRequest = null;
-		if (request instanceof HttpServletRequest) {
-			httpServletRequest = (HttpServletRequest) request;
-			message += "<p>" + "Http Servlet Request content type: "
-					+ httpServletRequest.getContentType() + "</p><br>";
-		}
-
-		Collection<Part> parts = httpServletRequest.getParts();
-		if (!parts.isEmpty()) {
-			int i = 0;
-			for (Part apart : parts) {
-				message += "<p>"+ (++i) + ". Name=" + apart.getName()
-						+ ";ContentType=" + apart.getContentType() + ";Size="
-						+ apart.getSize() + "</p><br>";
-			}
-		} else {
-			message += "<p><b>HttpServletRequest.getParts() returns an empty collection!</b></p><br>";
-		}		
-
-		Throwable problem = null;
-		try {
-			Part p = ((HttpServletRequest) request).getPart("testFile");
-			if (null != p) {
-				String part = p.toString();
-				String pname = p.getName();
-				long size = p.getSize();
-				String contentType = p.getContentType();
-				if (size > 10000) {
-					message += "The file size is "
-							+ size
-							+ "b, it's filterd because the file size is limited to 10 kb";
-				} else {
-					message += "<font color=green><b>Part:</b> </font>"
-							+ part
-							+ "<br><font color=green><b>Part Name:</b> </font>"
-							+ pname
-							+ "<br><font color=green><b>Size:</b> </font>"
-							+ size
-							+ "<br><font color=green><b>ContentType:</b> </font>"
-							+ contentType
-							+ "<br><font color=green><b>HeadNames:</b> </font>";
-					for (String name : p.getHeaderNames()) {
-						message += name + ";";
-					}
-					java.io.InputStreamReader in = new java.io.InputStreamReader(
-							p.getInputStream());
-					String content = "";
-					int c = in.read();
-					while (c != -1) {
-						if (c == '\n') {
-							content += "<br>";
-						}
-						content += (char) c;
-						c = in.read();
-					}
-					if (content.equals("")) {
-						message += "<br> Sorry, this is not a plain text, so we can not display it.";
-					} else {
-						message += "<br><font color=green><b>The text file content is:</b></font><br>"
-								+ content;
-						message += "<hr>";
-					}
-				}
-			} else {
-				message += "<p><b>HttpServletRequest.getPart(String name) returns null!</b></p><br>";
-			}
-			request.setAttribute("message", message);
-			chain.doFilter(request, response);
-		} catch (Throwable t) {
-			problem = t;
-			t.printStackTrace();
-		}
-
-	}
-
-	public void destroy() {
-	}
-
-	public void init(FilterConfig filterConfig) {
-		this.filterConfig = filterConfig;
-	}
-
-	@Override
-	public String toString() {
-		if (filterConfig == null) {
-			return ("MessageFilter()");
-		}
-		StringBuffer sb = new StringBuffer("MessageFilter()");
-		sb.append(filterConfig);
-		sb.append(")");
-		return (sb.toString());
-	}
-
-	public void log(String msg) {
-		filterConfig.getServletContext().log(msg);
-	}
+        String message = "";
+        HttpServletRequest httpServletRequest = null;
+        if (request instanceof HttpServletRequest) {
+            httpServletRequest = (HttpServletRequest) request;
+            message += "<p>" + "Http Servlet Request content type: "
+                    + httpServletRequest.getContentType() + "</p><br>";
+        }
+
+        Collection<Part> parts = httpServletRequest.getParts();
+        if (!parts.isEmpty()) {
+            int i = 0;
+            for (Part apart : parts) {
+                message += "<p>"+ (++i) + ". Name=" + apart.getName()
+                        + ";ContentType=" + apart.getContentType() + ";Size="
+                        + apart.getSize() + "</p><br>";
+            }
+        } else {
+            message += "<p><b>HttpServletRequest.getParts() returns an empty collection!</b></p><br>";
+        }        
+
+        Throwable problem = null;
+        try {
+            Part p = ((HttpServletRequest) request).getPart("testFile");
+            if (null != p) {
+                String part = p.toString();
+                String pname = p.getName();
+                long size = p.getSize();
+                String contentType = p.getContentType();
+                if (size > 10000) {
+                    message += "The file size is "
+                            + size
+                            + "b, it's filterd because the file size is limited to 10 kb";
+                } else {
+                    message += "<font color=green><b>Part:</b> </font>"
+                            + part
+                            + "<br><font color=green><b>Part Name:</b> </font>"
+                            + pname
+                            + "<br><font color=green><b>Size:</b> </font>"
+                            + size
+                            + "<br><font color=green><b>ContentType:</b> </font>"
+                            + contentType
+                            + "<br><font color=green><b>HeadNames:</b> </font>";
+                    for (String name : p.getHeaderNames()) {
+                        message += name + ";";
+                    }
+                    java.io.InputStreamReader in = new java.io.InputStreamReader(
+                            p.getInputStream());
+                    String content = "";
+                    int c = in.read();
+                    while (c != -1) {
+                        if (c == '\n') {
+                            content += "<br>";
+                        }
+                        content += (char) c;
+                        c = in.read();
+                    }
+                    if (content.equals("")) {
+                        message += "<br> Sorry, this is not a plain text, so we can not display it.";
+                    } else {
+                        message += "<br><font color=green><b>The text file content is:</b></font><br>"
+                                + content;
+                        message += "<hr>";
+                    }
+                }
+            } else {
+                message += "<p><b>HttpServletRequest.getPart(String name) returns null!</b></p><br>";
+            }
+            request.setAttribute("message", message);
+            chain.doFilter(request, response);
+        } catch (Throwable t) {
+            problem = t;
+            t.printStackTrace();
+        }
+
+    }
+
+    public void destroy() {
+    }
+
+    public void init(FilterConfig filterConfig) {
+        this.filterConfig = filterConfig;
+    }
+
+    @Override
+    public String toString() {
+        if (filterConfig == null) {
+            return ("MessageFilter()");
+        }
+        StringBuffer sb = new StringBuffer("MessageFilter()");
+        sb.append(filterConfig);
+        sb.append(")");
+        return (sb.toString());
+    }
+
+    public void log(String msg) {
+        filterConfig.getServletContext().log(msg);
+    }
 }

Modified: geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/showServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/showServlet.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/showServlet.java (original)
+++ geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/showServlet.java Mon Mar  7 05:17:11 2011
@@ -42,7 +42,7 @@ public class showServlet extends HttpSer
             out.println("<h3>Currently,there are " + "<font color=\"green\">" + getServletContext().getAttribute("onLineNumber") + "</font> people visiting this file upload system!<br/><hr></h3>");
             String message = request.getAttribute("message").toString();
             if (message.indexOf("returns null!") < 0) {
-            	out.println("<h2><font color=\"green\">Attributes and content of the file:</font></h2>");
+                out.println("<h2><font color=\"green\">Attributes and content of the file:</font></h2>");
             } 
             out.println(message + "<br/>");
             out.println("</body>");

Modified: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml Mon Mar  7 05:17:11 2011
@@ -68,12 +68,12 @@
                 </executions>
             </plugin>
             <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<archiveClasses>false</archiveClasses>                    
-				</configuration>
-			</plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <archiveClasses>false</archiveClasses>                    
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

Modified: 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=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml Mon Mar  7 05:17:11 2011
@@ -44,10 +44,10 @@
             <type>war</type>
         </dependency>
         <dependency>
-			<groupId>org.apache.myfaces.core</groupId>
-			<artifactId>myfaces-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Modified: 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=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml Mon Mar  7 05:17:11 2011
@@ -1,192 +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$
-	-->
+    <!--
+        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">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+    <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>
+    <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>

Modified: 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=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/ejb/MessageFacade.java (original)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/ejb/MessageFacade.java Mon Mar  7 05:17:11 2011
@@ -30,47 +30,47 @@ import javax.persistence.criteria.Criter
 
 @Stateless
 public class MessageFacade {
-	@PersistenceContext(unitName = "jpa20demo_PU")
-	private EntityManager em;
+    @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();
-	}
+    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();
+    }
 
 }



Mime
View raw message