geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
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 GMT
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 @@
     </description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk</developerConnection>
-        <url>http://svn.apache.org/repos/asf/geronimo/samples/trunk</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/branches/3.0-M1</connection>
+        <developerConnection>scm:svn:https:http://svn.apache.org/repos/asf/geronimo/samples/branches/3.0-M1</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1</url>
     </scm>
 
     <properties>

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.
 <CENTER>
     <H1>Invalid user name or password</H1>
     <BR>
-    <A href="/timereport/index.jsp">Home</A>
+    <A href="<%= request.getContextPath() %>/index.jsp">Home</A>
 </CENTER>
 </BODY>
 </HTML>
\ 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.
 
     <H2>You have now logged out.</H2>
 
-    <A href="/timereport/index.jsp">Return to Main Page</A>
+    <A href="<%= request.getContextPath() %>/index.jsp">Return to Main Page</A>
     <CENTER>
 </BODY>
 </HTML>
\ 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 @@
                 <module>converter-javaee6</module>
                 <module>jarresource-javaee6</module>
                 <module>fileupload-javaee6</module>
-                <module>webfragment-javaee6</module>
+                <!--<module>webfragment-javaee6</module>-->
                 <!--EJB 3.1 and JPA 2.0 samples, not work for 3.0-M1 yet-->
                 <!--<module>jpa20demo-javaee6</module>     
                 <module>ejbtimer-javaee6</module>                

Added: geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/pom.xml?rev=958804&view=auto
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/pom.xml (added)
+++ geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/pom.xml Tue Jun 29 02:23:36
2010
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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$ -->
+
+<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.samples</groupId>
+        <artifactId>osgi</artifactId>
+        <version>3.0-M1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>aries-datasource</artifactId>
+    <name>Geronimo Plugins, Aries Sample Datasource :: Shared Aries Sample Datasource</name>
+    <packaging>car</packaging>
+
+    <description>
+        Shared datasource plugin for all aries samples
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer-1_6</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transaction-1_6</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-derby</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-jdbc</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-xa</artifactId>
+            <version>1.6</version>
+            <type>rar</type>
+            <!--<scope>provided</scope>-->
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.tranql</groupId>
+                        <artifactId>tranql-connector-derby-embed-xa</artifactId>
+                        <version>1.6</version>
+                        <type>rar</type>
+                    </module>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>                    
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>aries-datasource</artifactId>
+        <version>3.0-M1-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>transaction-1_6</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-jdbc</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-derby</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.tranql</groupId>
+        <artifactId>tranql-connector-derby-embed-xa</artifactId>
+        <type>rar</type>
+    </dependency>
+</plugin-artifact>

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 @@
+<?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$ -->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+    <resourceadapter>
+        <outbound-resourceadapter>
+            <connection-definition>
+                <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+
+                <connectiondefinition-instance>
+                    <name>jdbc/blogdb</name>
+                    <jndi-name>jdbc/blogdb</jndi-name>
+                    <config-property-setting name="UserName"></config-property-setting>
+                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="DatabaseName">blogDB</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>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <select-one-assume-match/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+                <connectiondefinition-instance>
+                    <name>jdbc/blogdbnojta</name>
+                    <jndi-name>jdbc/blogdbnojta</jndi-name>
+                    <config-property-setting name="UserName"></config-property-setting>
+                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="DatabaseName">blogDB</config-property-setting>
+                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <connectionmanager>
+                        <no-transaction/>
+                        <single-pool>
+                            <max-size>100</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <select-one-assume-match/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+
+
+                <connectiondefinition-instance>
+                    <name>jdbc/TradeDataSource</name>
+                    <jndi-name>jdbc/TradeDataSource</jndi-name>
+                    <config-property-setting name="UserName"></config-property-setting>
+                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="DatabaseName">tradedb</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>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <select-one-assume-match/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+                <connectiondefinition-instance>
+                    <name>jdbc/NoTxTradeDataSource</name>
+                    <jndi-name>jdbc/NoTxTradeDataSource</jndi-name>
+                    <config-property-setting name="UserName"></config-property-setting>
+                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <connectionmanager>
+                        <no-transaction/>
+                        <single-pool>
+                            <max-size>100</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <select-one-assume-match/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+
+
+            </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>
+
+
+    <gbean name="DBInitializationTrader" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
+<attribute name="sql">
+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);
+</attribute>
+        <reference name="DataSource">
+            <name>jdbc/TradeDataSource</name>
+        </reference>
+    </gbean>
+
+    <gbean name="DBInitializationBlog" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
+<attribute name="sql">
+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;
+</attribute>
+        <reference name="DataSource">
+            <name>jdbc/blogdb</name>
+        </reference>
+    </gbean>
+
+</connector>

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 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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$ -->
+
+<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.samples</groupId>
+        <artifactId>osgi</artifactId>
+        <version>3.0-M1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>ariestrader-jdbc</artifactId>
+    <name>Geronimo Plugins :: AriesTrader JDBC EBA plugin</name>
+    <packaging>car</packaging>
+
+    <description>
+        Geronimo Plugins :: AriesTrader JDBC EBA plugin
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.aries.samples.ariestrader</groupId>
+            <artifactId>org.apache.aries.samples.ariestrader.jdbc</artifactId>
   
+            <version>${ariesVersion}</version>
+            <type>eba</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>aries-datasource</artifactId>    
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>aries-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <!--<dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>${tomcat}-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>       
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-aries-builder</artifactId>
+            <version>${geronimoVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-aries-resolver</artifactId>
+            <version>${geronimoVersion}</version>
+            <scope>provided</scope>
+        </dependency>-->
+
+        
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${j2eeDeployer}</deploymentConfig>-->
+                        <deploymentConfig>${ariesDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>-->
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.aries.samples.ariestrader</groupId>
+                        <artifactId>org.apache.aries.samples.ariestrader.jdbc</artifactId>
   
+                        <version>${ariesVersion}</version>
+                        <type>eba</type>
+                    </module>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>                    
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>ariestrader-jdbc-tomcat</artifactId>
+        <version>3.0-M1-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.aries.samples.ariestrader</groupId>
+        <artifactId>org.apache.aries.samples.ariestrader.jdbc</artifactId>
+        <type>eba</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>aries-datasource</artifactId>
+        <type>car</type>
+    </dependency>
+</plugin-artifact>

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 @@
+<?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.
+-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
   
+
+</module>

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 @@
     </description>
 
     <properties>
-        <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>
-        <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${geronimoVersion}/car</jettyDeployer>
-        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
-        <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
+        <ariesVersion>0.1-incubating</ariesVersion>        
     </properties>
 
     
@@ -93,11 +80,11 @@
         </pluginManagement>
 
         <plugins>     
-            <plugin>
+            <!--<plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>              
             </plugin>       
-            <!--<plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>                
             </plugin>
@@ -105,12 +92,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ear-plugin</artifactId>                
-            </plugin>-->
+            </plugin>
 
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>              
-            </plugin>
+            </plugin>-->
         </plugins>
     </build>
 
@@ -120,7 +107,9 @@
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            <modules>                
+            <modules>
+                <module>aries-datasource</module>
+                <!--<module>ariestrader-jdbc</module>-->
             </modules>
         </profile>
         <profile>
@@ -135,5 +124,13 @@
             <modules>                
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            
+            <modules>
+                <module>aries-datasource</module>
+                <module>ariestrader-jdbc</module>
+            </modules>
+        </profile>
     </profiles>   
 </project>

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 @@
         <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
         <jpaDeployer>org.apache.geronimo.configs/persistence-jpa20-deployer/${geronimoVersion}/car</jpaDeployer>
         <myfacesDeployer>org.apache.geronimo.configs/myfaces-deployer/${geronimoVersion}/car</myfacesDeployer>
+        <ariesDeployer>org.apache.geronimo.configs/aries-deployer/${geronimoVersion}/car</ariesDeployer>
     </properties>
 
     <build>



Mime
View raw message