incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r916399 - in /incubator/aries/trunk/ariestrader-sample/assemblies: ariestrader-all-equinox/ ariestrader-jdbc-equinox/ equinox-test-harness/ equinox-test-harness/src/ equinox-test-harness/src/main/ equinox-test-harness/src/main/resources/ eq...
Date Thu, 25 Feb 2010 19:06:43 GMT
Author: jbohn
Date: Thu Feb 25 19:06:43 2010
New Revision: 916399

URL: http://svn.apache.org/viewvc?rev=916399&view=rev
Log:
ARIES-203 Eliminate duplicate equinox assemblies and use a common equinox test harness for
AriesTrader

Added:
    incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/   (with props)
    incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/pom.xml   (with
props)
    incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/
    incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/
    incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/
    incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/configuration/
    incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/configuration/config.ini
    incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/tradeDB.sql
  (with props)
Removed:
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/

Propchange: incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 19:06:43 2010
@@ -0,0 +1,4 @@
+classpath
+.project
+.settings
+target

Added: incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/pom.xml?rev=916399&view=auto
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/pom.xml (added)
+++ incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/pom.xml Thu Feb
25 19:06:43 2010
@@ -0,0 +1,263 @@
+<?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.
+-->
+<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.aries.ariestrader</groupId>
+        <artifactId>assemblies</artifactId>
+        <version>1.0.0-incubating-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.aries.ariestrader.assemblies</groupId>
+    <artifactId>equinox-test-harness</artifactId>
+    <name>Equinox test harness that can be used to install sample EBAs</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+
+        <!--
+            External Dependencies
+        -->
+        <dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>osgi</artifactId>
+            <version>3.5.0.v20090520</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.equinox</groupId>
+            <artifactId>cm</artifactId>
+            <version>3.2.0-v20070116</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.osgi</groupId>
+            <artifactId>services</artifactId>
+            <version>3.1.200-v20070605</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-service</artifactId>
+            <version>1.4</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-extender-war</artifactId>
+            <version>0.7.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-jetty-bundle</artifactId>
+            <version>0.7.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-jsp</artifactId>
+            <version>0.7.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-pool</groupId>
+            <artifactId>commons-pool</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.serp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.fileinstall</artifactId>
+        </dependency>
+
+
+        <!--
+            Aries Dependencies
+        -->
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries</groupId>
+            <artifactId>org.apache.aries.util</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jndi</groupId>
+            <artifactId>org.apache.aries.jndi</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jpa</groupId>
+            <artifactId>org.apache.aries.jpa.container</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jpa</groupId>
+            <artifactId>org.apache.aries.jpa.container.context</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.transaction</groupId>
+            <artifactId>org.apache.aries.transaction.blueprint</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.transaction</groupId>
+            <artifactId>org.apache.aries.transaction.manager</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.install</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.api</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.management</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.runtime</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.utils</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+
+
+        <!--
+            Aries Trader Dependencies
+        -->
+        <dependency>
+            <groupId>org.apache.aries.ariestrader.modules</groupId>
+            <artifactId>ariestrader-derby-ds</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.ariestrader.assemblies</groupId>
+            <artifactId>ariestrader-all-eba</artifactId>
+            <version>${pom.version}</version>
+            <type>eba</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.ariestrader.assemblies</groupId>
+            <artifactId>ariestrader-jdbc-eba</artifactId>
+            <version>${pom.version}</version>
+            <type>eba</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <outputDirectory>${project.build.directory}</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>filter</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <excludeTransitive>true</excludeTransitive>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/configuration/config.ini?rev=916399&view=auto
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/configuration/config.ini
(added)
+++ incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/configuration/config.ini
Thu Feb 25 19:06:43 2010
@@ -0,0 +1,35 @@
+osgi.bundles=\
+cm-3.2.0-v20070116.jar@start,\
+services-3.1.200-v20070605.jar@start,\
+pax-logging-api-1.4.jar@start,\
+pax-logging-service-1.4.jar@start,\
+derby-10.5.3.0_1.jar@start,\
+commons-collections-3.2.1.jar@start,\
+commons-lang-2.4.jar@start,\
+commons-pool-1.5.3.jar@start,\
+org.apache.servicemix.bundles.serp-1.13.1_2.jar@start,\
+org.apache.servicemix.bundles.cglib-2.1_3_2.jar@start,\
+openjpa-2.0.0-SNAPSHOT.jar@start,\
+geronimo-jpa_2.0_spec-1.0.jar@start,\
+geronimo-jta_1.1_spec-1.1.1.jar@start,\
+pax-web-jetty-bundle-0.7.2.jar@start,\
+pax-web-extender-war-0.7.2.jar@start,\
+pax-web-jsp-0.7.2.jar@start,\
+org.apache.aries.application.install-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.application.management-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.application.api-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.application.utils-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.felix.fileinstall-2.0.8.jar@start,\
+org.apache.aries.application.runtime-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.jndi-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.jpa.container-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.jpa.container.context-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.util-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.blueprint-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.application.api-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.application.utils-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.transaction.blueprint-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.transaction.manager-1.0.0-incubating-SNAPSHOT.jar@start,\
+ariestrader-derby-ds-1.0.0-incubating-SNAPSHOT.jar@start
+eclipse.ignoreApp=true
+org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG
\ No newline at end of file

Added: incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/tradeDB.sql
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/tradeDB.sql?rev=916399&view=auto
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/tradeDB.sql
(added)
+++ incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/tradeDB.sql
Thu Feb 25 19:06:43 2010
@@ -0,0 +1,101 @@
+--
+-- 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.
+--
+
+connect 'jdbc:derby:tradedb;create=true';
+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);
+exit;

Propchange: incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/tradeDB.sql
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/tradeDB.sql
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/tradeDB.sql
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message