You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2010/01/18 20:34:13 UTC
svn commit: r900523 - in /incubator/aries/trunk/daytrader-sample: ./
assemblies/ assemblies/assembly-equinox/
assemblies/assembly-equinox/src/main/resources/configuration/ modules/
modules/daytrader-api/ modules/daytrader-beans/ modules/daytrader-core/...
Author: jbohn
Date: Mon Jan 18 19:34:12 2010
New Revision: 900523
URL: http://svn.apache.org/viewvc?rev=900523&view=rev
Log:
ARIES-117 make the version 1.0.0-incubating-SNAPSHOT
Modified:
incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/pom.xml
incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/configuration/config.ini
incubator/aries/trunk/daytrader-sample/assemblies/pom.xml
incubator/aries/trunk/daytrader-sample/modules/daytrader-api/pom.xml
incubator/aries/trunk/daytrader-sample/modules/daytrader-beans/pom.xml
incubator/aries/trunk/daytrader-sample/modules/daytrader-core/pom.xml
incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/pom.xml
incubator/aries/trunk/daytrader-sample/modules/daytrader-util/pom.xml
incubator/aries/trunk/daytrader-sample/modules/daytrader-web/pom.xml
incubator/aries/trunk/daytrader-sample/modules/daytrader-web/src/main/resources/WEB-INF/geronimo-web.xml
incubator/aries/trunk/daytrader-sample/modules/pom.xml
incubator/aries/trunk/daytrader-sample/pom.xml
Modified: incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/pom.xml?rev=900523&r1=900522&r2=900523&view=diff
==============================================================================
--- incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/pom.xml (original)
+++ incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/pom.xml Mon Jan 18 19:34:12 2010
@@ -21,12 +21,12 @@
<parent>
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>assemblies</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>assembly-equinox</artifactId>
<name>Apache Aries daytrader sample assembly</name>
- <version>1.0.0</version>
+ <version>1.0.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<dependencies>
Modified: incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/configuration/config.ini?rev=900523&r1=900522&r2=900523&view=diff
==============================================================================
--- incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/configuration/config.ini (original)
+++ incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/configuration/config.ini Mon Jan 18 19:34:12 2010
@@ -1,3 +1,3 @@
-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,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.jndi-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,daytrader-util-1.0.0.jar@start,daytrader-beans-1.0.0.jar@start,daytrader-api-1.0.0.jar@start,daytrader-core-1.0.0.jar@start,daytrader-persist-jdbc-1.0.0.jar@start,daytrader-web-1.0.0.jar@start
+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,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.jndi-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,daytrader-util-1.0.0-incubating-SNAPSHOT.jar@start,daytrader-beans-1.0.0-incubating-SNAPSHOT.jar@start,daytrader-api-1.0.0-incubating-SNAPSHOT.jar@start,daytrader-core-1.0.0-incubating-SNAPSHOT.jar@start,daytrader-persist-jdbc-1.0.0-incubating-SNAPSHOT.jar@start,daytrader-web-1.0.0-incubating-SNAPSHOT.jar@start
eclipse.ignoreApp=true
org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG
\ No newline at end of file
Modified: incubator/aries/trunk/daytrader-sample/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/assemblies/pom.xml?rev=900523&r1=900522&r2=900523&view=diff
==============================================================================
--- incubator/aries/trunk/daytrader-sample/assemblies/pom.xml (original)
+++ incubator/aries/trunk/daytrader-sample/assemblies/pom.xml Mon Jan 18 19:34:12 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.daytrader</groupId>
Modified: incubator/aries/trunk/daytrader-sample/modules/daytrader-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/daytrader-api/pom.xml?rev=900523&r1=900522&r2=900523&view=diff
==============================================================================
--- incubator/aries/trunk/daytrader-sample/modules/daytrader-api/pom.xml (original)
+++ incubator/aries/trunk/daytrader-sample/modules/daytrader-api/pom.xml Mon Jan 18 19:34:12 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>modules</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.daytrader.modules</groupId>
@@ -68,13 +68,12 @@
<Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Version>${pom.version}</Bundle-Version>
<Export-Package>
- org.apache.geronimo.samples.daytrader.api;version=1.0.0,
- org.apache.geronimo.samples.daytrader.persistence.api;version=1.0.0
+ org.apache.geronimo.samples.daytrader.api;version="${pom.version}",
+ org.apache.geronimo.samples.daytrader.persistence.api;version="${pom.version}"
</Export-Package>
<Import-Package>
- org.apache.geronimo.samples.daytrader.api;version=1.0,
- <!--org.apache.geronimo.samples.daytrader.beans;version=1.0,-->
- org.apache.geronimo.samples.daytrader.util;version=1.0
+ org.apache.geronimo.samples.daytrader.api,
+ org.apache.geronimo.samples.daytrader.util
</Import-Package>
</instructions>
</configuration>
Modified: incubator/aries/trunk/daytrader-sample/modules/daytrader-beans/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/daytrader-beans/pom.xml?rev=900523&r1=900522&r2=900523&view=diff
==============================================================================
--- incubator/aries/trunk/daytrader-sample/modules/daytrader-beans/pom.xml (original)
+++ incubator/aries/trunk/daytrader-sample/modules/daytrader-beans/pom.xml Mon Jan 18 19:34:12 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>modules</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.daytrader.modules</groupId>
@@ -60,12 +60,12 @@
<Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Version>${pom.version}</Bundle-Version>
<Export-Package>
- org.apache.geronimo.samples.daytrader.beans;version=1.0.0
+ org.apache.geronimo.samples.daytrader.beans;version="${pom.version}"
</Export-Package>
<Import-Package>
- org.apache.geronimo.samples.daytrader.beans;version=1.0,
- org.apache.geronimo.samples.daytrader.util;version=1.0,
- org.apache.geronimo.samples.daytrader.persistence.api;version=1.0,
+ org.apache.geronimo.samples.daytrader.beans,
+ org.apache.geronimo.samples.daytrader.util,
+ org.apache.geronimo.samples.daytrader.persistence.api
</Import-Package>
</instructions>
</configuration>
Modified: incubator/aries/trunk/daytrader-sample/modules/daytrader-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/daytrader-core/pom.xml?rev=900523&r1=900522&r2=900523&view=diff
==============================================================================
--- incubator/aries/trunk/daytrader-sample/modules/daytrader-core/pom.xml (original)
+++ incubator/aries/trunk/daytrader-sample/modules/daytrader-core/pom.xml Mon Jan 18 19:34:12 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>modules</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.daytrader.modules</groupId>
@@ -66,13 +66,12 @@
<Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Version>${pom.version}</Bundle-Version>
<Export-Package>
- <!--org.apache.geronimo.samples.daytrader.core;version=1.0.0-->
+ <!--org.apache.geronimo.samples.daytrader.core;version="${pom.version}"-->
</Export-Package>
<Import-Package>
- org.apache.geronimo.samples.daytrader.api;version=1.0,
- <!--org.apache.geronimo.samples.daytrader.beans;version=1.0,-->
- org.apache.geronimo.samples.daytrader.persistence.api;version=1.0,
- org.apache.geronimo.samples.daytrader.util;version=1.0,
+ org.apache.geronimo.samples.daytrader.api,
+ org.apache.geronimo.samples.daytrader.persistence.api,
+ org.apache.geronimo.samples.daytrader.util,
javax.naming,
javax.sql,
org.apache.derby.jdbc
Modified: incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/pom.xml?rev=900523&r1=900522&r2=900523&view=diff
==============================================================================
--- incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/pom.xml (original)
+++ incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/pom.xml Mon Jan 18 19:34:12 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>modules</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.daytrader.modules</groupId>
@@ -79,13 +79,13 @@
<Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Version>${pom.version}</Bundle-Version>
<Export-Package>
- <!--org.apache.geronimo.samples.daytrader.persist.jdbc;version=1.0.0-->
+ <!--org.apache.geronimo.samples.daytrader.persist.jdbc;version="${pom.version}"-->
</Export-Package>
<Import-Package>
- org.apache.geronimo.samples.daytrader.api;version=1.0,
- org.apache.geronimo.samples.daytrader.beans;version=1.0,
- org.apache.geronimo.samples.daytrader.persistence.api;version=1.0,
- org.apache.geronimo.samples.daytrader.util;version=1.0,
+ org.apache.geronimo.samples.daytrader.api,
+ org.apache.geronimo.samples.daytrader.beans,
+ org.apache.geronimo.samples.daytrader.persistence.api,
+ org.apache.geronimo.samples.daytrader.util,
javax.naming,
javax.sql,
org.apache.derby.jdbc
Modified: incubator/aries/trunk/daytrader-sample/modules/daytrader-util/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/daytrader-util/pom.xml?rev=900523&r1=900522&r2=900523&view=diff
==============================================================================
--- incubator/aries/trunk/daytrader-sample/modules/daytrader-util/pom.xml (original)
+++ incubator/aries/trunk/daytrader-sample/modules/daytrader-util/pom.xml Mon Jan 18 19:34:12 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>modules</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.daytrader.modules</groupId>
@@ -36,13 +36,6 @@
<artifactId>commons-logging</artifactId>
<scope>provided</scope>
</dependency>
-<!--
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
--->
</dependencies>
<build>
@@ -60,7 +53,9 @@
<instructions>
<Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Version>${pom.version}</Bundle-Version>
- <Export-Package>org.apache.geronimo.samples.daytrader.util;version=1.0.0</Export-Package>
+ <Export-Package>
+ org.apache.geronimo.samples.daytrader.util;version="${pom.version}"
+ </Export-Package>
<Import-Package>
org.apache.geronimo.samples.daytrader.util;version=1.0,
org.apache.commons.logging,
Modified: incubator/aries/trunk/daytrader-sample/modules/daytrader-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/daytrader-web/pom.xml?rev=900523&r1=900522&r2=900523&view=diff
==============================================================================
--- incubator/aries/trunk/daytrader-sample/modules/daytrader-web/pom.xml (original)
+++ incubator/aries/trunk/daytrader-sample/modules/daytrader-web/pom.xml Mon Jan 18 19:34:12 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>modules</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.daytrader.modules</groupId>
@@ -113,10 +113,9 @@
<Web-ContextPath>/daytrader</Web-ContextPath>
<Web-JSPExtractLocation>/</Web-JSPExtractLocation>
<Import-Package>
- <!--org.apache.geronimo.samples.daytrader.beans;version=1.0,-->
- org.apache.geronimo.samples.daytrader.api;version=1.0,
- org.apache.geronimo.samples.daytrader.persistence.api;version=1.0,
- org.apache.geronimo.samples.daytrader.util;version=1.0,
+ org.apache.geronimo.samples.daytrader.api,
+ org.apache.geronimo.samples.daytrader.persistence.api,
+ org.apache.geronimo.samples.daytrader.util,
javax.naming,
javax.servlet,
javax.servlet.http,
Modified: incubator/aries/trunk/daytrader-sample/modules/daytrader-web/src/main/resources/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/daytrader-web/src/main/resources/WEB-INF/geronimo-web.xml?rev=900523&r1=900522&r2=900523&view=diff
==============================================================================
--- incubator/aries/trunk/daytrader-sample/modules/daytrader-web/src/main/resources/WEB-INF/geronimo-web.xml (original)
+++ incubator/aries/trunk/daytrader-sample/modules/daytrader-web/src/main/resources/WEB-INF/geronimo-web.xml Mon Jan 18 19:34:12 2010
@@ -25,7 +25,7 @@
<sys:moduleId>
<sys:groupId>org.apache.geronimo.daytrader.modules</sys:groupId>
<sys:artifactId>daytrader-web</sys:artifactId>
- <sys:version>1.0.0</sys:version>
+ <sys:version>1.0.0-incubating-SNAPSHOT</sys:version>
</sys:moduleId>
<sys:dependencies>
Modified: incubator/aries/trunk/daytrader-sample/modules/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/pom.xml?rev=900523&r1=900522&r2=900523&view=diff
==============================================================================
--- incubator/aries/trunk/daytrader-sample/modules/pom.xml (original)
+++ incubator/aries/trunk/daytrader-sample/modules/pom.xml Mon Jan 18 19:34:12 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.daytrader</groupId>
Modified: incubator/aries/trunk/daytrader-sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/pom.xml?rev=900523&r1=900522&r2=900523&view=diff
==============================================================================
--- incubator/aries/trunk/daytrader-sample/pom.xml (original)
+++ incubator/aries/trunk/daytrader-sample/pom.xml Mon Jan 18 19:34:12 2010
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geronimo.daytrader</groupId>
- <version>1.0.0</version>
+ <version>1.0.0-incubating-SNAPSHOT</version>
<artifactId>daytrader-parent</artifactId>
<name>DayTrader :: Performance Benchmark Sample</name>
<packaging>pom</packaging>