geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
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 GMT
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



Mime
View raw message