You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/11/25 08:36:16 UTC
svn commit: r1038940 - in /geronimo/daytrader/branches/2.1: README
daytrader-db2-datasource/pom.xml daytrader-oracle-datasource/pom.xml
daytrader-tomcat/pom.xml plans/pom.xml pom.xml repository/
Author: xiaming
Date: Thu Nov 25 07:36:15 2010
New Revision: 1038940
URL: http://svn.apache.org/viewvc?rev=1038940&view=rev
Log:
Do some cleanup
Removed:
geronimo/daytrader/branches/2.1/repository/
Modified:
geronimo/daytrader/branches/2.1/README
geronimo/daytrader/branches/2.1/daytrader-db2-datasource/pom.xml
geronimo/daytrader/branches/2.1/daytrader-oracle-datasource/pom.xml
geronimo/daytrader/branches/2.1/daytrader-tomcat/pom.xml
geronimo/daytrader/branches/2.1/plans/pom.xml
geronimo/daytrader/branches/2.1/pom.xml
Modified: geronimo/daytrader/branches/2.1/README
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/README?rev=1038940&r1=1038939&r2=1038940&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/README (original)
+++ geronimo/daytrader/branches/2.1/README Thu Nov 25 07:36:15 2010
@@ -104,7 +104,7 @@ Deployer
2. Use the deployer tool to install the application:
- Execute these commands from a command prompt:
cd $GERONIMO_HOME/bin
- deploy.[bat|sh] deploy $DAYTRADER_HOME/modules/ear/target/daytrader-ear-<version>.ear $DAYTRADER_HOME/plans/<My plan>
+ deploy.[bat|sh] deploy $DAYTRADER_HOME/modules/ear/target/daytrader-ear-<version>.ear $DAYTRADER_HOME/plans/target/classes/<My plan>
where <My plan> is
For Apache Derby: daytrader-derby-xa-plan.xml
For IBM DB2 v9.1: daytrader-db2-xa-plan.xml
@@ -113,7 +113,7 @@ Deployer
daytrader-sqlserver-xa-plan.xml
For MySQL: daytrader-mysql-xa-plan.xml
For Informix: daytrader-informix-xa-plan.xml
- For PostgreSQL: daytrader-postgre-xa-plan.xml
+ For PostgreSQL: daytrader-postgre-xa-plan.xml
3. Use the admin console to install the application:
- Under Applications -> Deploy New/Deployer
Modified: geronimo/daytrader/branches/2.1/daytrader-db2-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/daytrader-db2-datasource/pom.xml?rev=1038940&r1=1038939&r2=1038940&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/daytrader-db2-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/daytrader-db2-datasource/pom.xml Thu Nov 25 07:36:15 2010
@@ -50,7 +50,7 @@
<db2.groupid>com.ibm.db2</db2.groupid>
<db2.driver.artifactid>db2jcc</db2.driver.artifactid>
<db2.license.artifactid>db2jcc_license_cu</db2.license.artifactid>
- <db2.version>9.5</db2.version>
+ <db2.version>8.2</db2.version>
</properties>
<dependencies>
@@ -58,7 +58,7 @@
<groupId>org.tranql</groupId>
<artifactId>tranql-connector-db2-xa</artifactId>
<type>rar</type>
- <version>1.2</version>
+ <!--<version>1.2</version>-->
<scope>provided</scope>
</dependency>
<dependency>
Modified: geronimo/daytrader/branches/2.1/daytrader-oracle-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/daytrader-oracle-datasource/pom.xml?rev=1038940&r1=1038939&r2=1038940&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/daytrader-oracle-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/daytrader-oracle-datasource/pom.xml Thu Nov 25 07:36:15 2010
@@ -56,7 +56,7 @@
<groupId>org.tranql</groupId>
<artifactId>tranql-connector-oracle-xa</artifactId>
<type>rar</type>
- <version>1.3</version>
+ <!--<version>1.3</version>-->
<scope>provided</scope>
</dependency>
<dependency>
Modified: geronimo/daytrader/branches/2.1/daytrader-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/daytrader-tomcat/pom.xml?rev=1038940&r1=1038939&r2=1038940&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/daytrader-tomcat/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/daytrader-tomcat/pom.xml Thu Nov 25 07:36:15 2010
@@ -208,13 +208,13 @@
<echo>Copying manually generated geronimo-plugin.xml files for app daytrader ws client</echo>
<copy todir="${project.build.directory}/repository/org/apache/geronimo/daytrader/daytrader-ws-client/${version}/daytrader-ws-client-${version}.car/META-INF"
failonerror="false" overwrite="true">
- <fileset dir="${basedir}/../plans/wsclient" includes="geronimo-plugin.xml"/>
+ <fileset dir="${basedir}/../plans/target/classes/wsclient" includes="geronimo-plugin.xml"/>
</copy>
<echo>Copying manually generated geronimo-plugin.xml files for app daytrader streamer client</echo>
<copy todir="${project.build.directory}/repository/org/apache/geronimo/daytrader/daytrader-streamer-client/${version}/daytrader-streamer-client-${version}.car/META-INF"
failonerror="false" overwrite="true">
- <fileset dir="${basedir}/../plans/streamerclient" includes="geronimo-plugin.xml"/>
+ <fileset dir="${basedir}/../plans/target/classes/streamerclient" includes="geronimo-plugin.xml"/>
</copy>
<echo>Pack the daytrader ws client car file and install onto local repo</echo>
@@ -232,7 +232,7 @@
<arg value="-Dversion=${version}"/>
<arg value="-Dpackaging=car"/>
<arg value="-DgeneratePom=true"/>
- <arg value="-DcreateChecksum=true"/>
+ <arg value="-DcreateChecksum=true"/>
</exec>
<echo>Pack the daytrader streamer client car file and install onto local repo</echo>
@@ -251,7 +251,7 @@
<arg value="-Dversion=${version}"/>
<arg value="-Dpackaging=car"/>
<arg value="-DgeneratePom=true"/>
- <arg value="-DcreateChecksum=true"/>
+ <arg value="-DcreateChecksum=true"/>
</exec>
</tasks>
Modified: geronimo/daytrader/branches/2.1/plans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/plans/pom.xml?rev=1038940&r1=1038939&r2=1038940&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/plans/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/plans/pom.xml Thu Nov 25 07:36:15 2010
@@ -36,16 +36,9 @@
Contain all of daytrader geronimo deployment plans
</description>
- <!--<dependencies>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jasper-el</artifactId>
- </dependency>
- </dependencies>-->
-
+
<build>
- <!-- this cause mvn eclipse:eclipse failure on windows platform -->
- <resources>
+ <resources>
<resource>
<directory>
${basedir}/src/main/resources
@@ -55,73 +48,7 @@
<include>**/*.xml</include>
</includes>
</resource>
- </resources>
- <!--<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <filters>
- <filter>
- ${basedir}/src/main/webapp/WEB-INF/classes/build.properties
- </filter>
- </filters>
- <archive>
- <manifestEntries>
- <Class-Path>dt-ejb.jar streamer.jar wsappclient.jar</Class-Path>
- </manifestEntries>
- </archive>
- <resources>
- <resource
- implementation="org.apache.maven.model.Resource">
- <filtering>true</filtering>
- <directory>
- ${basedir}/src/main/webapp/WEB-INF
- </directory>
- <includes>
- <include>web.xml</include>
- </includes>
- </resource>
- </resources>
- <webResources>
- <resource>
- <directory>${project.build.outputDirectory}</directory>
- <includes>
- <include>META-INF/LICENSE*</include>
- <include>META-INF/NOTICE*</include>
- <include>META-INF/DISCLAIMER*</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <targetPath>docs</targetPath>
- <filtering>true</filtering>
- <includes>
- <include>**/tradeversion.html</include>
- </includes>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <configuration>
- <format>{0,date,yyyy/MM/dd}</format>
- <items>
- <item>timestamp</item>
- </items>
- </configuration>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>-->
+ </resources>
</build>
</project>
Modified: geronimo/daytrader/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/pom.xml?rev=1038940&r1=1038939&r2=1038940&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/pom.xml Thu Nov 25 07:36:15 2010
@@ -147,9 +147,9 @@
<url>http://www.apache.org/</url>
</organization>
- <modules>
- <!--<module>repository</module>-->
- <module>modules</module>
+ <modules>
+ <module>modules</module>
+ <module>plans</module>
<!-- c-m-p built plugins -->
<module>daytrader-derby-datasource</module>
<!-- see profiles -->
@@ -168,45 +168,7 @@
<version>${geronimoVersion}</version>
<type>pom</type>
<scope>import</scope>
- </dependency>
- <!--<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>4.1.2-G647819</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- <version>4.1.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activeio-core</artifactId>
- <version>3.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>-->
+ </dependency>
</dependencies>
</dependencyManagement>