You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/05/27 23:21:43 UTC
svn commit: r660709 [2/2] - in /geronimo/daytrader/trunk: ./
daytrader-derby-datasource/ daytrader-derby-datasource/src/
daytrader-derby-datasource/src/main/
daytrader-derby-datasource/src/main/plan/
daytrader-derby-datasource/src/main/resources/ daytr...
Added: geronimo/daytrader/trunk/daytrader-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/daytrader-tomcat/src/main/plan/plan.xml?rev=660709&view=auto
==============================================================================
--- geronimo/daytrader/trunk/daytrader-tomcat/src/main/plan/plan.xml (added)
+++ geronimo/daytrader/trunk/daytrader-tomcat/src/main/plan/plan.xml Tue May 27 14:21:41 2008
@@ -0,0 +1,182 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+
+ <!--
+ **
+ ** DayTrader Web War Module Definition
+ **
+ -->
+ <module>
+ <web>web.war</web>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+ <service-ref>
+ <service-ref-name>service/Trade</service-ref-name>
+ <port>
+ <port-name>TradeWSServices</port-name>
+ <protocol>http</protocol>
+ <host>localhost</host>
+ <port>8080</port>
+ <uri>/daytrader/services/TradeWSServices</uri>
+ </port>
+ </service-ref>
+ </web-app>
+ </module>
+
+
+ <!--
+ **
+ ** DayTrader EJB Jar Module Definition
+ **
+ -->
+ <module>
+ <ejb>dt-ejb.jar</ejb>
+ <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
+
+ <enterprise-beans>
+ <message-driven>
+ <ejb-name>DTBroker3MDB</ejb-name>
+ <resource-adapter>
+ <resource-link>TradeJMSResources</resource-link>
+ </resource-adapter>
+ </message-driven>
+ <message-driven>
+ <ejb-name>DTStreamer3MDB</ejb-name>
+ <resource-adapter>
+ <resource-link>TradeJMSResources</resource-link>
+ </resource-adapter>
+ </message-driven>
+ </enterprise-beans>
+
+ <!--
+ **
+ ** The following section can be used to override the settings in the
+ ** persistence.xml file. For instance, if you choose to deploy DayTrader
+ ** against a DB2 database, the DBDictionary can be specified here.
+ **
+ -->
+
+ <!--<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+ <persistence-unit name="daytrader">
+ <properties>
+ <property name="openjpa.jdbc.DBDictionary" value="db2" />
+ <property name="openjpa.jdbc.DBDictionary" value="derby" />
+ </properties>
+ </persistence-unit>
+ </persistence>-->
+ </openejb-jar>
+ </module>
+
+
+ <module>
+ <java>streamer.jar</java>
+ <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+ <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <moduleId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-streamer-client</artifactId>
+ <version>2.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</groupId>
+ <artifactId>daytrader-streamer-client-server</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <type>car</type>
+ </moduleId>
+ </server-environment>
+ <resource>
+ <external-rar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+ <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
+ <dep:type>rar</dep:type>
+ </external-rar>
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+ <resourceadapter>
+ <resourceadapter-instance>
+ <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
+ <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
+ <config-property-setting name="UserName">geronimo</config-property-setting>
+ <config-property-setting name="Password">geronimo</config-property-setting>
+ <workmanager>
+ <gbean-link>DefaultWorkManager</gbean-link>
+ </workmanager>
+ </resourceadapter-instance>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+ <connectiondefinition-instance>
+ <name>jms/TopicConnectionFactory</name>
+ <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
+ <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
+ <connectionmanager>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <single-pool>
+ <max-size>10</max-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ </connection-definition>
+ </outbound-resourceadapter>
+ </resourceadapter>
+
+ <adminobject>
+ <adminobject-interface>javax.jms.Topic</adminobject-interface>
+ <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
+ <adminobject-instance>
+ <message-destination-name>jms/TradeStreamerTopic</message-destination-name>
+ <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
+ </adminobject-instance>
+ </adminobject>
+ </connector>
+ </resource>
+ </application-client>
+ </module>
+
+ <module>
+ <java>wsappclient.jar</java>
+ <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+ <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <moduleId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-ws-client</artifactId>
+ <version>2.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</groupId>
+ <artifactId>daytrader-ws-client-server</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <type>car</type>
+ </moduleId>
+ </server-environment>
+ </application-client>
+ </module>
+
+</application>
Propchange: geronimo/daytrader/trunk/daytrader-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/daytrader/trunk/daytrader-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/daytrader/trunk/daytrader-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/daytrader/trunk/modules/dojo-ui-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/dojo-ui-ear/pom.xml?rev=660709&r1=660708&r2=660709&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/dojo-ui-ear/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/dojo-ui-ear/pom.xml Tue May 27 14:21:41 2008
@@ -37,6 +37,25 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+ <!-- Tools includes custom packagings, install as extension to pick them up -->
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>verify-legal-files</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <!-- Do not Fail the build if no legal files were found-->
+ <configuration>
+ <strict>false</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-ear-plugin</artifactId>
<configuration>
<displayName>DayTrader Dojo UI</displayName>
Modified: geronimo/daytrader/trunk/modules/dojo-ui-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/dojo-ui-web/pom.xml?rev=660709&r1=660708&r2=660709&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/dojo-ui-web/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/dojo-ui-web/pom.xml Tue May 27 14:21:41 2008
@@ -24,20 +24,42 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+ <!-- Tools includes custom packagings, install as extension to pick them up -->
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>verify-legal-files</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <!-- Do not Fail the build if no legal files were found-->
+ <configuration>
+ <strict>false</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
Modified: geronimo/daytrader/trunk/modules/ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ear/pom.xml?rev=660709&r1=660708&r2=660709&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ear/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ear/pom.xml Tue May 27 14:21:41 2008
@@ -63,8 +63,47 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <properties>
+ <projectName>Apache Geronimo Daytrader</projectName>
+ </properties>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+ <!-- Tools includes custom packagings, install as extension to pick them up -->
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>verify-legal-files</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <!-- Do not Fail the build if no legal files were found-->
+ <configuration>
+ <strict>false</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-ear-plugin</artifactId>
- <version>2.3</version>
+ <version>2.3.1</version>
<configuration>
<displayName>DayTrader 2.0</displayName>
<description>DayTrader Stock Trading Performance Benchmark Sample</description>
Propchange: geronimo/daytrader/trunk/modules/ear/src/main/resources/META-INF/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/daytrader/trunk/modules/ear/src/main/resources/META-INF/LICENSE
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/daytrader/trunk/modules/ear/src/main/resources/META-INF/LICENSE
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/daytrader/trunk/modules/ear/src/main/resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/daytrader/trunk/modules/ear/src/main/resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/daytrader/trunk/modules/ear/src/main/resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/daytrader/trunk/modules/json-proxy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/json-proxy/pom.xml?rev=660709&r1=660708&r2=660709&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/json-proxy/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/json-proxy/pom.xml Tue May 27 14:21:41 2008
@@ -24,24 +24,47 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+ <!-- Tools includes custom packagings, install as extension to pick them up -->
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>verify-legal-files</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <!-- Do not Fail the build if no legal files were found-->
+ <configuration>
+ <strict>false</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
Propchange: geronimo/daytrader/trunk/modules/web/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/daytrader/trunk/modules/web/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/daytrader/trunk/modules/web/src/main/webapp/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/META-INF/LICENSE?rev=660709&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/META-INF/LICENSE (added)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/META-INF/LICENSE Tue May 27 14:21:41 2008
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
Added: geronimo/daytrader/trunk/modules/web/src/main/webapp/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/META-INF/NOTICE?rev=660709&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/META-INF/NOTICE (added)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/META-INF/NOTICE Tue May 27 14:21:41 2008
@@ -0,0 +1,9 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were developed at IBM and donated to the
+ASF under the Apache 2.0 license. The former work was referred to
+as Trade 6.
Modified: geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml?rev=660709&r1=660708&r2=660709&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml Tue May 27 14:21:41 2008
@@ -181,7 +181,7 @@
<adminobject-interface>javax.jms.Topic</adminobject-interface>
<adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
<adminobject-instance>
- <message-destination-name>jms/TradeStreamerTopic</message-destination-name>
+ <message-destination-name>TradeStreamerTopic</message-destination-name>
<config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
</adminobject-instance>
</adminobject>
@@ -333,19 +333,43 @@
<adminobject-interface>javax.jms.Topic</adminobject-interface>
<adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
<adminobject-instance>
- <message-destination-name>jms/TradeStreamerTopic</message-destination-name>
+ <message-destination-name>TradeStreamerTopic</message-destination-name>
<config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
</adminobject-instance>
</adminobject>
-
+ <adminobject>
+ <adminobject-interface>javax.jms.Topic</adminobject-interface>
+ <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
+ <adminobject-instance>
+ <message-destination-name>DTStreamerTopic3</message-destination-name>
+ <config-property-setting name="PhysicalName">DTStreamerTopic3</config-property-setting>
+ </adminobject-instance>
+ </adminobject>
+
<adminobject>
<adminobject-interface>javax.jms.Queue</adminobject-interface>
<adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
<adminobject-instance>
- <message-destination-name>jms/TradeBrokerQueue</message-destination-name>
+ <message-destination-name>TradeBrokerQueue</message-destination-name>
<config-property-setting name="PhysicalName">TradeBrokerQueue</config-property-setting>
</adminobject-instance>
</adminobject>
+ <adminobject>
+ <adminobject-interface>javax.jms.Queue</adminobject-interface>
+ <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
+ <adminobject-instance>
+ <message-destination-name>DTBrokerQueue3</message-destination-name>
+ <config-property-setting name="PhysicalName">DTBrokerQueue3</config-property-setting>
+ </adminobject-instance>
+ </adminobject>
+ <adminobject>
+ <adminobject-interface>javax.jms.Queue</adminobject-interface>
+ <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
+ <adminobject-instance>
+ <message-destination-name>TestQueue</message-destination-name>
+ <config-property-setting name="PhysicalName">TestQueue</config-property-setting>
+ </adminobject-instance>
+ </adminobject>
</connector>
</ext-module>
</application>
Modified: geronimo/daytrader/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/pom.xml?rev=660709&r1=660708&r2=660709&view=diff
==============================================================================
--- geronimo/daytrader/trunk/pom.xml (original)
+++ geronimo/daytrader/trunk/pom.xml Tue May 27 14:21:41 2008
@@ -15,17 +15,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.genesis.config</groupId>
<artifactId>project-config</artifactId>
- <version>1.2</version>
+ <version>1.4</version>
</parent>
<groupId>org.apache.geronimo.daytrader</groupId>
@@ -34,6 +31,27 @@
<packaging>pom</packaging>
<version>2.0-SNAPSHOT</version>
<description>Java EE 5.0 Performance Benchmark Sample Application</description>
+
+ <properties>
+ <!-- This property is required by the car:package mojo -->
+ <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+
+ <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
+ <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
+ <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
+ <clientDeployer>org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car</clientDeployer>
+ <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${geronimoVersion}/car</connectorDeployer>
+ <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car</openejbDeployer>
+ <openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${geronimoVersion}/car</openejbcorbaDeployer>
+ <axisDeployer>org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</axisDeployer>
+ <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car</cxfDeployer>
+ <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car</axis2Deployer>
+ <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
+ <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
+ <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
+ <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
+ </properties>
+
<issueManagement>
<system>jira</system>
<url>http://issues.apache.org/jira/browse/GERONIMO</url>
@@ -127,64 +145,41 @@
<module>modules/json-proxy</module>
<module>modules/dojo-ui-web</module>
<module>modules/dojo-ui-ear</module>
- </modules>
+ <module>daytrader-derby-datasource</module>
+ <module>daytrader-jms</module>
+ <module>daytrader-jetty</module>
+ <module>daytrader-tomcat</module>
+ </modules>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
- <version>[1.0,3.0)</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>[1.0,2.0)</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-qname_1.1_spec</artifactId>
- <version>[1.0,2.0)</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>[1.0,2.0)</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
- <version>[1.0,2.0)</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
</dependencies>
</dependencyManagement>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <version>${geronimoVersion}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <category>Daytrader</category>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
@@ -219,24 +214,6 @@
<!-- Tools includes custom packagings, install as extension to pick them up -->
<extensions>true</extensions>
<executions>
- <!--
- NOTE: This will copy LICENSE.txt and NOTICE.txt to classes/META-INF.
-
- Its a itty-bitty HACK to avoid adding resource definitions to
- the build, which causes the Eclipse plugin to generate invalid
- .classpath files. :-(
- -->
- <execution>
- <id>install-legal-files</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-legal-files</goal>
- </goals>
- <configuration>
- <!-- Fail the build if no legal files were copied -->
- <strict>true</strict>
- </configuration>
- </execution>
<execution>
<id>verify-legal-files</id>
<phase>verify</phase>
@@ -270,37 +247,9 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/geronimo/daytrader/tags</tagBase>
- </configuration>
- </plugin>
</plugins>
</build>
- <repositories>
- <!--
- NOTE: The default repositories are picked up by Genesis, but need to
- specify where Genesis lives to pick it up + any additional repositories.
- -->
- <repository>
- <id>apache-snapshots</id>
- <name>Apache Snapshots Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <layout>default</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
<profiles>
<profile>
@@ -337,4 +286,4 @@
</modules>
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file