geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From viol...@apache.org
Subject svn commit: r1078686 [6/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/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=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/entity/Message.java
(original)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/entity/Message.java
Mon Mar  7 05:17:11 2011
@@ -25,53 +25,53 @@ 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 + "]";
-	}
+    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 + "]";
+    }
 
 }

Modified: 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=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/managedbean/MessageView.java
(original)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/managedbean/MessageView.java
Mon Mar  7 05:17:11 2011
@@ -30,97 +30,97 @@ import javax.servlet.http.HttpServletReq
 @RequestScoped
 public class MessageView {
 
-	@EJB
-	private MessageFacade messageFacade;
-	private Message message;
-	private int[] range;
-	private List<Message> rangeList;
-	private int start;
-	private int end;
+    @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) {
+    public void setEnd(int end) {
         if (end >= 0 && end >= this.start)
-		    this.end = end;
+            this.end = end;
         else
             this.end = this.start;
-		range[1] = this.end;
-	}
+        range[1] = this.end;
+    }
 
-	public void setStart(int start) {
+    public void setStart(int start) {
         if (start >= 0)
-    		this.start = start;
+            this.start = start;
         else
             this.start = 0;
-		range[0] = this.start;
-	}
+        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();
-	}
+    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();
+    }
 }

Modified: geronimo/samples/trunk/samples/javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/pom.xml Mon Mar  7 05:17:11 2011
@@ -136,7 +136,7 @@
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            <modules>				
+            <modules>                
                 <!--Servlet 3.0 and JSF samples-->
                 <module>cviewer-javaee6</module>
                 <module>converter-javaee6</module>

Modified: geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/pom.xml Mon Mar  7 05:17:11
2011
@@ -54,8 +54,8 @@
             </plugin>
         </plugins>
     </build>
-	
-	<profiles>
+    
+    <profiles>
         <profile>
             <id>default</id>
             <activation>

Modified: geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/pom.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/pom.xml
Mon Mar  7 05:17:11 2011
@@ -38,12 +38,12 @@
 
     <dependencies>
 
-		<dependency>
+        <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>cviewer-javaee6-war</artifactId>
             <version>${version}</version>
             <type>war</type>
-        </dependency>	
+        </dependency>    
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>${jetty}-deployer</artifactId>

Modified: geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/pom.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/pom.xml
Mon Mar  7 05:17:11 2011
@@ -43,7 +43,7 @@
             <version>${version}</version>
             <type>war</type>
         </dependency>
-		
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat-deployer</artifactId>

Modified: geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml
Mon Mar  7 05:17:11 2011
@@ -38,21 +38,21 @@
 
     <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>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
-			<groupId>org.apache.servicemix.specs</groupId>
-			<artifactId>org.apache.servicemix.specs.jsr311-api-1.1</artifactId>
-			<version>1.5.0</version>
-			<scope>provided</scope>
-		</dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.jsr311-api-1.1</artifactId>
+            <version>1.5.0</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -78,121 +78,121 @@
                     </execution>
                 </executions>
             </plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<archiveClasses>false</archiveClasses>                    
-				</configuration>
-			</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>
+    <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/singletonejb-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/pom.xml Mon Mar  7 05:17:11
2011
@@ -54,17 +54,17 @@
             </plugin>
         </plugins>
     </build>
-	
-	   <profiles>
+    
+       <profiles>
         <profile>
             <id>default</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-			     <module>singletonejb-javaee6-war</module>
-				<module>singletonejb-javaee6-jetty</module>
-				<module>singletonejb-javaee6-tomcat</module>
+                 <module>singletonejb-javaee6-war</module>
+                <module>singletonejb-javaee6-jetty</module>
+                <module>singletonejb-javaee6-tomcat</module>
             </modules>
         </profile>
         <profile>
@@ -84,9 +84,9 @@
             <id>all-subprojects</id>
             
             <modules>
-			     <module>singletonejb-javaee6-war</module>
-				<module>singletonejb-javaee6-jetty</module>
-				<module>singletonejb-javaee6-tomcat</module>
+                 <module>singletonejb-javaee6-war</module>
+                <module>singletonejb-javaee6-jetty</module>
+                <module>singletonejb-javaee6-tomcat</module>
             </modules>
         </profile>
     </profiles> 

Modified: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml
Mon Mar  7 05:17:11 2011
@@ -37,20 +37,19 @@
     <description>Geronimo Samples. WEB Module</description>
 
     <dependencies>
-	
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-ejb_3.1_spec</artifactId>
-			<version>1.0</version>
-		</dependency>
-		
-		<dependency>
-		    <groupId>org.apache.myfaces.core</groupId>
-			<artifactId>myfaces-api</artifactId>
-			<version>2.0.0</version>
-		</dependency>
-		
-	</dependencies>
+    
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
+            <version>1.0</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-api</artifactId>           
+        </dependency>
+        
+    </dependencies>
     
     <build>
         <plugins>

Modified: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/SubtractCal.xhtml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/SubtractCal.xhtml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/SubtractCal.xhtml
(original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/SubtractCal.xhtml
Mon Mar  7 05:17:11 2011
@@ -33,5 +33,5 @@
             <h:commandLink value="Go to Add Calculator" action="#{SubtractSingletonCalculatorBackBean.goToAdd}"/>
         </h:form>
     </h:body>
-	
+    
 </html>

Modified: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.html?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.html
(original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.html
Mon Mar  7 05:17:11 2011
@@ -22,7 +22,7 @@
 </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="./header.html" name="headerFrame" title="Header" frameborder="0" marginheight="0"
marginwidth="0" noresize scrolling="no">
     <FRAME src="./faces/index.xhtml" name="sampleDocumentFrame" title="Sample Document
Description" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="yes">
 </FRAMESET>
   

Modified: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.xhtml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.xhtml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.xhtml
(original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.xhtml
Mon Mar  7 05:17:11 2011
@@ -21,19 +21,19 @@
     <h:head>
         <title>Facelet Title</title>
     </h:head>
-	
-		<h:body>
-			<h:form>
-				<h:outputText value="Add Calculator" />
-				<hr/>
-				<h:inputText value="#{AddCalculatorBackBean.currentInput}"/>
-				<h:commandButton action="#{AddCalculatorBackBean.add}" value="Add"/>
-				<br/>
-				<h:outputText escape="false" value="#{AddCalculatorBackBean.output}"/>
-				<h:commandLink value="Go to Subtract Calculator" action="#{AddCalculatorBackBean.goToSubtract}"/>
-			</h:form>
-		</h:body>
-	
-	
+    
+        <h:body>
+            <h:form>
+                <h:outputText value="Add Calculator" />
+                <hr/>
+                <h:inputText value="#{AddCalculatorBackBean.currentInput}"/>
+                <h:commandButton action="#{AddCalculatorBackBean.add}" value="Add"/>
+                <br/>
+                <h:outputText escape="false" value="#{AddCalculatorBackBean.output}"/>
+                <h:commandLink value="Go to Subtract Calculator" action="#{AddCalculatorBackBean.goToSubtract}"/>
+            </h:form>
+        </h:body>
+    
+    
 </html>
 

Modified: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/sample-docu.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/sample-docu.jsp?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/sample-docu.jsp
(original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/sample-docu.jsp
Mon Mar  7 05:17:11 2011
@@ -28,6 +28,6 @@
      Your sample documentation goes here.
 
   </FONT>
-		
+        
 <BODY>
 </html>

Modified: geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/pom.xml Mon Mar  7 05:17:11
2011
@@ -53,10 +53,10 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
              <modules>
-		        <module>fragment1</module>
+                <module>fragment1</module>
                 <module>fragment2</module>
                 <module>fragment3</module>
-                <module>webfragment-javaee6-war</module>	            
+                <module>webfragment-javaee6-war</module>                
                 <!-- Plugin cannot be made caused by GERONIMO-5398 -->
                 <!-- <module>webfragment-javaee6-tomcat</module>       
                 <module>webfragment-javaee6-jetty</module>-->
@@ -72,7 +72,7 @@
                 </property>        
             </activation>
             <modules>
-		        <module>fragment1</module>
+                <module>fragment1</module>
                 <module>fragment2</module>
                 <module>fragment3</module>
                 <module>webfragment-javaee6-war</module>                
@@ -82,7 +82,7 @@
             <id>all-subprojects</id>
  
              <modules>
-		        <module>fragment1</module>
+                <module>fragment1</module>
                 <module>fragment2</module>
                 <module>fragment3</module>
                 <module>webfragment-javaee6-war</module>                

Modified: geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-api/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-api/pom.xml (original)
+++ geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-api/pom.xml Mon Mar
 7 05:17:11 2011
@@ -34,16 +34,16 @@
   <packaging>bundle</packaging>
   
   <build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>  
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>  
 </project>

Modified: geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-server/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-server/pom.xml (original)
+++ geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-server/pom.xml Mon Mar
 7 05:17:11 2011
@@ -41,16 +41,16 @@
     </dependencies>
   
   <build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-server/src/main/java/org/apache/geronimo/samples/osgi/showmethemoney/server/ShowMoney.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-server/src/main/java/org/apache/geronimo/samples/osgi/showmethemoney/server/ShowMoney.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-server/src/main/java/org/apache/geronimo/samples/osgi/showmethemoney/server/ShowMoney.java
(original)
+++ geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-server/src/main/java/org/apache/geronimo/samples/osgi/showmethemoney/server/ShowMoney.java
Mon Mar  7 05:17:11 2011
@@ -21,32 +21,32 @@ import org.apache.geronimo.samples.osgi.
 public class ShowMoney implements ShowMoneyService{
     public String showmoney() {
         return "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "                    $$$                            \n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
-        	   "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n";
+               "                    $$$                            \n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n" +
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n";
     }
     
     public String startup() {

Modified: geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-web/src/main/java/org/apache/geronimo/samples/osgi/showmethemoney/web/ShowMoneyServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-web/src/main/java/org/apache/geronimo/samples/osgi/showmethemoney/web/ShowMoneyServlet.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-web/src/main/java/org/apache/geronimo/samples/osgi/showmethemoney/web/ShowMoneyServlet.java
(original)
+++ geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-web/src/main/java/org/apache/geronimo/samples/osgi/showmethemoney/web/ShowMoneyServlet.java
Mon Mar  7 05:17:11 2011
@@ -88,7 +88,7 @@ stmt = conn.prepareStatement("select * f
 ResultSet rs = stmt.executeQuery();
 
 while (rs.next()){
-	pw.println(rs.getString("name"));
+    pw.println(rs.getString("name"));
 } */
 
 } catch (SQLException e) {

Modified: geronimo/samples/trunk/samples/osgi/showmethemoney/sql/MoneyDB.sql
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/showmethemoney/sql/MoneyDB.sql?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/osgi/showmethemoney/sql/MoneyDB.sql (original)
+++ geronimo/samples/trunk/samples/osgi/showmethemoney/sql/MoneyDB.sql Mon Mar  7 05:17:11
2011
@@ -12,7 +12,7 @@
 --  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.
-CREATE TABLE Customer(	customerId VARCHAR(255) PRIMARY KEY,name VARCHAR(255));
+CREATE TABLE Customer(    customerId VARCHAR(255) PRIMARY KEY,name VARCHAR(255));
 
 
 INSERT INTO Customer(customerId, name) VALUES('12345','John Doe');



Mime
View raw message