daytrader.patch 26.8 KB
Newer Older
1
2
diff -urNw daytrader/javaee6/assemblies/daytrader-ear/pom.xml ../daytrader-new/javaee6/assemblies/daytrader-ear/pom.xml
--- daytrader/javaee6/assemblies/daytrader-ear/pom.xml	2018-03-12 16:45:38.000000000 +1100
3
+++ ../daytrader-new/javaee6/assemblies/daytrader-ear/pom.xml	2018-03-13 21:44:56.126427948 +1100
4
5
6
7
8
@@ -20,7 +20,6 @@
             <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
             <artifactId>utils</artifactId>            
         </dependency>       
-       
9
         <dependency>
10
11
12
13
14
             <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
             <artifactId>entities</artifactId>
@@ -30,6 +29,22 @@
             <artifactId>web</artifactId>
             <type>war</type>
15
         </dependency>
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
+      <dependency>
+          <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
+          <artifactId>dacapo</artifactId>
+          <version>${project.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
+          <artifactId>wsappclient</artifactId>
+          <version>${project.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
+          <artifactId>web</artifactId>
+          <version>${project.version}</version>
+          <classifier>classes</classifier>
+      </dependency>
         </dependencies>
   <build>
34
         <plugins>
35
36
37
38
@@ -58,6 +73,23 @@
                             <contextRoot>/daytrader</contextRoot>
                             <bundleFileName>web.war</bundleFileName>
                         </webModule>                
39
+                        <javaModule>
40
41
42
43
44
45
46
47
48
+                            <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
+                            <artifactId>web</artifactId>
+                            <classifier>classes</classifier>
+                            <uri>web.jar</uri>
+                        </javaModule>
+                        <javaModule>
+                            <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
+                            <artifactId>dacapo</artifactId>
+                            <uri>dacapo.jar</uri>
49
+                            <includeInApplicationXml>true</includeInApplicationXml>
50
51
52
53
54
+                        </javaModule>
+                        <javaModule>
+                            <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
+                            <artifactId>wsappclient</artifactId>
+                            <uri>lib/wsappclient.jar</uri>
55
56
57
58
+                        </javaModule>
                     </modules>
                     <!--
                     HACK: Include legal muck from maven-remote-resources-plugin
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
diff -urNw daytrader/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/application.xml ../daytrader-new/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/application.xml
--- daytrader/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/application.xml	2018-03-12 16:45:38.000000000 +1100
+++ ../daytrader-new/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/application.xml	1970-01-01 10:00:00.000000000 +1000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd" version="6">
-  <application-name>daytrader</application-name>
-  <description>DayTrader Stock Trading Performance Benchmark Sample</description>  
-  <display-name>DayTrader EAR</display-name> 
-  
-  <module>
-    <web>
-      <web-uri>web.war</web-uri>
-      <context-root>/daytrader</context-root>
-    </web>
-  </module>
- 
-</application>
\ No newline at end of file
diff -urNw daytrader/javaee6/modules/entities/src/main/resources/META-INF/persistence.xml ../daytrader-new/javaee6/modules/entities/src/main/resources/META-INF/persistence.xml
--- daytrader/javaee6/modules/entities/src/main/resources/META-INF/persistence.xml	2018-03-12 16:45:42.000000000 +1100
80
+++ ../daytrader-new/javaee6/modules/entities/src/main/resources/META-INF/persistence.xml	2018-03-13 21:44:56.574420943 +1100
81
82
83
84
85
86
87
88
89
90
91
@@ -30,7 +30,7 @@
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         
         <properties>
-            <property name="openjpa.jdbc.DBDictionary" value="derby" /> 
+            <property name="openjpa.jdbc.DBDictionary" value="h2" />
             <property name="openjpa.BrokerImpl" value="non-finalizing" />
             <!-- To enable OpenJPA to generate foreign key constraints, comment out this line -->
             <!-- <property name="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> -->
diff -urNw daytrader/javaee6/modules/pom.xml ../daytrader-new/javaee6/modules/pom.xml
--- daytrader/javaee6/modules/pom.xml	2018-03-12 16:45:38.000000000 +1100
92
+++ ../daytrader-new/javaee6/modules/pom.xml	2018-03-13 21:44:56.702418942 +1100
93
94
95
96
97
98
99
@@ -19,5 +19,7 @@
     <module>entities</module>   
     <module>utils</module>    
     <module>web</module>
+    <module>dacapo</module>
+    <module>wsappclient</module>
   </modules>
100
 </project>
101
102
103
\ No newline at end of file
diff -urNw daytrader/javaee6/modules/web/pom.xml ../daytrader-new/javaee6/modules/web/pom.xml
--- daytrader/javaee6/modules/web/pom.xml	2018-03-12 16:45:41.000000000 +1100
104
+++ ../daytrader-new/javaee6/modules/web/pom.xml	2018-03-13 21:44:57.566405432 +1100
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
@@ -28,6 +28,12 @@
         </dependency>        
         <dependency>
             <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
+            <artifactId>wsappclient</artifactId>
+            <scope>provided</scope>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
             <artifactId>entities</artifactId>            
              <scope>provided</scope>    
         </dependency>
@@ -126,6 +132,7 @@
                             </includes>
                         </resource>
                     </webResources>
+                    <attachClasses>true</attachClasses>
                 </configuration>
             </plugin>   
             </plugins> 
diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/api/TradeServices.java ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/api/TradeServices.java
--- daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/api/TradeServices.java	2018-03-12 16:45:45.000000000 +1100
128
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/api/TradeServices.java	2018-03-13 21:44:56.914415628 +1100
129
130
131
132
133
@@ -281,5 +281,11 @@
      */
     public RunStatsDataBean resetTrade(boolean deleteAll) throws Exception, RemoteException;
     
+    public void runDaCapoTrade(String size, int threads, boolean soap) throws Exception, RemoteException;
134
+
135
+    public void initializeDaCapo(String size) throws Exception, RemoteException;
136
+
137
+    public boolean resetDaCapo(String size, int threads) throws Exception, RemoteException;
138
+    
139
140
141
142
 }   
 
diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJDBCDirect.java ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJDBCDirect.java
--- daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJDBCDirect.java	2018-03-12 16:45:40.000000000 +1100
143
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJDBCDirect.java	2018-03-13 21:44:56.950415065 +1100
144
145
146
@@ -1930,4 +1930,26 @@
         return TradeConfig.JDBC;
     }
147
148
 
+    /**
149
+     * @see TradeServices#resetDaCapo(String)
150
151
+     */
+    public void runDaCapoTrade(String size, int threads, boolean soap) throws Exception {
152
+        throw new UnsupportedOperationException();
153
+    }
154
+
155
156
+    /**
+     *
157
+     * @see TradeServices#initializeDaCapo(String)
158
159
+     */
+    public void initializeDaCapo(String size) throws Exception {
160
+        throw new UnsupportedOperationException();
161
+    }
162
+
163
+    /**
164
+     * @see TradeServices#resetDaCapo(String)
165
166
+     */
+    public boolean resetDaCapo(String size, int threads) throws Exception {
167
+        return true; }
168
169
170
+
+
 }
171
172
diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java
--- daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java	2018-03-12 16:45:40.000000000 +1100
173
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java	2018-03-13 21:44:56.994414376 +1100
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
@@ -1932,7 +1932,7 @@
 
     private final static String updateAccountProfileSQL =
         "update accountprofileejb set " + "passwd = ?, fullname = ?, address = ?, email = ?, creditcard = ? "
-            + "where userid = (select profile_userid from accountejb a " + "where a.profile_userid=?)";
+            + "where userid = ?";
 
     private final static String loginSQL =
         "update accountejb set lastLogin=?, logincount=logincount+1 " + "where profile_userid=?";
@@ -1945,20 +1945,17 @@
     private static final String getAccountForUpdateSQL = "select * from accountejb a where a.accountid = ? for update";
 
     private final static String getAccountProfileSQL =
-        "select * from accountprofileejb ap where ap.userid = "
-            + "(select profile_userid from accountejb a where a.profile_userid=?)";
+        "select * from accountprofileejb ap where ap.userid = ?";
 
     private final static String getAccountProfileForAccountSQL =
         "select * from accountprofileejb ap where ap.userid = "
             + "(select profile_userid from accountejb a where a.accountid=?)";
 
     private static final String getAccountForUserSQL =
-        "select * from accountejb a where a.profile_userid = "
-            + "( select userid from accountprofileejb ap where ap.userid = ?)";
+        "select * from accountejb a where a.profile_userid = ?";
 
     private static final String getAccountForUserForUpdateSQL =
-        "select * from accountejb a where a.profile_userid = "
-            + "( select userid from accountprofileejb ap where ap.userid = ?) for update";
+        "select * from accountejb a where a.profile_userid = ?";
 
     private static final String getHoldingSQL = "select * from holdingejb h where h.holdingid = ?";
 
@@ -2103,4 +2100,28 @@
         this.inGlobalTxn = inGlobalTxn;
     }
 
+    /**
+     * @see TradeServices#resetDaCapo(String)
+     */
+    public void runDaCapoTrade(String size, int threads, boolean soap) throws Exception {
+        org.apache.geronimo.daytrader.javaee6.dacapo.DaCapoRunner.runDaCapoTrade(size, threads, soap);
+    }
+
+    /**
+     *
+     * @see TradeServices#initializeDaCapo(String)
+     */
+    public void initializeDaCapo(String size) throws Exception {
+        org.apache.geronimo.daytrader.javaee6.dacapo.DaCapoDBBuilder.create(this, 1, size);
+    }
+
+    /**
+     *
+     * @see TradeServices#resetDaCapo(String)
+     */
+    public boolean resetDaCapo(String size, int threads) throws Exception {
+        return org.apache.geronimo.daytrader.javaee6.dacapo.DaCapoDBBuilder.reset(this, size, threads);
+    }
+
+
 }
diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJPADirect.java ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJPADirect.java
--- daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJPADirect.java	2018-03-12 16:45:46.000000000 +1100
238
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJPADirect.java	2018-03-13 21:44:56.962414876 +1100
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
@@ -1038,4 +1038,26 @@
         return TradeConfig.JPA;
     }
 
+    /**
+     * @see TradeServices#resetDaCapo(String)
+     */
+    public void runDaCapoTrade(String size, int threads, boolean soap) throws Exception {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     *
+     * @see TradeServices#initializeDaCapo(String)
+     */
+    public void initializeDaCapo(String size) throws Exception {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * @see TradeServices#resetDaCapo(String)
+     */
+    public boolean resetDaCapo(String size, int threads) throws Exception {
+        return true; }
+
+
 }
diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/DirectSLSBBean.java ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/DirectSLSBBean.java
--- daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/DirectSLSBBean.java	2018-03-12 16:45:40.000000000 +1100
268
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/DirectSLSBBean.java	2018-03-13 21:44:57.042413625 +1100
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
@@ -125,4 +125,16 @@
     public RunStatsDataBean resetTrade(boolean deleteAll) throws Exception {
         return (new TradeJEEDirect(false)).resetTrade(deleteAll);
     }
+
+    public void runDaCapoTrade(String size, int threads, boolean soap) throws Exception {
+        (new TradeJEEDirect(true)).runDaCapoTrade(size, threads, soap);
+    }
+
+    public void initializeDaCapo(String size) throws Exception {
+        (new TradeJEEDirect(true)).initializeDaCapo(size);
+    }
+
+    public boolean resetDaCapo(String size, int threads) throws Exception {
+        return (new TradeJEEDirect(true)).resetDaCapo(size, threads);
+    }
 }
diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/TradeSLSBBean.java ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/TradeSLSBBean.java
--- daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/TradeSLSBBean.java	2018-03-12 16:45:40.000000000 +1100
288
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/TradeSLSBBean.java	2018-03-13 21:44:57.050413501 +1100
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
@@ -750,4 +750,17 @@
         Log.trace("updateQuotePrices: " + TradeConfig.getUpdateQuotePrices());
         Log.trace("publishQuotePriceChange: " + TradeConfig.getPublishQuotePriceChange());
     }
+
+    public void runDaCapoTrade(String size, int threads, boolean soap) {
+        System.err.println("Hmmmmmmmmmmmmm...  haven't worked this bit out yet: "+size);
+    }
+
+    public void initializeDaCapo(String size) {
+        System.err.println("Hmmmmmmmmmmmmm...  haven't worked this bit out yet: "+size);
+    }
+
+    public boolean resetDaCapo(String size, int threads) {
+        System.err.println("Hmmmmmmmmmmmmm...  haven't worked this bit out yet: "+size);
+        return false;
+    }
 }
diff -urNw daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeAction.java ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeAction.java
--- daytrader/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeAction.java	2018-03-12 16:45:40.000000000 +1100
309
+++ ../daytrader-new/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeAction.java	2018-03-13 21:44:57.074413124 +1100
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
@@ -570,4 +570,39 @@
         return runStatsData;
     }
     
+    /**
+     * Initialize the database for DaCapo
+     *
+     * @param size the size of the workload
+     * @param threads the number of threads participating in the reset
+     */
+    public void runDaCapoTrade(String size, int threads, boolean soap) throws Exception {
+        if (Log.doActionTrace())
+            Log.trace("TradeAction:runDaCapoTrade", size);
+        trade.runDaCapoTrade(size, threads, soap);
+    }
+
+    /**
+     * Initialize the database for DaCapo
+     *
+     * @param size the size of the workload
+     */
+    public void initializeDaCapo(String size) throws Exception {
+        if (Log.doActionTrace())
+            Log.trace("TradeAction:initializeDaCapo", size);
+        trade.initializeDaCapo(size);
+    }
+
+    /**
+     * Initialize the database for DaCapo
+     *
+     * @param size the size of the workload
+     * @param threads the number of threads participating in the reset
+     */
+    public boolean resetDaCapo(String size, int threads) throws Exception {
+        if (Log.doActionTrace())
+            Log.trace("TradeAction:resetDaCapo", size);
+        return trade.resetDaCapo(size, threads);
+    }
+
 }
diff -urNw daytrader/javaee6/modules/web/src/main/resources/dbscripts/derby/Table.ddl ../daytrader-new/javaee6/modules/web/src/main/resources/dbscripts/derby/Table.ddl
--- daytrader/javaee6/modules/web/src/main/resources/dbscripts/derby/Table.ddl	2018-03-12 16:45:46.000000000 +1100
352
+++ ../daytrader-new/javaee6/modules/web/src/main/resources/dbscripts/derby/Table.ddl	2018-03-13 21:44:57.346408872 +1100
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
@@ -15,13 +15,13 @@
 
 -- Each SQL statement in this file should terminate with a semicolon (;)
 -- Lines starting with the pound character (--) are considered as comments
--- DROP TABLE HOLDINGEJB;
--- DROP TABLE ACCOUNTPROFILEEJB;
--- DROP TABLE QUOTEEJB;
--- DROP TABLE KEYGENEJB;
--- DROP TABLE ACCOUNTEJB;
--- DROP TABLE ORDEREJB;
--- DROP TABLE OPENJPASEQ;
+DROP TABLE HOLDINGEJB;
+DROP TABLE ACCOUNTPROFILEEJB;
+DROP TABLE QUOTEEJB;
+DROP TABLE KEYGENEJB;
+DROP TABLE ACCOUNTEJB;
+DROP TABLE ORDEREJB;
+DROP TABLE OPENJPASEQ;
 
 create table OPENJPASEQ
 (ID SMALLINT NOT NULL PRIMARY KEY,
diff -urNw daytrader/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml ../daytrader-new/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml
--- daytrader/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml	2018-03-12 16:45:42.000000000 +1100
376
+++ ../daytrader-new/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml	2018-03-13 21:44:57.390408184 +1100
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
@@ -58,10 +58,19 @@
         <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
         </servlet>
+    <servlet>
+        <display-name>org_apache_geronimo_samples_daytrader_TradeWSAction</display-name>
+        <servlet-name>org_apache_geronimo_samples_daytrader_TradeWSAction</servlet-name>
+        <servlet-class>org.apache.geronimo.daytrader.javaee6.soap.TradeWSAction</servlet-class>
+    </servlet>
     <servlet-mapping>
         <servlet-name>Faces Servlet</servlet-name>
         <url-pattern>*.faces</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>org_apache_geronimo_samples_daytrader_TradeWSAction</servlet-name>
+        <url-pattern>/services/TradeWSServices</url-pattern>
+    </servlet-mapping>
 
     <session-config>
         <session-timeout>30</session-timeout>
diff -urNw daytrader/plugins/daytrader-tomcat/pom.xml ../daytrader-new/plugins/daytrader-tomcat/pom.xml
--- daytrader/plugins/daytrader-tomcat/pom.xml	2018-03-12 16:45:42.000000000 +1100
399
+++ ../daytrader-new/plugins/daytrader-tomcat/pom.xml	2018-03-13 21:52:10.011646339 +1100
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.plugins</groupId>
-            <artifactId>daytrader-derby-datasource</artifactId>
+            <artifactId>daytrader-h2-datasource</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -157,7 +157,6 @@
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${jpaDeployer}</deploymentConfig>
                         <deploymentConfig>${axisDeployer}</deploymentConfig>
                         <deploymentConfig>${clientDeployer}</deploymentConfig>
                     </deploymentConfigs>
@@ -179,6 +178,35 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>install</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <echo>Copying manually generated geronimo-plugin.xml files for daytrader dacapo ws client</echo>
+                                <copy todir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-dacapo/${project.version}/daytrader-dacapo-${project.version}.car/META-INF"
+                                      failonerror="false" overwrite="true">
+                                    <fileset dir="${basedir}/../../plans/dacapo" includes="geronimo-plugin.xml"/>
+                                </copy>
+
+                                <echo>Pack the daytrader dacapo ws client car file and install onto local repo</echo>
+                                <jar destfile="${project.build.directory}/daytrader-dacapo-${project.version}.car"
+                                     basedir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-dacapo/${project.version}/daytrader-dacapo-${project.version}.car"
+                                     manifest="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-dacapo/${project.version}/daytrader-dacapo-${project.version}.car/META-INF/MANIFEST.MF"/>
+
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
 <!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff -urNw daytrader/plugins/daytrader-tomcat/src/main/history/dependencies.xml ../daytrader-new/plugins/daytrader-tomcat/src/main/history/dependencies.xml
--- daytrader/plugins/daytrader-tomcat/src/main/history/dependencies.xml	2018-03-12 16:45:49.000000000 +1100
455
+++ ../daytrader-new/plugins/daytrader-tomcat/src/main/history/dependencies.xml	2018-03-13 21:44:59.950368158 +1100
456
457
458
459
460
461
462
463
464
465
466
@@ -38,7 +38,7 @@
     </dependency>-->
     <dependency>
         <groupId>org.apache.geronimo.daytrader.plugins</groupId>
-        <artifactId>daytrader-derby-datasource</artifactId>
+        <artifactId>daytrader-h2-datasource</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
diff -urNw daytrader/plugins/daytrader-tomcat/src/main/plan/plan.xml ../daytrader-new/plugins/daytrader-tomcat/src/main/plan/plan.xml
--- daytrader/plugins/daytrader-tomcat/src/main/plan/plan.xml	2018-03-12 16:45:42.000000000 +1100
467
+++ ../daytrader-new/plugins/daytrader-tomcat/src/main/plan/plan.xml	2018-03-13 21:44:59.954368095 +1100
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
@@ -179,4 +179,26 @@
         </application-client>
     </module>-->
 
+    <module>
+        <java>dacapo.jar</java>
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
+            <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <moduleId>
+                    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                    <artifactId>daytrader-dacapo</artifactId>
+                    <version>3.0-SNAPSHOT</version>
+                    <type>car</type>
+                </moduleId>
+            </client-environment>
+            <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <moduleId>
+                    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                    <artifactId>daytrader-dacapo-server</artifactId>
+                    <version>3.0-SNAPSHOT</version>
+                    <type>car</type>
+                </moduleId>
+            </server-environment>
+        </application-client>
+    </module>
+
 </application>
diff -urNw daytrader/plugins/pom.xml ../daytrader-new/plugins/pom.xml
--- daytrader/plugins/pom.xml	2018-03-12 16:45:42.000000000 +1100
497
+++ ../daytrader-new/plugins/pom.xml	2018-03-13 21:54:00.037927038 +1100
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
@@ -40,10 +40,11 @@
                 </property>
             </activation>
             <modules>
-                <module>daytrader-derby-datasource</module>        	
+                <module>tranql-connector-h2</module>
+                <module>daytrader-h2-datasource</module>
                 <module>daytrader-jms</module>
-                <!--<module>daytrader-jetty</module>
-                <module>daytrader-tomcat</module>-->
+                <!--<module>daytrader-jetty</module>-->
+                <module>daytrader-tomcat</module>
             </modules>
         </profile>
         <!--
513
514
515
516
517
518
519
520
521
@@ -125,6 +126,8 @@
                             <geronimo-version>2.2.1-SNAPSHOT</geronimo-version>-->
                             <jvm-version>1.5</jvm-version>
                             <jvm-version>1.6</jvm-version>
+                            <jvm-version>1.7</jvm-version>
+                            <jvm-version>1.8</jvm-version>
                             <source-repository>~/.m2/repository/</source-repository>
                             <source-repository>http://repository.apache.org/snapshots/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
522
523
diff -urNw daytrader/pom.xml ../daytrader-new/pom.xml
--- daytrader/pom.xml	2018-03-12 16:45:38.000000000 +1100
524
+++ ../daytrader-new/pom.xml	2018-03-13 21:44:56.094428449 +1100
525
526
@@ -39,7 +39,7 @@
     </scm>
527
 
528
529
530
     <properties>        
-        <geronimoVersion>3.0.1-SNAPSHOT</geronimoVersion>
+        <geronimoVersion>3.0.1</geronimoVersion>
531
532
         <!-- set siteId to artifactId for any "top level" project rooting a website -->
         <siteId>daytrader</siteId>
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
         <openjpaVersion>2.1.0</openjpaVersion>
@@ -146,6 +146,13 @@
     </contributors>
     <dependencies/>
     
+    <repositories>
+        <repository>
+            <id>codehaus.snapshots</id>
+            <url>http://central.maven.org/maven2/</url>
+        </repository>
+    </repositories>
+    
     <organization>
         <name>Apache Software Foundation</name>
         <url>http://www.apache.org/</url>