From scm-return-8097-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Fri Oct 07 04:25:19 2005 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 87197 invoked from network); 7 Oct 2005 04:25:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 7 Oct 2005 04:25:19 -0000 Received: (qmail 49802 invoked by uid 500); 7 Oct 2005 04:25:18 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 49612 invoked by uid 500); 7 Oct 2005 04:25:17 -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 49524 invoked by uid 99); 7 Oct 2005 04:25:16 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Oct 2005 21:25:16 -0700 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 06 Oct 2005 21:25:20 -0700 Received: (qmail 86410 invoked by uid 65534); 7 Oct 2005 04:22:59 -0000 Message-ID: <20051007042259.86408.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r307000 - in /geronimo/trunk/sandbox/daytrader: bin/ modules/core/ modules/core/src/conf/ modules/core/target/ modules/ear/ modules/ear/src/META-INF/ modules/ear/src/application/ modules/ear/src/application/META-INF/ modules/ejb/ modules/ej... Date: Fri, 07 Oct 2005 04:22:57 -0000 To: scm@geronimo.apache.org From: hogstrom@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: hogstrom Date: Thu Oct 6 21:22:49 2005 New Revision: 307000 URL: http://svn.apache.org/viewcvs?rev=307000&view=rev Log: Hacked a fix to avoid JNDI lookup problems at application initialization Added: geronimo/trunk/sandbox/daytrader/modules/ear/src/application/ geronimo/trunk/sandbox/daytrader/modules/ear/src/application/META-INF/ - copied from r295061, geronimo/trunk/sandbox/daytrader/modules/ear/src/META-INF/ Removed: geronimo/trunk/sandbox/daytrader/modules/core/src/conf/ geronimo/trunk/sandbox/daytrader/modules/core/target/ geronimo/trunk/sandbox/daytrader/modules/ear/src/META-INF/ Modified: geronimo/trunk/sandbox/daytrader/bin/depderbyresources.sh geronimo/trunk/sandbox/daytrader/bin/undepresources.sh geronimo/trunk/sandbox/daytrader/modules/core/project.properties geronimo/trunk/sandbox/daytrader/modules/ear/project.properties geronimo/trunk/sandbox/daytrader/modules/ejb/project.properties geronimo/trunk/sandbox/daytrader/modules/ejb/src/java/org/apache/geronimo/samples/daytrader/direct/TradeDirect.java geronimo/trunk/sandbox/daytrader/modules/streamer/project.properties geronimo/trunk/sandbox/daytrader/modules/web/project.properties geronimo/trunk/sandbox/daytrader/modules/wsappclient/project.properties Modified: geronimo/trunk/sandbox/daytrader/bin/depderbyresources.sh URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/daytrader/bin/depderbyresources.sh?rev=307000&r1=306999&r2=307000&view=diff ============================================================================== --- geronimo/trunk/sandbox/daytrader/bin/depderbyresources.sh (original) +++ geronimo/trunk/sandbox/daytrader/bin/depderbyresources.sh Thu Oct 6 21:22:49 2005 @@ -52,8 +52,4 @@ GERONIMO_HOME=$PRGDIR/../../../modules/assembly/target/geronimo-1.0-SNAPSHOT echo $GERONIMO_HOME -#java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager deploy ${GERONIMO_HOME}/repository/tranql/rars/tranql-connector-derby-embed-xa-1.0-SNAPSHOT.rar derby-plan.xml -#java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager deploy ${GERONIMO_HOME}/repository/tranql/rars/tranql-connector-1.0-20050716.rar mydb2-plan.xml -#java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager deploy ${GERONIMO_HOME}/repository/activemq/rars/activemq-ra-3.2-SNAPSHOT.rar jms-resource-plan.xml -#java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager deploy dayTrader.ear dayTrader-plan-fixed.xml java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager deploy /home/hogstrom/.maven/repository/daytrader/ears/daytrader-ear-1.0-SNAPSHOT.ear dayTrader-plan.xml Modified: geronimo/trunk/sandbox/daytrader/bin/undepresources.sh URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/daytrader/bin/undepresources.sh?rev=307000&r1=306999&r2=307000&view=diff ============================================================================== --- geronimo/trunk/sandbox/daytrader/bin/undepresources.sh (original) +++ geronimo/trunk/sandbox/daytrader/bin/undepresources.sh Thu Oct 6 21:22:49 2005 @@ -3,9 +3,9 @@ export GERONIMO_HOME=/home/hogstrom/geronimo/geronimo/modules/assembly/target/geronimo-1.0-SNAPSHOT java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager stop Trade -java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager stop TradeDataSource -java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager stop TradeJMS +#java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager stop TradeDataSource +#java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager stop TradeJMS java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager undeploy Trade -java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager undeploy TradeDataSource -java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager undeploy TradeJMS +#java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager undeploy TradeDataSource +#java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager undeploy TradeJMS Modified: geronimo/trunk/sandbox/daytrader/modules/core/project.properties URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/daytrader/modules/core/project.properties?rev=307000&r1=306999&r2=307000&view=diff ============================================================================== --- geronimo/trunk/sandbox/daytrader/modules/core/project.properties (original) +++ geronimo/trunk/sandbox/daytrader/modules/core/project.properties Thu Oct 6 21:22:49 2005 @@ -1,11 +1 @@ -maven.xdoc.date=left -maven.ejb.src=${maven.build.dir}/xdoclet/ejb -maven.eclipse.classpath.include=${maven.build.dir}/xdoclet/ejbdoclet,src/test-cactus -maven.xdoclet.ejbdoclet.utilobject.0.cacheHomes=true -maven.xdoclet.ejbdoclet.utilobject.0.includeGUID=true -maven.xdoclet.ejbdoclet.dataobject.0=true -maven.xdoclet.ejbdoclet.entityfacade.0=true -maven.xdoclet.ejbdoclet.valueobject.0=true -maven.xdoclet.ejbdoclet.deploymentdescriptor.0.validateXML=true -cactus.src.mergewebxml = src/conf/cactus-web.xml -cactus.is.ear=true +maven.multiproject.type=jar Modified: geronimo/trunk/sandbox/daytrader/modules/ear/project.properties URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/daytrader/modules/ear/project.properties?rev=307000&r1=306999&r2=307000&view=diff ============================================================================== --- geronimo/trunk/sandbox/daytrader/modules/ear/project.properties (original) +++ geronimo/trunk/sandbox/daytrader/modules/ear/project.properties Thu Oct 6 21:22:49 2005 @@ -1 +1 @@ -maven.ear.appxml=${maven.ear.src}/META-INF/application.xml +maven.multiproject.type=ear Modified: geronimo/trunk/sandbox/daytrader/modules/ejb/project.properties URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/daytrader/modules/ejb/project.properties?rev=307000&r1=306999&r2=307000&view=diff ============================================================================== --- geronimo/trunk/sandbox/daytrader/modules/ejb/project.properties (original) +++ geronimo/trunk/sandbox/daytrader/modules/ejb/project.properties Thu Oct 6 21:22:49 2005 @@ -1,3 +1 @@ -maven.xdoc.date=left -maven.ejb.src=${maven.build.dir}/xdoclet/ejb -maven.eclipse.classpath.include=${maven.build.dir}/xdoclet/ejbdoclet +maven.multiproject.properties=ejb Modified: geronimo/trunk/sandbox/daytrader/modules/ejb/src/java/org/apache/geronimo/samples/daytrader/direct/TradeDirect.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/daytrader/modules/ejb/src/java/org/apache/geronimo/samples/daytrader/direct/TradeDirect.java?rev=307000&r1=306999&r2=307000&view=diff ============================================================================== --- geronimo/trunk/sandbox/daytrader/modules/ejb/src/java/org/apache/geronimo/samples/daytrader/direct/TradeDirect.java (original) +++ geronimo/trunk/sandbox/daytrader/modules/ejb/src/java/org/apache/geronimo/samples/daytrader/direct/TradeDirect.java Thu Oct 6 21:22:49 2005 @@ -2232,7 +2232,7 @@ if (initialized) return; if (Log.doTrace()) Log.trace("TradeDirect:init -- *** initializing"); - try +/* try { if (Log.doTrace()) Log.trace("TradeDirect: init"); @@ -2267,7 +2267,7 @@ catch (Exception e) { Log.error("TradeDirect:init -- error looking up TradeEJB -- Asynchronous 1-phase will not work", e); - } + } */ if (Log.doTrace()) Log.trace("TradeDirect:init -- +++ initialized"); Modified: geronimo/trunk/sandbox/daytrader/modules/streamer/project.properties URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/daytrader/modules/streamer/project.properties?rev=307000&r1=306999&r2=307000&view=diff ============================================================================== --- geronimo/trunk/sandbox/daytrader/modules/streamer/project.properties (original) +++ geronimo/trunk/sandbox/daytrader/modules/streamer/project.properties Thu Oct 6 21:22:49 2005 @@ -1,5 +1,2 @@ -maven.xdoc.date=left -maven.ejb.src=${maven.build.dir}/xdoclet/ejb -cactus.src.mergewebxml = src/conf/cactus-web.xml -cactus.is.ear=true +maven.multiproject.type=jar maven.jar.manifest=src/client/META-INF/MANIFEST.MF Modified: geronimo/trunk/sandbox/daytrader/modules/web/project.properties URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/daytrader/modules/web/project.properties?rev=307000&r1=306999&r2=307000&view=diff ============================================================================== --- geronimo/trunk/sandbox/daytrader/modules/web/project.properties (original) +++ geronimo/trunk/sandbox/daytrader/modules/web/project.properties Thu Oct 6 21:22:49 2005 @@ -1,10 +1 @@ -maven.xdoc.date=left -maven.eclipse.classpath.include=src/test-cactus -maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet -maven.xdoclet.webdoclet.0=true -maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.0.mergeDir=src/merge -maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge -maven.xdoclet.webdoclet.jsptaglib.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF/tld -cactus.src.mergewebxml = src/conf/cactus-web.xml +maven.multiproject.type=war Modified: geronimo/trunk/sandbox/daytrader/modules/wsappclient/project.properties URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/daytrader/modules/wsappclient/project.properties?rev=307000&r1=306999&r2=307000&view=diff ============================================================================== --- geronimo/trunk/sandbox/daytrader/modules/wsappclient/project.properties (original) +++ geronimo/trunk/sandbox/daytrader/modules/wsappclient/project.properties Thu Oct 6 21:22:49 2005 @@ -1,3 +1,2 @@ -cactus.src.mergewebxml = src/conf/cactus-web.xml +maven.multiproject.type=jar maven.jar.manifest=src/client/META-INF/MANIFEST.MF -cactus.is.ear=true