geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r908309 - in /geronimo/samples/branches/2.2/samples/DataCDInfo: DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/ DataCDInfo-JTA-jetty/ DataCDInfo-JTA-tomcat/ DataCDInfo-JTA-war/
Date Wed, 10 Feb 2010 01:55:08 GMT
Author: delos
Date: Wed Feb 10 01:55:07 2010
New Revision: 908309

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

Modified:
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/DataCDBean.java
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml

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

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

Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml?rev=908309&r1=908308&r2=908309&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml Wed Feb
10 01:55:07 2010
@@ -123,13 +123,13 @@
                     <category>Sample</category>
                 </configuration>
             </plugin>
-	  <plugin>            
+	  <!--<plugin>            
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-deploy-plugin</artifactId>
             <configuration>
               <skip>true</skip>
             </configuration>
-          </plugin>
+          </plugin>-->
         </plugins>
     </build>
 

Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml?rev=908309&r1=908308&r2=908309&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml Wed Feb
10 01:55:07 2010
@@ -122,13 +122,13 @@
                     <category>Sample</category>
                 </configuration>
             </plugin>
-	  <plugin>            
+	  <!--<plugin>            
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-deploy-plugin</artifactId>
             <configuration>
               <skip>true</skip>
             </configuration>
-          </plugin>
+          </plugin>-->
         </plugins>
     </build>
     

Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml?rev=908309&r1=908308&r2=908309&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml Wed Feb 10
01:55:07 2010
@@ -48,32 +48,38 @@
 		<dependency>
 			<groupId>commons-beanutils</groupId>
 			<artifactId>commons-beanutils</artifactId>
-			<version>1.8.0</version>
+			<version>1.6</version> 
 		</dependency>
 		<dependency>
 			<groupId>commons-chain</groupId>
 			<artifactId>commons-chain</artifactId>
-			<version>1.2</version>
+			<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>
+			<version>1.8</version> 
 		</dependency>
 		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
-			<version>1.1.1</version>
+			<version>1.2.1</version>			
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>1.1</version>
+			<version>1.4</version>			
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-			<version>1.0.4</version>
+			<version>1.0.4</version>			
 		</dependency>
 		<dependency>
 			<groupId>commons-validator</groupId>
@@ -83,42 +89,147 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>jstl</artifactId>
-			<version>1.0.2</version>
+			<scope>provided</scope>	
 		</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>		
 		<dependency>
 			<groupId>org.apache.struts</groupId>
 			<artifactId>struts-core</artifactId>
-			<version>1.3.10</version>
+			<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.10</version>
+			<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.10</version>
+			<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.10</version>
+			<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.10</version>
+			<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>-->
@@ -128,19 +239,50 @@
 		<dependency>
 			<groupId>org.apache.struts</groupId>
 			<artifactId>struts-taglib</artifactId>
-			<version>1.3.10</version>
+			<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>
+		<!--<dependency>
 			<groupId>org.apache.struts</groupId>
 			<artifactId>struts-tiles</artifactId>
-			<version>1.3.10</version>
-		</dependency>
-		<dependency>
+			<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>
@@ -211,9 +353,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