geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r908311 - in /geronimo/samples/trunk/samples/DataCDInfo: DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/ DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/ DataCDInfo-JTA-war/
Date Wed, 10 Feb 2010 01:55:50 GMT
Author: delos
Date: Wed Feb 10 01:55:50 2010
New Revision: 908311

URL: http://svn.apache.org/viewvc?rev=908311&view=rev
Log:
Commit samples patch to trunk provided by Forrest

Modified:
    geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/DataCDBean.java
    geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java
    geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java
    geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml

Modified: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/DataCDBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/DataCDBean.java?rev=908311&r1=908310&r2=908311&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/DataCDBean.java
(original)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/DataCDBean.java
Wed Feb 10 01:55:50 2010
@@ -27,7 +27,6 @@
  * Demo how to code JPA entity bean, including various JPA annotations:
  * NamedQueries, Id, JoinColumn
  * 
- * @author forrestxm
  *
  */
 

Modified: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java?rev=908311&r1=908310&r2=908311&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java
(original)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java
Wed Feb 10 01:55:50 2010
@@ -26,7 +26,6 @@
 /**
  * Demo how to code JPA entity bean, including various JPA annotations.
  * 
- * @author forrestxm
  *
  */
 

Modified: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java?rev=908311&r1=908310&r2=908311&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java
(original)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java
Wed Feb 10 01:55:50 2010
@@ -44,7 +44,6 @@
 import org.apache.geronimo.samples.datacdinfo.exceptions.InvalidPasswordException;
 
 /**
- * @author forrestxm
  * 
  * Demo how to use container-managed transaction-scoped persistence context with JTA transaction.
  * 

Modified: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml?rev=908311&r1=908310&r2=908311&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml Wed Feb 10 01:55:50
2010
@@ -33,151 +33,281 @@
 
 	<dependencies>
 		
-		<dependency> 
-			<groupId>org.apache.geronimo.samples</groupId>
-			<artifactId>DataCDInfo-JTA-ejb</artifactId> 
-			<version>${geronimoVersion}</version>
-			<scope>provided</scope> 
-		</dependency>
-		
-		<dependency>
-			<groupId>antlr</groupId>
-			<artifactId>antlr</artifactId>
-			<version>2.7.2</version>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-beanutils</groupId>
-			<artifactId>commons-beanutils</artifactId>
-			<version>1.8.0</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-chain</groupId>
-			<artifactId>commons-chain</artifactId>
-			<version>1.2</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-digester</groupId>
-			<artifactId>commons-digester</artifactId>
-			<version>1.8</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.0.4</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-validator</groupId>
-			<artifactId>commons-validator</artifactId>
-			<version>1.3.1</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
-			<version>1.0.2</version>
-		</dependency>
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.10</version>
-		</dependency>
-		<dependency>
-			<groupId>oro</groupId>
-			<artifactId>oro</artifactId>
-			<version>2.0.8</version>
-		</dependency>
-		<dependency>
-			<groupId>taglibs</groupId>
-			<artifactId>standard</artifactId>
-			<version>1.0.6</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.struts</groupId>
-			<artifactId>struts-core</artifactId>
-			<version>1.3.10</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.struts</groupId>
-			<artifactId>struts-el</artifactId>
-			<version>1.3.10</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.struts</groupId>
-			<artifactId>struts-extras</artifactId>
-			<version>1.3.10</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.struts</groupId>
-			<artifactId>struts-faces</artifactId>
-			<version>1.3.10</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.struts</groupId>
-			<artifactId>struts-mailreader-dao</artifactId>
-			<version>1.3.10</version>
-		</dependency>
-		<!--		<dependency>-->
-		<!--			<groupId>org.apache.struts</groupId>-->
-		<!--			<artifactId>struts-scripting</artifactId>-->
-		<!--			<version>1.3.10</version>-->
-		<!--		</dependency>-->
-		<dependency>
-			<groupId>org.apache.struts</groupId>
-			<artifactId>struts-taglib</artifactId>
-			<version>1.3.10</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.struts</groupId>
-			<artifactId>struts-tiles</artifactId>
-			<version>1.3.10</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.velocity</groupId>
-			<artifactId>velocity-tools</artifactId>
-			<version>1.3</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-servlet_2.5_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jsp_2.1_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-annotation_1.0_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-ejb_3.0_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jpa_1.0_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jta_1.1_spec</artifactId>
-			<scope>provided</scope>
+		<dependency>
+			<groupId>antlr</groupId>
+			<artifactId>antlr</artifactId>
+			<version>2.7.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.6</version> 
+		</dependency>
+		<dependency>
+			<groupId>commons-chain</groupId>
+			<artifactId>commons-chain</artifactId>
+			<version>1.1</version>
+			<exclusions>
+                    	    <exclusion>
+                        	<groupId>myfaces</groupId>
+				<artifactId>myfaces-api</artifactId>
+                    	    </exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>commons-digester</groupId>
+			<artifactId>commons-digester</artifactId>
+			<version>1.8</version> 
+		</dependency>
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.2.1</version>			
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>1.4</version>			
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.0.4</version>			
+		</dependency>
+		<dependency>
+			<groupId>commons-validator</groupId>
+			<artifactId>commons-validator</artifactId>
+			<version>1.3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+			<scope>provided</scope>	
+		</dependency>		
+		<dependency>
+			<groupId>oro</groupId>
+			<artifactId>oro</artifactId>
+			<version>2.0.8</version>
+		</dependency>		
+		<dependency>
+			<groupId>org.apache.struts</groupId>
+			<artifactId>struts-core</artifactId>
+			<version>1.3.8</version>
+			<exclusions>
+                    	    <exclusion>
+                        	<groupId>myfaces</groupId>
+				<artifactId>myfaces-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>portlet-api</groupId>
+				<artifactId>portlet-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>javax.servlet</groupId>
+				<artifactId>servlet-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>taglibs</groupId>
+				<artifactId>standard</artifactId>
+                    	    </exclusion>
+			    <exclusion>
+                        	<groupId>javax.servlet</groupId>
+				<artifactId>jstl</artifactId>
+                    	    </exclusion>
+                	</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.struts</groupId>
+			<artifactId>struts-el</artifactId>
+			<version>1.3.8</version>
+			<exclusions>
+                    	    <exclusion>
+                        	<groupId>myfaces</groupId>
+				<artifactId>myfaces-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>portlet-api</groupId>
+				<artifactId>portlet-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>javax.servlet</groupId>
+				<artifactId>servlet-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>taglibs</groupId>
+				<artifactId>standard</artifactId>
+                    	    </exclusion>
+			    <exclusion>
+                        	<groupId>javax.servlet</groupId>
+				<artifactId>jstl</artifactId>
+                    	    </exclusion>
+                	</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.struts</groupId>
+			<artifactId>struts-extras</artifactId>
+			<version>1.3.8</version>
+			<exclusions>
+                    	    <exclusion>
+                        	<groupId>myfaces</groupId>
+				<artifactId>myfaces-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>portlet-api</groupId>
+				<artifactId>portlet-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>javax.servlet</groupId>
+				<artifactId>servlet-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>taglibs</groupId>
+				<artifactId>standard</artifactId>
+                    	    </exclusion>
+			    <exclusion>
+                        	<groupId>javax.servlet</groupId>
+				<artifactId>jstl</artifactId>
+                    	    </exclusion>
+                	</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.struts</groupId>
+			<artifactId>struts-faces</artifactId>
+			<version>1.3.8</version>
+			<exclusions>
+                    	    <exclusion>
+                        	<groupId>myfaces</groupId>
+				<artifactId>myfaces-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>portlet-api</groupId>
+				<artifactId>portlet-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>javax.servlet</groupId>
+				<artifactId>servlet-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>taglibs</groupId>
+				<artifactId>standard</artifactId>
+                    	    </exclusion>
+			    <exclusion>
+                        	<groupId>javax.servlet</groupId>
+				<artifactId>jstl</artifactId>
+                    	    </exclusion>
+                	</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.struts</groupId>
+			<artifactId>struts-mailreader-dao</artifactId>
+			<version>1.3.8</version>
+			<exclusions>
+                    	    <exclusion>
+                        	<groupId>myfaces</groupId>
+				<artifactId>myfaces-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>portlet-api</groupId>
+				<artifactId>portlet-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>javax.servlet</groupId>
+				<artifactId>servlet-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>taglibs</groupId>
+				<artifactId>standard</artifactId>
+                    	    </exclusion>
+			    <exclusion>
+                        	<groupId>javax.servlet</groupId>
+				<artifactId>jstl</artifactId>
+                    	    </exclusion>
+                	</exclusions>
+		</dependency>
+		<!--		<dependency>-->
+		<!--			<groupId>org.apache.struts</groupId>-->
+		<!--			<artifactId>struts-scripting</artifactId>-->
+		<!--			<version>1.3.10</version>-->
+		<!--		</dependency>-->
+		<dependency>
+			<groupId>org.apache.struts</groupId>
+			<artifactId>struts-taglib</artifactId>
+			<version>1.3.8</version>
+			<exclusions>
+                    	    <exclusion>
+                        	<groupId>myfaces</groupId>
+				<artifactId>myfaces-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>portlet-api</groupId>
+				<artifactId>portlet-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>javax.servlet</groupId>
+				<artifactId>servlet-api</artifactId>
+                    	    </exclusion>
+                    	    <exclusion>
+                        	<groupId>taglibs</groupId>
+				<artifactId>standard</artifactId>
+                    	    </exclusion>
+			    <exclusion>
+                        	<groupId>javax.servlet</groupId>
+				<artifactId>jstl</artifactId>
+                    	    </exclusion>
+                	</exclusions>
+		</dependency>
+		<!--<dependency>
+			<groupId>org.apache.struts</groupId>
+			<artifactId>struts-tiles</artifactId>
+			<version>1.3.8</version>
+		</dependency>-->
+		<!--<dependency>
+			<groupId>org.apache.velocity</groupId>
+			<artifactId>velocity-tools</artifactId>
+			<version>1.3</version>
+		</dependency>-->
+		<dependency>
+	                <groupId>org.apache.myfaces.core</groupId>
+        	        <artifactId>myfaces-api</artifactId>
+			<scope>provided</scope>		
+		</dependency>
+		<dependency>
+            		<groupId>javax.portlet</groupId>
+            		<artifactId>portlet-api</artifactId>
+            		<scope>provided</scope>
+        	</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-servlet_2.5_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jsp_2.1_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-annotation_1.0_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-ejb_3.0_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jpa_1.0_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jta_1.1_spec</artifactId>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 
@@ -218,9 +348,9 @@
 							<targetPath>WEB-INF/classes</targetPath>
 							<!-- enable filtering -->
 							<filtering>true</filtering>
-							<!--
-								<excludes> <exclude>**/properties</exclude> </excludes>
-							-->
+							<excludes> 
+							    <exclude>*.template</exclude>
+							</excludes>
 						</resource>
 						<resource>
 							<directory>${project.build.outputDirectory}</directory>



Mime
View raw message