geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1357049 - in /geronimo/samples/branches/3.0: ./ samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/ samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/ samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/src/main/plan...
Date Wed, 04 Jul 2012 03:08:08 GMT
Author: xiaming
Date: Wed Jul  4 03:08:06 2012
New Revision: 1357049

URL: http://svn.apache.org/viewvc?rev=1357049&view=rev
Log:
Fix some samples

Added:
    geronimo/samples/branches/3.0/README.txt
Modified:
    geronimo/samples/branches/3.0/pom.xml
    geronimo/samples/branches/3.0/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/branches/3.0/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml
    geronimo/samples/branches/3.0/samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/3.0/samples/javaee5/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/3.0/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml
    geronimo/samples/branches/3.0/samples/sample-datasource/pom.xml

Added: geronimo/samples/branches/3.0/README.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0/README.txt?rev=1357049&view=auto
==============================================================================
--- geronimo/samples/branches/3.0/README.txt (added)
+++ geronimo/samples/branches/3.0/README.txt Wed Jul  4 03:08:06 2012
@@ -0,0 +1,37 @@
+# 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.
+
+-----------
+Description
+-----------
+Geronimo samples demonstrate Java EE technologies and OSGi technologies that Geronimo server
supports.
+
+-------
+Install
+-------
+1. Build from the source code root
+    mvn clean install
+2. Start geronimo server
+3. Deploy a sample
+    bin/deploy --user system --password manager <SAMPLES_HOME>/samples/**/*.[war|ear]
<SAMPLES_HOME>/samples/**/*-tomcat/target/work/plan.xml
+
+---
+Run
+---
+ Open a browser to input URL: http://localhost:8080/<webcontext>
+
+

Modified: geronimo/samples/branches/3.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0/pom.xml?rev=1357049&r1=1357048&r2=1357049&view=diff
==============================================================================
--- geronimo/samples/branches/3.0/pom.xml (original)
+++ geronimo/samples/branches/3.0/pom.xml Wed Jul  4 03:08:06 2012
@@ -169,6 +169,15 @@
                 <scope>import</scope>
             </dependency>
             
+            <!-- Import System-database dependency versions -->
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>system-database</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            
             <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>

Modified: geronimo/samples/branches/3.0/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml?rev=1357049&r1=1357048&r2=1357049&view=diff
==============================================================================
--- geronimo/samples/branches/3.0/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
(original)
+++ geronimo/samples/branches/3.0/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
Wed Jul  4 03:08:06 2012
@@ -46,6 +46,63 @@
             </persistence>
         </openejb-jar>
     </module>
+    
+    <ext-module>
+        <connector>DataCDInfoDataSource</connector>
+        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <dep:groupId>org.tranql</dep:groupId>
+            <dep:artifactId>tranql-connector-derby-embed-xa</dep:artifactId>
+            <dep:type>rar</dep:type>
+        </external-path>
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+            <resourceadapter>
+                <outbound-resourceadapter>
+                    <connection-definition>
+                        <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+                        <connectiondefinition-instance>
+                            <name>jdbc/DataCDInfoDS</name>
+                            <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>
+                                <xa-transaction>
+                                    <transaction-caching />
+                                </xa-transaction>
+                                <single-pool>
+                                    <max-size>100</max-size>
+                                    <min-size>0</min-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <idle-timeout-minutes>30</idle-timeout-minutes>
+                                    <match-one />
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                        <!-- This non-transaction data source is for sequence generation
use. Without it,
+                        the geronimo will throw exception when persisting entities which
require sequence
+                        generation. -->
+                        <connectiondefinition-instance>
+                            <name>jdbc/NoTxDataCDInfoDS</name>
+                            <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>
+                                <no-transaction/>
+                                <single-pool>
+                                    <max-size>10</max-size>
+                                    <min-size>0</min-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <idle-timeout-minutes>30</idle-timeout-minutes>
+                                    <match-one/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                    </connection-definition>
+                </outbound-resourceadapter>
+            </resourceadapter>
+        </connector>
+    </ext-module>
 
   <security xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0">
     <sec:default-principal>

Modified: geronimo/samples/branches/3.0/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml?rev=1357049&r1=1357048&r2=1357049&view=diff
==============================================================================
--- geronimo/samples/branches/3.0/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml (original)
+++ geronimo/samples/branches/3.0/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml Wed
Jul  4 03:08:06 2012
@@ -36,6 +36,7 @@
             <groupId>org.apache.geronimo.samples.javaee5</groupId>
             <artifactId>DataCDInfo-JTA-ejb</artifactId>
             <version>${version}</version>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>

Modified: geronimo/samples/branches/3.0/samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0/samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml?rev=1357049&r1=1357048&r2=1357049&view=diff
==============================================================================
--- geronimo/samples/branches/3.0/samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/samples/branches/3.0/samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
Wed Jul  4 03:08:06 2012
@@ -21,7 +21,7 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
 
-    <context-root>${project.artifactId}</context-root>
+    <context-root>jaxws-calculator</context-root>
 
     <service-ref>
         <service-ref-name>services/Calculator</service-ref-name>

Modified: geronimo/samples/branches/3.0/samples/javaee5/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0/samples/javaee5/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml?rev=1357049&r1=1357048&r2=1357049&view=diff
==============================================================================
--- geronimo/samples/branches/3.0/samples/javaee5/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
(original)
+++ geronimo/samples/branches/3.0/samples/javaee5/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
Wed Jul  4 03:08:06 2012
@@ -21,7 +21,7 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
 
-    <context-root>${project.artifactId}</context-root>
+    <context-root>jaxws-calculator</context-root>
 
     <service-ref>
         <service-ref-name>services/Calculator</service-ref-name>

Modified: geronimo/samples/branches/3.0/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml?rev=1357049&r1=1357048&r2=1357049&view=diff
==============================================================================
--- geronimo/samples/branches/3.0/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml
(original)
+++ geronimo/samples/branches/3.0/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml
Wed Jul  4 03:08:06 2012
@@ -23,7 +23,7 @@
     <exclude-unlisted-classes>true</exclude-unlisted-classes>
     <properties>
       <property name="openjpa.jdbc.DBDictionary " value="derby"/>
-      <property name="openjpa.ConnectionURL" value="jdbc:derby://localhost:1527/jpa20demodb"/>
+      <property name="openjpa.ConnectionURL" value="jdbc:derby://localhost:1527/jpa20demodb;create=true"/>
       <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.ClientDriver"/>
       <!--<property name="openjpa.ConnectionURL" value="jdbc:derby:jpa20demodb"/>
       <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>-->

Modified: geronimo/samples/branches/3.0/samples/sample-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0/samples/sample-datasource/pom.xml?rev=1357049&r1=1357048&r2=1357049&view=diff
==============================================================================
--- geronimo/samples/branches/3.0/samples/sample-datasource/pom.xml (original)
+++ geronimo/samples/branches/3.0/samples/sample-datasource/pom.xml Wed Jul  4 03:08:06 2012
@@ -83,7 +83,6 @@
         <dependency>
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-derby-embed-xa</artifactId>
-            <version>1.6</version>
             <type>rar</type>
             <!--<scope>provided</scope>-->
         </dependency>



Mime
View raw message