geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r809033 - in /geronimo/daytrader/trunk: assemblies/ assemblies/daytrader-javaee/ assemblies/daytrader-web-jdbc/ modules/streamer/ modules/wsappclient/ modules/wsappclient/src/main/resources/META-INF/ plugins/daytrader-jetty/ plugins/daytrad...
Date Fri, 28 Aug 2009 21:10:56 GMT
Author: dwoods
Date: Fri Aug 28 21:10:55 2009
New Revision: 809033

URL: http://svn.apache.org/viewvc?rev=809033&view=rev
Log:
reorg - Part 4 - all previous modules now build, but untested

Added:
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/daytrader-derby-datasource-plan.xml
  (with props)
Modified:
    geronimo/daytrader/trunk/assemblies/daytrader-javaee/pom.xml
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/README
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/pom.xml
    geronimo/daytrader/trunk/assemblies/pom.xml
    geronimo/daytrader/trunk/modules/streamer/pom.xml
    geronimo/daytrader/trunk/modules/wsappclient/pom.xml
    geronimo/daytrader/trunk/modules/wsappclient/src/main/resources/META-INF/application-client.xml
    geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml

Modified: geronimo/daytrader/trunk/assemblies/daytrader-javaee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-javaee/pom.xml?rev=809033&r1=809032&r2=809033&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-javaee/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/daytrader-javaee/pom.xml Fri Aug 28 21:10:55 2009
@@ -114,7 +114,7 @@
                             <groupId>org.apache.geronimo.daytrader.modules</groupId>
                             <artifactId>core</artifactId>
                             <bundleFileName>core.jar</bundleFileName>
-                            <includeInApplicationXml>true</includeInApplicationXml>
+                            <includeInApplicationXml>false</includeInApplicationXml>
                         </javaModule>
                         <javaModule>
                             <groupId>org.apache.geronimo.daytrader.modules</groupId>

Modified: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/README
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/README?rev=809033&r1=809032&r2=809033&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/README (original)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/README Fri Aug 28 21:10:55 2009
@@ -2,12 +2,15 @@
 ----------------------------------------------------------------------
 
 This is a version of daytrader which is able to running on Tomcat 6. 
-By default, it uses Derby database. You can change src/main/webapp/META-INF/context.xml
-to use other database vendor. Remember that copying database jdbc drivers to tomcat lib
-directory.
+By default, it uses a Derby database. You can change  -
+    src/main/webapp/META-INF/context.xml
+to use another database vendor. Remember to copy the database jdbc drivers 
+to the Tomcat lib directory.
 
-After building, just deploy the .war in the target directory to tomcat with context root
/daytrader.
+After building, just deploy the .war in the target directory to Tomcat with
+context root /daytrader.
+
+Of course, it works as well on the Geronimo Minimal Jetty or Tomcat assemblies.
+Before deploying it, you will need to deploy the datasource in -
+    daytrader-derby-datasource-plan.xml
 
-Of course, it works as well as on Little-G with Tomcat 6. Before deploying it 
-to Little-G, you need to deploy a datasource first. Refer to daytrader-datasource-plan.xml
-for an example.

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/daytrader-derby-datasource-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/daytrader-derby-datasource-plan.xml?rev=809033&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/daytrader-derby-datasource-plan.xml
(added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/daytrader-derby-datasource-plan.xml
Fri Aug 28 21:10:55 2009
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
+  xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"
+  xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2">
+
+  <dep:environment>
+    <dep:moduleId>
+      <dep:groupId>org.apache.geronimo.daytrader</dep:groupId>
+      <dep:artifactId>daytrader-derby-datasource</dep:artifactId>
+      <dep:version>1.0</dep:version>
+      <dep:type>car</dep:type>
+    </dep:moduleId>
+    <dep:dependencies>
+        <dep:dependency>
+            <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+            <dep:artifactId>system-database</dep:artifactId>
+            <dep:type>car</dep:type>
+        </dep:dependency>
+    </dep:dependencies>
+    <dep:hidden-classes/>
+    <dep:non-overridable-classes/>
+  </dep:environment>
+
+  <resourceadapter>
+      <outbound-resourceadapter>
+          <connection-definition>
+              <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+              <connectiondefinition-instance>
+                  <name>jdbc/TradeDataSource</name>
+                  <config-property-setting name="UserName"></config-property-setting>
+                  <config-property-setting name="Password"></config-property-setting>
+                  <config-property-setting name="DatabaseName">DaytraderDatabase</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>                        
+          </connection-definition>
+      </outbound-resourceadapter>
+   </resourceadapter>
+</connector>
+

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/daytrader-derby-datasource-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/pom.xml?rev=809033&r1=809032&r2=809033&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/pom.xml Fri Aug 28 21:10:55 2009
@@ -28,7 +28,7 @@
     <groupId>org.apache.geronimo.daytrader.assemblies</groupId>
     <artifactId>daytrader-web-jdbc</artifactId>    
     <packaging>war</packaging>
-    <name>DayTrader :: Web + JDBC Assembly</name>
+    <name>DayTrader :: Assemblies - Web + Direct JDBC</name>
     <description>A version of Daytrader for basic Web constainers</description>
     
     <dependencies>
@@ -42,6 +42,11 @@
             <artifactId>web</artifactId>
             <version>${version}</version>
         </dependency>
+        <dependency>
+            <!-- we need to include this in the image for logging to work -->
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -50,6 +55,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -64,17 +74,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <!-- we need to include this in the image for logging to work -->
-            <!-- <scope>provided</scope> -->
-        </dependency>
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>

Modified: geronimo/daytrader/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/pom.xml?rev=809033&r1=809032&r2=809033&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/pom.xml Fri Aug 28 21:10:55 2009
@@ -31,10 +31,10 @@
     <packaging>pom</packaging>
 
     <modules>
+        <module>daytrader-web-jdbc</module>
         <module>daytrader-web-ejb</module>
         <module>daytrader-javaee</module>
 <!--
-        <module>daytrader-web-jdbc</module>
         <module>daytrader-web-jpa</module>
 -->
     </modules>

Modified: geronimo/daytrader/trunk/modules/streamer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/streamer/pom.xml?rev=809033&r1=809032&r2=809033&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/streamer/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/streamer/pom.xml Fri Aug 28 21:10:55 2009
@@ -80,7 +80,7 @@
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <class-path>dt-ejb.jar</class-path>
+                            <class-path>core.jar web.jar dt-ejb.jar</class-path>
                         </manifestEntries>
                         <manifest>
                             <main-class>org.apache.geronimo.samples.daytrader.client.TradeClient</main-class>

Modified: geronimo/daytrader/trunk/modules/wsappclient/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/wsappclient/pom.xml?rev=809033&r1=809032&r2=809033&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/wsappclient/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/wsappclient/pom.xml Fri Aug 28 21:10:55 2009
@@ -27,7 +27,7 @@
     <groupId>org.apache.geronimo.daytrader.modules</groupId>
     <artifactId>wsappclient</artifactId>
     <packaging>jar</packaging>
-    <name>DayTrader :: WS Application Client</name>
+    <name>DayTrader :: Modules - WS Application Client</name>
     <description>Client demonstrating Web Services</description>
 
     <scm>
@@ -53,9 +53,9 @@
             to include a manual class-path entry pointing to the EJB module. When this is
fixed
             remove the manifestEntries section below and this comment. -->
                     <archive>
-                        <!-- manifestEntries>
-                            <class-path>dt-ejb.jar</class-path>
-                        </manifestEntries -->
+                        <manifestEntries>
+                            <class-path>core.jar web.jar soap.jar dt-ejb.jar</class-path>
+                        </manifestEntries>
                         <manifest>
                             <main-class>org.apache.geronimo.samples.daytrader.client.ws.ClientApp</main-class>
                         </manifest>

Modified: geronimo/daytrader/trunk/modules/wsappclient/src/main/resources/META-INF/application-client.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/wsappclient/src/main/resources/META-INF/application-client.xml?rev=809033&r1=809032&r2=809033&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/wsappclient/src/main/resources/META-INF/application-client.xml
(original)
+++ geronimo/daytrader/trunk/modules/wsappclient/src/main/resources/META-INF/application-client.xml
Fri Aug 28 21:10:55 2009
@@ -19,6 +19,8 @@
 	xmlns="http://java.sun.com/xml/ns/j2ee"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
+	
+    <display-name>WSAppClient</display-name>
 	<service-ref>
 		<description>WSDL Service Trade</description>
 		<service-ref-name>service/Trade</service-ref-name>

Modified: geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml?rev=809033&r1=809032&r2=809033&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml Fri Aug 28 21:10:55 2009
@@ -141,7 +141,6 @@
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-ra</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml?rev=809033&r1=809032&r2=809033&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml Fri Aug 28 21:10:55 2009
@@ -140,8 +140,8 @@
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-ra</artifactId>
         </dependency>
-
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -170,8 +170,8 @@
                         <deploymentConfig>${clientDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
-                        <groupId>org.apache.geronimo.daytrader</groupId>
-                        <artifactId>daytrader-ear</artifactId>
+                        <groupId>org.apache.geronimo.daytrader.assemblies</groupId>
+                        <artifactId>daytrader-javaee</artifactId>
                         <type>ear</type>
                     </module>
                     <commonInstance>
@@ -208,20 +208,20 @@
                         <configuration>
                             <tasks>
                                 <echo>Copying manually generated geronimo-plugin.xml
files for app daytrader ws client</echo>
-                                <copy todir="${project.build.directory}/repository/org/apache/geronimo/daytrader/daytrader-ws-client/${version}/daytrader-ws-client-${version}.car/META-INF"
+                                <copy todir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-ws-client/${version}/daytrader-ws-client-${version}.car/META-INF"
                                     failonerror="false" overwrite="true">
                                     <fileset dir="${basedir}/../plans/wsclient" includes="geronimo-plugin.xml"/>
                                 </copy>
 
                                 <echo>Copying manually generated geronimo-plugin.xml
files for app daytrader streamer client</echo>
-                                <copy todir="${project.build.directory}/repository/org/apache/geronimo/daytrader/daytrader-streamer-client/${version}/daytrader-streamer-client-${version}.car/META-INF"
+                                <copy todir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-streamer-client/${version}/daytrader-streamer-client-${version}.car/META-INF"
                                     failonerror="false" overwrite="true">
                                     <fileset dir="${basedir}/../plans/streamerclient"
includes="geronimo-plugin.xml"/>
                                 </copy>
 
                                 <echo>Pack the daytrader ws client car file and install
onto local repo</echo>
                                 <jar destfile="${project.build.directory}/daytrader-ws-client-${version}.car"
-                                    basedir="${project.build.directory}/repository/org/apache/geronimo/daytrader/daytrader-ws-client/${version}/daytrader-ws-client-${version}.car"/>
+                                    basedir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-ws-client/${version}/daytrader-ws-client-${version}.car"/>
                                 
                                 <condition property="mvn.exe" value="mvn.bat" else="mvn">
                                     <os family="windows"/>
@@ -229,7 +229,7 @@
                                 <exec executable="${mvn.exe}">
                                     <arg value="install:install-file"/>
                                     <arg value="-Dfile=${project.build.directory}/daytrader-ws-client-${version}.car"/>
-                                    <arg value="-DgroupId=org.apache.geronimo.daytrader"/>
+                                    <arg value="-DgroupId=org.apache.geronimo.daytrader.plugins"/>
                                     <arg value="-DartifactId=daytrader-ws-client"/>
                                     <arg value="-Dversion=${version}"/>
                                     <arg value="-Dpackaging=car"/>
@@ -239,7 +239,7 @@
                                 
                                 <echo>Pack the daytrader streamer client car file and
install onto local repo</echo>
                                 <jar destfile="${project.build.directory}/daytrader-streamer-client-${version}.car"
-                                    basedir="${project.build.directory}/repository/org/apache/geronimo/daytrader/daytrader-streamer-client/${version}/daytrader-streamer-client-${version}.car"/>
+                                    basedir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-streamer-client/${version}/daytrader-streamer-client-${version}.car"/>
                                 
 
                                 <condition property="mvn.exe" value="mvn.bat" else="mvn">
@@ -248,7 +248,7 @@
                                 <exec executable="${mvn.exe}">
                                     <arg value="install:install-file"/>
                                     <arg value="-Dfile=${project.build.directory}/daytrader-streamer-client-${version}.car"/>
-                                    <arg value="-DgroupId=org.apache.geronimo.daytrader"/>
+                                    <arg value="-DgroupId=org.apache.geronimo.daytrader.plugins"/>
                                     <arg value="-DartifactId=daytrader-streamer-client"/>
                                     <arg value="-Dversion=${version}"/>
                                     <arg value="-Dpackaging=car"/>



Mime
View raw message