Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 80068 invoked from network); 29 Jun 2010 02:25:07 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 29 Jun 2010 02:25:07 -0000 Received: (qmail 5726 invoked by uid 500); 29 Jun 2010 02:25:07 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 5683 invoked by uid 500); 29 Jun 2010 02:25:07 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 5670 invoked by uid 99); 29 Jun 2010 02:25:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Jun 2010 02:25:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Jun 2010 02:25:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 39D96238890A; Tue, 29 Jun 2010 02:23:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r958804 - in /geronimo/samples/branches/3.0-M1: ./ samples/ samples/javaee5/timereport/timereport-war/src/main/webapp/login/ samples/javaee6/ samples/osgi/ samples/osgi/aries-datasource/ samples/osgi/aries-datasource/src/ samples/osgi/aries... Date: Tue, 29 Jun 2010 02:23:37 -0000 To: scm@geronimo.apache.org From: xiaming@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100629022337.39D96238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xiaming Date: Tue Jun 29 02:23:36 2010 New Revision: 958804 URL: http://svn.apache.org/viewvc?rev=958804&view=rev Log: GERONIMO-5399 Add a datasource project for aries samples and attempt a plugin wrapper for ariestrader-jdbc assembly Added: geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/ geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/pom.xml (with props) geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/ geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/ geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/history/ geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/history/dependencies.xml (with props) geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/plan/ geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/plan/plan.xml (with props) geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/ geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/pom.xml (with props) geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/ geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/ geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/history/ geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/history/dependencies.xml (with props) geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/plan/ geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/plan/plan.xml (with props) Modified: geronimo/samples/branches/3.0-M1/pom.xml geronimo/samples/branches/3.0-M1/samples/javaee5/timereport/timereport-war/src/main/webapp/login/login_error.jsp geronimo/samples/branches/3.0-M1/samples/javaee5/timereport/timereport-war/src/main/webapp/login/logout.jsp geronimo/samples/branches/3.0-M1/samples/javaee6/pom.xml geronimo/samples/branches/3.0-M1/samples/osgi/pom.xml geronimo/samples/branches/3.0-M1/samples/pom.xml Modified: geronimo/samples/branches/3.0-M1/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/pom.xml?rev=958804&r1=958803&r2=958804&view=diff ============================================================================== --- geronimo/samples/branches/3.0-M1/pom.xml (original) +++ geronimo/samples/branches/3.0-M1/pom.xml Tue Jun 29 02:23:36 2010 @@ -40,9 +40,9 @@ - scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk - scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk - http://svn.apache.org/repos/asf/geronimo/samples/trunk + scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/branches/3.0-M1 + scm:svn:https:http://svn.apache.org/repos/asf/geronimo/samples/branches/3.0-M1 + http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1 Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/timereport/timereport-war/src/main/webapp/login/login_error.jsp URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/timereport/timereport-war/src/main/webapp/login/login_error.jsp?rev=958804&r1=958803&r2=958804&view=diff ============================================================================== --- geronimo/samples/branches/3.0-M1/samples/javaee5/timereport/timereport-war/src/main/webapp/login/login_error.jsp (original) +++ geronimo/samples/branches/3.0-M1/samples/javaee5/timereport/timereport-war/src/main/webapp/login/login_error.jsp Tue Jun 29 02:23:36 2010 @@ -25,7 +25,7 @@ under the License.

Invalid user name or password


- Home + Home
\ No newline at end of file Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/timereport/timereport-war/src/main/webapp/login/logout.jsp URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/timereport/timereport-war/src/main/webapp/login/logout.jsp?rev=958804&r1=958803&r2=958804&view=diff ============================================================================== --- geronimo/samples/branches/3.0-M1/samples/javaee5/timereport/timereport-war/src/main/webapp/login/logout.jsp (original) +++ geronimo/samples/branches/3.0-M1/samples/javaee5/timereport/timereport-war/src/main/webapp/login/logout.jsp Tue Jun 29 02:23:36 2010 @@ -29,7 +29,7 @@ under the License.

You have now logged out.

- Return to Main Page + Return to Main Page
\ No newline at end of file Modified: geronimo/samples/branches/3.0-M1/samples/javaee6/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee6/pom.xml?rev=958804&r1=958803&r2=958804&view=diff ============================================================================== --- geronimo/samples/branches/3.0-M1/samples/javaee6/pom.xml (original) +++ geronimo/samples/branches/3.0-M1/samples/javaee6/pom.xml Tue Jun 29 02:23:36 2010 @@ -165,7 +165,7 @@ converter-javaee6 jarresource-javaee6 fileupload-javaee6 - webfragment-javaee6 + + + + + + + 4.0.0 + + + org.apache.geronimo.samples + osgi + 3.0-M1-SNAPSHOT + + + aries-datasource + Geronimo Plugins, Aries Sample Datasource :: Shared Aries Sample Datasource + car + + + Shared datasource plugin for all aries samples + + + + + org.apache.geronimo.framework + geronimo-gbean-deployer + ${geronimoVersion} + car + provided + + + + org.apache.geronimo.configs + j2ee-deployer + ${geronimoVersion} + car + provided + + + + org.apache.geronimo.configs + connector-deployer-1_6 + ${geronimoVersion} + car + provided + + + + org.apache.geronimo.configs + transaction-1_6 + ${geronimoVersion} + car + + + + org.apache.geronimo.modules + geronimo-derby + ${geronimoVersion} + + + + org.apache.geronimo.framework + geronimo-jdbc + ${geronimoVersion} + + + + org.tranql + tranql-connector-derby-embed-xa + 1.6 + rar + + + + + + + + + org.apache.geronimo.buildsupport + car-maven-plugin + + + ${gbeanDeployer} + ${j2eeDeployer} + ${connectorDeployer} + + + org.tranql + tranql-connector-derby-embed-xa + 1.6 + rar + + + true + true + + + + + + + Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/history/dependencies.xml?rev=958804&view=auto ============================================================================== --- geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/history/dependencies.xml (added) +++ geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/history/dependencies.xml Tue Jun 29 02:23:36 2010 @@ -0,0 +1,29 @@ + + + + org.apache.geronimo.samples + aries-datasource + 3.0-M1-SNAPSHOT + car + + + org.apache.geronimo.configs + transaction-1_6 + car + + + org.apache.geronimo.framework + geronimo-jdbc + jar + + + org.apache.geronimo.modules + geronimo-derby + jar + + + org.tranql + tranql-connector-derby-embed-xa + rar + + Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/history/dependencies.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/history/dependencies.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/history/dependencies.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/plan/plan.xml URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/plan/plan.xml?rev=958804&view=auto ============================================================================== --- geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/plan/plan.xml (added) +++ geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/plan/plan.xml Tue Jun 29 02:23:36 2010 @@ -0,0 +1,215 @@ + + + + + + + + + + javax.sql.DataSource + + + jdbc/blogdb + jdbc/blogdb + + + blogDB + true + + + + + + 100 + 5000 + + + + + + jdbc/blogdbnojta + jdbc/blogdbnojta + + + blogDB + true + + + + 100 + 5000 + + + + + + + + jdbc/TradeDataSource + jdbc/TradeDataSource + + + tradedb + true + + + + + + 100 + 5000 + + + + + + jdbc/NoTxTradeDataSource + jdbc/NoTxTradeDataSource + + + tradedb + true + + + + 100 + 5000 + + + + + + + + + + + + + +create table holdingejb + (purchaseprice decimal(10, 2), + holdingid integer not null, + quantity double not null, + purchasedate timestamp, + account_accountid integer, + quote_symbol varchar(250), + optLock integer); + +alter table holdingejb + add constraint pk_holdingejb primary key (holdingid); + +create table accountprofileejb + (address varchar(250), + passwd varchar(250), + userid varchar(250) not null, + email varchar(250), + creditcard varchar(250), + fullname varchar(250), + optLock integer); + +alter table accountprofileejb + add constraint pk_accountprofile2 primary key (userid); + +create table quoteejb + (low decimal(10, 2), + open1 decimal(10, 2), + volume double not null, + price decimal(10, 2), + high decimal(10, 2), + companyname varchar(250), + symbol varchar(250) not null, + change1 double not null, + optLock integer); + +alter table quoteejb + add constraint pk_quoteejb primary key (symbol); + +create table keygenejb + (keyval integer not null, + keyname varchar(250) not null); + +alter table keygenejb + add constraint pk_keygenejb primary key (keyname); + +create table accountejb + (creationdate timestamp, + openbalance decimal(10, 2), + logoutcount integer not null, + balance decimal(10, 2), + accountid integer not null, + lastlogin timestamp, + logincount integer not null, + PROFILE_USERID VARCHAR(250), + optLock integer); + +alter table accountejb + add constraint pk_accountejb primary key (accountid); + +create table orderejb + (orderfee decimal(10, 2), + completiondate timestamp, + ordertype varchar(250), + orderstatus varchar(250), + price decimal(10, 2), + quantity double not null, + opendate timestamp, + orderid integer not null, + account_accountid integer, + quote_symbol varchar(250), + holding_holdingid integer, + optLock integer); + +alter table orderejb + add constraint pk_orderejb primary key (orderid); + +create index profile_userid on accountejb(profile_userid); +create index account_accountid on holdingejb(account_accountid); +create index account_accountidt on orderejb(account_accountid); +create index holding_holdingid on orderejb(holding_holdingid); +create index orderstatus on orderejb(orderstatus); +create index ordertype on orderejb(ordertype); + + + jdbc/TradeDataSource + + + + + +CREATE TABLE AUTHOR (email VARCHAR(255) NOT NULL, bio VARCHAR(255), displayName VARCHAR(255), dob TIMESTAMP, name VARCHAR(255), PRIMARY KEY (email)); +CREATE TABLE AUTHOR_BLOGENTRY (AUTHOR_EMAIL VARCHAR(255), POSTS_ID BIGINT); +CREATE TABLE BLOGENTRY (id BIGINT NOT NULL, blogText VARCHAR(10000), publishDate TIMESTAMP, title VARCHAR(255), updatedDate TIMESTAMP, AUTHOR_EMAIL VARCHAR(255), PRIMARY KEY (id)); +CREATE TABLE COMMENT (id BIGINT NOT NULL, comment VARCHAR(255), creationDate TIMESTAMP, AUTHOR_EMAIL VARCHAR(255), BLOGENTRY_ID BIGINT); +CREATE TABLE OPENJPA_SEQUENCE_TABLE (ID SMALLINT NOT NULL, SEQUENCE_VALUE BIGINT, PRIMARY KEY (ID)); +CREATE INDEX I_THR_TRY_AUTHOR_EMAIL ON AUTHOR_BLOGENTRY (AUTHOR_EMAIL); +CREATE INDEX I_THR_TRY_ELEMENT ON AUTHOR_BLOGENTRY (POSTS_ID); +CREATE INDEX I_BLGNTRY_AUTHOR ON BLOGENTRY (AUTHOR_EMAIL); +DELETE FROM AUTHOR; +DELETE FROM AUTHOR_BLOGENTRY; +DELETE FROM BLOGENTRY; +DELETE FROM COMMENT; +DELETE FROM OPENJPA_SEQUENCE_TABLE; + + + jdbc/blogdb + + + + Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/plan/plan.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/plan/plan.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/plan/plan.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/pom.xml?rev=958804&view=auto ============================================================================== --- geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/pom.xml (added) +++ geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/pom.xml Tue Jun 29 02:23:36 2010 @@ -0,0 +1,132 @@ + + + + + + + + 4.0.0 + + + org.apache.geronimo.samples + osgi + 3.0-M1-SNAPSHOT + + + ariestrader-jdbc + Geronimo Plugins :: AriesTrader JDBC EBA plugin + car + + + Geronimo Plugins :: AriesTrader JDBC EBA plugin + + + + + org.apache.aries.samples.ariestrader + org.apache.aries.samples.ariestrader.jdbc + ${ariesVersion} + eba + + + + org.apache.geronimo.samples + aries-datasource + ${project.version} + car + + + + org.apache.geronimo.framework + geronimo-gbean-deployer + ${geronimoVersion} + car + provided + + + + org.apache.geronimo.configs + aries-deployer + ${geronimoVersion} + car + provided + + + + + + + + + + + + org.apache.geronimo.buildsupport + car-maven-plugin + + + ${gbeanDeployer} + + ${ariesDeployer} + + + + org.apache.aries.samples.ariestrader + org.apache.aries.samples.ariestrader.jdbc + ${ariesVersion} + eba + + + true + true + + + + + + + Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/history/dependencies.xml?rev=958804&view=auto ============================================================================== --- geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/history/dependencies.xml (added) +++ geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/history/dependencies.xml Tue Jun 29 02:23:36 2010 @@ -0,0 +1,19 @@ + + + + org.apache.geronimo.samples + ariestrader-jdbc-tomcat + 3.0-M1-SNAPSHOT + car + + + org.apache.aries.samples.ariestrader + org.apache.aries.samples.ariestrader.jdbc + eba + + + org.apache.geronimo.samples + aries-datasource + car + + Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/history/dependencies.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/history/dependencies.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/history/dependencies.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/plan/plan.xml URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/plan/plan.xml?rev=958804&view=auto ============================================================================== --- geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/plan/plan.xml (added) +++ geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/plan/plan.xml Tue Jun 29 02:23:36 2010 @@ -0,0 +1,20 @@ + + + + + Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/plan/plan.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/plan/plan.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/plan/plan.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: geronimo/samples/branches/3.0-M1/samples/osgi/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/osgi/pom.xml?rev=958804&r1=958803&r2=958804&view=diff ============================================================================== --- geronimo/samples/branches/3.0-M1/samples/osgi/pom.xml (original) +++ geronimo/samples/branches/3.0-M1/samples/osgi/pom.xml Tue Jun 29 02:23:36 2010 @@ -34,20 +34,7 @@ - org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car - org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car - org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car - org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car - org.apache.geronimo.configs/connector-deployer/${geronimoVersion}/car - org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car - org.apache.geronimo.configs/openejb-corba-deployer/${geronimoVersion}/car - org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car - org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car - org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car - org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car - org.apache.geronimo.configs/${jetty}-deployer/${geronimoVersion}/car - org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car - org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car + 0.1-incubating @@ -93,11 +80,11 @@ - + + org.apache.geronimo.buildsupport car-maven-plugin - + --> @@ -120,7 +107,9 @@ true - + + aries-datasource + @@ -135,5 +124,13 @@ + + all-subprojects + + + aries-datasource + ariestrader-jdbc + + Modified: geronimo/samples/branches/3.0-M1/samples/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/pom.xml?rev=958804&r1=958803&r2=958804&view=diff ============================================================================== --- geronimo/samples/branches/3.0-M1/samples/pom.xml (original) +++ geronimo/samples/branches/3.0-M1/samples/pom.xml Tue Jun 29 02:23:36 2010 @@ -46,6 +46,7 @@ org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car org.apache.geronimo.configs/persistence-jpa20-deployer/${geronimoVersion}/car org.apache.geronimo.configs/myfaces-deployer/${geronimoVersion}/car + org.apache.geronimo.configs/aries-deployer/${geronimoVersion}/car