geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1038022 - in /geronimo/samples/branches/2.1/samples: DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/ DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/ DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/ DataCDInfo/DataCDI...
Date Tue, 23 Nov 2010 09:20:36 GMT
Author: xiaming
Date: Tue Nov 23 09:20:36 2010
New Revision: 1038022

URL: http://svn.apache.org/viewvc?rev=1038022&view=rev
Log:
GERONIMO-5710 fix jms-mdb plugin issue and update datacdinfo sample

Modified:
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_derby.sql
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/pom.xml
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-tomcat/pom.xml

Modified: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_derby.sql
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_derby.sql?rev=1038022&r1=1038021&r2=1038022&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_derby.sql
(original)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_derby.sql
Tue Nov 23 09:20:36 2010
@@ -24,8 +24,6 @@ CREATE TABLE OWNER_TABLE (
 		PASSWORD VARCHAR(20) NOT NULL
 	);
 
-CREATE UNIQUE INDEX SQL090923232106080 ON OWNER_TABLE (null);
-
 ALTER TABLE OWNER_TABLE ADD CONSTRAINT SQL090923232106080 PRIMARY KEY (USERNAME);
 
 CREATE TABLE DATACD_TABLE (
@@ -37,10 +35,6 @@ CREATE TABLE DATACD_TABLE (
 		OWNER_USERNAME VARCHAR(255)
 	);
 
-CREATE INDEX I_DTCDTBL_OWNER ON DATACD_TABLE (null);
-
-CREATE UNIQUE INDEX SQL090923232105870 ON DATACD_TABLE (null);
-
 ALTER TABLE DATACD_TABLE ADD CONSTRAINT SQL090923232105870 PRIMARY KEY (CDID);
 
 CREATE TABLE OPENJPASEQ (
@@ -48,6 +42,4 @@ CREATE TABLE OPENJPASEQ (
 		SEQUENCE_VALUE BIGINT
 	);
 
-CREATE UNIQUE INDEX SQL090923232106010 ON OPENJPASEQ (null);
-
 ALTER TABLE OPENJPASEQ ADD CONSTRAINT SQL090923232106010 PRIMARY KEY (ID);

Modified: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml?rev=1038022&r1=1038021&r2=1038022&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
(original)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
Tue Nov 23 09:20:36 2010
@@ -68,8 +68,8 @@
 						<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
 						<connectiondefinition-instance>
 							<name>jdbc/DataCDInfoDS</name>
-							<config-property-setting name="UserName"></config-property-setting>
-                            <config-property-setting name="Password"></config-property-setting>
+							<config-property-setting name="UserName">app</config-property-setting>
+                            <config-property-setting name="Password">app</config-property-setting>
                             <config-property-setting name="DatabaseName">cdinfodb</config-property-setting>
                             <config-property-setting name="CreateDatabase">true</config-property-setting>
 							<connectionmanager>
@@ -90,8 +90,8 @@
 						generation. -->
 						<connectiondefinition-instance>
                             <name>jdbc/NoTxDataCDInfoDS</name>
-                            <config-property-setting name="UserName"></config-property-setting>
-                            <config-property-setting name="Password"></config-property-setting>
+                            <config-property-setting name="UserName">app</config-property-setting>
+                            <config-property-setting name="Password">app</config-property-setting>
                             <config-property-setting name="DatabaseName">cdinfodb</config-property-setting>
                             <config-property-setting name="CreateDatabase">true</config-property-setting>
                             <connectionmanager>

Modified: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml?rev=1038022&r1=1038021&r2=1038022&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml
(original)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml
Tue Nov 23 09:20:36 2010
@@ -24,16 +24,15 @@
     <class>org.apache.geronimo.samples.datacdinfo.beans.DataCDBean</class>
     <exclude-unlisted-classes>true</exclude-unlisted-classes>
     <properties>      
-      <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=1)"/>
      
-<!--      <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>-->
-<!--      <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"/>-->
-<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO, Runtime=TRACE, SQL=TRACE"/>
-    <!--As an alternative, you can use these properties if comment out non-jta-data-source
setting above. -->
-    <!--<property name="openjpa.Connection2UserName" value="cdadmin"/>
-    <property name="openjpa.Connection2Password" value="passme"/>
-    <property name="openjpa.Connection2URL" value="jdbc:oracle:thin:@oracledbserver:1521:orcl2"/>
-    <property name="openjpa.Connection2DriverName" value="oracle.jdbc.driver.OracleDriver"/>-->
-
+      	<property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=1)"/>
      
+		<!--<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>-->
+		<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"/>
+		<!--<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO, Runtime=INFO,
SQL=TRACE"/>-->
+    	<!--As an alternative, you can use these properties if comment out non-jta-data-source
setting above. -->
+    	<!--<property name="openjpa.Connection2UserName" value="cdadmin"/>
+    	<property name="openjpa.Connection2Password" value="passme"/>
+    	<property name="openjpa.Connection2URL" value="jdbc:oracle:thin:@oracledbserver:1521:orcl2"/>
+    	<property name="openjpa.Connection2DriverName" value="oracle.jdbc.driver.OracleDriver"/>-->
     </properties>
   </persistence-unit>
 </persistence>

Modified: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml?rev=1038022&r1=1038021&r2=1038022&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml Tue Nov 23
09:20:36 2010
@@ -55,10 +55,10 @@
 			<artifactId>commons-chain</artifactId>
 			<version>1.1</version>
 			<exclusions>
-                    	    <exclusion>
-                        	<groupId>myfaces</groupId>
-				<artifactId>myfaces-api</artifactId>
-                    	    </exclusion>
+            	<exclusion>
+                   	<groupId>myfaces</groupId>
+					<artifactId>myfaces-api</artifactId>
+                </exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>

Modified: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java?rev=1038022&r1=1038021&r2=1038022&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java
(original)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java
Tue Nov 23 09:20:36 2010
@@ -44,7 +44,7 @@ public class DataCDInfoContextListener i
 		
 		if (logic instanceof DataCDInfoRemote) {
 			ctx.setAttribute("logic", logic);
-			System.out.println(">>>>>>>>>>>>>>>>>>>>>
Injected ejb DataCDInfoJTAImpl!");
+			//System.out.println(">>>>>>>>>>>>>>>>>>>>>
Injected ejb DataCDInfoJTAImpl!");
 		} else {
 			System.out.println(">>>>>>>>>>>>>>>>>>>>>
Cannot inject ejb DataCDInfoJTAImpl!");
 		}

Modified: geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/pom.xml?rev=1038022&r1=1038021&r2=1038022&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/pom.xml Tue Nov 23 09:20:36
2010
@@ -37,10 +37,10 @@
     <description>Geronimo Samples. EJB Module</description>
 
     <dependencies>
-        <!--<dependency>
+        <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
-        </dependency>-->
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-jetty/pom.xml?rev=1038022&r1=1038021&r2=1038022&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-jetty/pom.xml Tue Nov 23 09:20:36
2010
@@ -96,6 +96,10 @@
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
+        <dependency>
+        	<groupId>backport-util-concurrent</groupId>
+        	<artifactId>backport-util-concurrent</artifactId>        	
+      	</dependency>
     </dependencies>
 
     <build>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-tomcat/pom.xml?rev=1038022&r1=1038021&r2=1038022&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-tomcat/pom.xml Tue Nov 23 09:20:36
2010
@@ -96,6 +96,11 @@
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
+        
+        <dependency>
+        	<groupId>backport-util-concurrent</groupId>
+        	<artifactId>backport-util-concurrent</artifactId>        	
+      	</dependency>
     </dependencies>
 
     <build>



Mime
View raw message