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 22:40:33 UTC

svn commit: r900579 [2/2] - in /incubator/aries/trunk/ariestrader-sample: assemblies/ariestrader-jdbc-eba/src/main/resources/META-INF/ modules/ariestrader-api/ modules/ariestrader-api/src/main/java/org/apache/aries/ modules/ariestrader-api/src/main/jav...

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2Include.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2Include.java?rev=900579&r1=900556&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2Include.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2Include.java Mon Jan 18 21:40:30 2010
@@ -14,15 +14,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.samples.daytrader.web.prims;
+package org.apache.aries.samples.daytrader.web.prims;
 
 import java.io.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-import org.apache.geronimo.samples.daytrader.util.*;
+import org.apache.aries.samples.daytrader.util.*;
 
-import org.apache.geronimo.samples.daytrader.*;
+import org.apache.aries.samples.daytrader.*;
 
 /**
  *

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2IncludeRcv.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2IncludeRcv.java?rev=900579&r1=900556&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2IncludeRcv.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2IncludeRcv.java Mon Jan 18 21:40:30 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.samples.daytrader.web.prims;
+package org.apache.aries.samples.daytrader.web.prims;
 
 import java.io.*;
 import javax.servlet.*;

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2JNDI.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2JNDI.java?rev=900579&r1=900556&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2JNDI.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2JNDI.java Mon Jan 18 21:40:30 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.samples.daytrader.web.prims;
+package org.apache.aries.samples.daytrader.web.prims;
 
 import java.io.*;
 import javax.servlet.*;
@@ -22,9 +22,9 @@
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
 
-import org.apache.geronimo.samples.daytrader.util.*;
+import org.apache.aries.samples.daytrader.util.*;
 
-import org.apache.geronimo.samples.daytrader.*;
+import org.apache.aries.samples.daytrader.*;
 
 /**
  * 

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2Jsp.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2Jsp.java?rev=900579&r1=900556&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2Jsp.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2Jsp.java Mon Jan 18 21:40:30 2010
@@ -14,13 +14,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.samples.daytrader.web.prims;
+package org.apache.aries.samples.daytrader.web.prims;
 
 import java.io.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-import org.apache.geronimo.samples.daytrader.util.*;
+import org.apache.aries.samples.daytrader.util.*;
 
 
 /**

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2Servlet.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2Servlet.java?rev=900579&r1=900556&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2Servlet.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2Servlet.java Mon Jan 18 21:40:30 2010
@@ -14,13 +14,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.samples.daytrader.web.prims;
+package org.apache.aries.samples.daytrader.web.prims;
 
 import java.io.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-import org.apache.geronimo.samples.daytrader.util.*;
+import org.apache.aries.samples.daytrader.util.*;
 
 
 /**

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2ServletRcv.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2ServletRcv.java?rev=900579&r1=900556&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2ServletRcv.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServlet2ServletRcv.java Mon Jan 18 21:40:30 2010
@@ -14,13 +14,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.samples.daytrader.web.prims;
+package org.apache.aries.samples.daytrader.web.prims;
 
 import java.io.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-import org.apache.geronimo.samples.daytrader.util.*;
+import org.apache.aries.samples.daytrader.util.*;
 
 
 /**

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServletWriter.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServletWriter.java?rev=900579&r1=900556&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServletWriter.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingServletWriter.java Mon Jan 18 21:40:30 2010
@@ -14,13 +14,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.samples.daytrader.web.prims;
+package org.apache.aries.samples.daytrader.web.prims;
 
 import java.io.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-import org.apache.geronimo.samples.daytrader.util.*;
+import org.apache.aries.samples.daytrader.util.*;
 
 
 /**

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingSession1.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingSession1.java?rev=900579&r1=900556&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingSession1.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingSession1.java Mon Jan 18 21:40:30 2010
@@ -14,13 +14,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.samples.daytrader.web.prims;
+package org.apache.aries.samples.daytrader.web.prims;
 
 import java.io.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-import org.apache.geronimo.samples.daytrader.util.*;
+import org.apache.aries.samples.daytrader.util.*;
 
 /**
  *

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingSession2.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingSession2.java?rev=900579&r1=900556&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingSession2.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingSession2.java Mon Jan 18 21:40:30 2010
@@ -14,13 +14,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.samples.daytrader.web.prims;
+package org.apache.aries.samples.daytrader.web.prims;
 
 import java.io.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-import org.apache.geronimo.samples.daytrader.util.*;
+import org.apache.aries.samples.daytrader.util.*;
 
 /**
  *

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingSession3.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingSession3.java?rev=900579&r1=900556&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingSession3.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingSession3.java Mon Jan 18 21:40:30 2010
@@ -14,13 +14,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.samples.daytrader.web.prims;
+package org.apache.aries.samples.daytrader.web.prims;
 
 import java.io.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-import org.apache.geronimo.samples.daytrader.util.*;
+import org.apache.aries.samples.daytrader.util.*;
 
 /**
  * 

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingSession3Object.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingSession3Object.java?rev=900579&r1=900556&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingSession3Object.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/daytrader/web/prims/PingSession3Object.java Mon Jan 18 21:40:30 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.samples.daytrader.web.prims;
+package org.apache.aries.samples.daytrader.web.prims;
 
 import java.io.*;
 

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/PingJspEL.jsp
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/PingJspEL.jsp?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/PingJspEL.jsp (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/PingJspEL.jsp Mon Jan 18 21:40:30 2010
@@ -20,7 +20,7 @@
 	<title>PingJspEL</title>
 </head>
 <body>
-<%@ page import="org.apache.geronimo.samples.daytrader.util.*,org.apache.geronimo.samples.daytrader.persistence.api.*" session="false" %>
+<%@ page import="org.apache.aries.samples.daytrader.util.*,org.apache.aries.samples.daytrader.persistence.api.*" session="false" %>
 
 <%!
 int hitCount = 0;

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/PingServlet2Jsp.jsp
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/PingServlet2Jsp.jsp?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/PingServlet2Jsp.jsp (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/PingServlet2Jsp.jsp Mon Jan 18 21:40:30 2010
@@ -25,7 +25,7 @@
 <BODY>
 <%! String initTime = (new java.util.Date()).toString(); 
  %>
-<jsp:useBean id="ab" type="org.apache.geronimo.samples.daytrader.web.prims.PingBean" scope="request" />
+<jsp:useBean id="ab" type="org.apache.aries.samples.daytrader.web.prims.PingBean" scope="request" />
 <HR>
 <FONT size="+2" color="#000066"><BR>
 Ping Servlet2JSP:<BR>

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/WEB-INF/geronimo-web.xml?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/WEB-INF/geronimo-web.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/WEB-INF/geronimo-web.xml Mon Jan 18 21:40:30 2010
@@ -23,14 +23,14 @@
         
         <sys:environment>
             <sys:moduleId>
-                <sys:groupId>org.apache.geronimo.daytrader.modules</sys:groupId>
+                <sys:groupId>org.apache.aries.daytrader.modules</sys:groupId>
                 <sys:artifactId>daytrader-web</sys:artifactId>
                 <sys:version>1.0.0-incubating-SNAPSHOT</sys:version>
             </sys:moduleId>
         
             <sys:dependencies>
                 <sys:dependency>
-                    <sys:groupId>org.apache.geronimo.daytrader.plugins</sys:groupId>
+                    <sys:groupId>org.apache.aries.daytrader.plugins</sys:groupId>
                     <sys:artifactId>daytrader-derby-datasource</sys:artifactId>
                 </sys:dependency>
             </sys:dependencies>

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/WEB-INF/web.xml?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/WEB-INF/web.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/WEB-INF/web.xml Mon Jan 18 21:40:30 2010
@@ -24,7 +24,7 @@
     <filter>
         <display-name>OrdersAlertFilter</display-name>
         <filter-name>OrdersAlertFilter</filter-name>
-        <filter-class>org.apache.geronimo.samples.daytrader.web.OrdersAlertFilter</filter-class>
+        <filter-class>org.apache.aries.samples.daytrader.web.OrdersAlertFilter</filter-class>
     </filter>
     <filter-mapping>
         <filter-name>OrdersAlertFilter</filter-name>
@@ -34,7 +34,7 @@
     <servlet>
         <display-name>TradeAppServlet</display-name>
         <servlet-name>TradeAppServlet</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.TradeAppServlet</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.TradeAppServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     
@@ -42,7 +42,7 @@
     <servlet>
         <display-name>TestServlet</display-name>
         <servlet-name>TestServlet</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.TestServlet</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.TestServlet</servlet-class>
     </servlet>
 -->
 <!-- Not sure why this is a necessary and it's causing a problem for pax-web so temporarily removed    
@@ -70,13 +70,13 @@
     <servlet>
         <display-name>TradeConfigServlet</display-name>
         <servlet-name>TradeConfigServlet</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.TradeConfigServlet</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.TradeConfigServlet</servlet-class>
     </servlet>
     
    <servlet>
         <display-name>TradeScenarioServlet</display-name>
         <servlet-name>TradeScenarioServlet</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.TradeScenarioServlet</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.TradeScenarioServlet</servlet-class>
         <init-param>
             <description>Sets the default RuntimeMode. Legal values include Full EJB3, Direct (JDBC), Session (EJB3) To Direct, Web JDBC, and Web JPA</description>
             <param-name>runTimeMode</param-name>
@@ -134,9 +134,9 @@
     
 <!-- JavaEE Only
     <servlet>
-        <display-name>org_apache_geronimo_samples_daytrader_TradeWSAction</display-name>
-        <servlet-name>org_apache_geronimo_samples_daytrader_TradeWSAction</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.soap.TradeWSAction</servlet-class>
+        <display-name>org_apache_aries_samples_daytrader_TradeWSAction</display-name>
+        <servlet-name>org_apache_aries_samples_daytrader_TradeWSAction</servlet-name>
+        <servlet-class>org.apache.aries.samples.daytrader.soap.TradeWSAction</servlet-class>
     </servlet>
 -->
     
@@ -144,72 +144,72 @@
     <servlet>
         <display-name>ExplicitGC</display-name>
         <servlet-name>ExplicitGC</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ExplicitGC</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.ExplicitGC</servlet-class>
     </servlet>
     <servlet>
         <display-name>PingServlet</display-name>
         <servlet-name>PingServlet</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.PingServlet</servlet-class>
     </servlet>
     <servlet>
         <display-name>PingServletWriter</display-name>
         <servlet-name>PingServletWriter</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServletWriter</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.PingServletWriter</servlet-class>
     </servlet>
     <servlet>
         <display-name>PingServlet2Servlet</display-name>
         <servlet-name>PingServlet2Servlet</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Servlet</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.PingServlet2Servlet</servlet-class>
     </servlet>
     <servlet>
         <display-name>PingServlet2ServletRcv</display-name>
         <servlet-name>PingServlet2ServletRcv</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2ServletRcv</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.PingServlet2ServletRcv</servlet-class>
     </servlet>
     <servlet>
         <display-name>PingServlet2Include</display-name>
         <servlet-name>PingServlet2Include</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Include</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.PingServlet2Include</servlet-class>
     </servlet>
     <servlet>
         <display-name>PingServlet2IncludeRcv</display-name>
         <servlet-name>PingServlet2IncludeRcv</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2IncludeRcv</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.PingServlet2IncludeRcv</servlet-class>
     </servlet>
     <servlet>
         <display-name>PingServlet2Jsp</display-name>
         <servlet-name>PingServlet2Jsp</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Jsp</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.PingServlet2Jsp</servlet-class>
     </servlet>
     <servlet>
         <display-name>PingSession1</display-name>
         <servlet-name>PingSession1</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingSession1</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.PingSession1</servlet-class>
     </servlet>
     <servlet>
         <display-name>PingSession2</display-name>
         <servlet-name>PingSession2</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingSession2</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.PingSession2</servlet-class>
     </servlet>
     <servlet>
         <display-name>PingSession3</display-name>
         <servlet-name>PingSession3</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingSession3</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.PingSession3</servlet-class>
     </servlet>
     <servlet>
         <display-name>PingJDBCRead</display-name>
         <servlet-name>PingJDBCRead</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingJDBCRead</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.PingJDBCRead</servlet-class>
     </servlet>
     <servlet>
         <display-name>PingJDBCWrite</display-name>
         <servlet-name>PingJDBCWrite</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingJDBCWrite</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.PingJDBCWrite</servlet-class>
     </servlet>
     <servlet>
         <display-name>PingServlet2JNDI</display-name>
         <servlet-name>PingServlet2JNDI</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2JNDI</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.PingServlet2JNDI</servlet-class>
     </servlet>
     <!-- End of Web container primitives -->
     
@@ -217,47 +217,47 @@
 <!-- JavaEE Only
     <servlet>
         <servlet-name>ejb3.PingServlet2Session</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2Session</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.ejb3.PingServlet2Session</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>ejb3.PingServlet2Entity</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2Entity</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.ejb3.PingServlet2Entity</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>ejb3.PingServlet2Session2Entity</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2Session2Entity</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.ejb3.PingServlet2Session2Entity</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>ejb3.PingServlet2Session2EntityCollection</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2Session2EntityCollection</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.ejb3.PingServlet2Session2EntityCollection</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>ejb3.PingServlet2Session2CMROne2One</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2Session2CMROne2One</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.ejb3.PingServlet2Session2CMROne2One</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>ejb3.PingServlet2Session2CMROne2Many</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2Session2CMROne2Many</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.ejb3.PingServlet2Session2CMROne2Many</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>ejb3.PingServlet2Session2JDBC</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2Session2JDBC</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.ejb3.PingServlet2Session2JDBC</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>ejb3.PingServlet2Session2JDBCCollection</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2Session2JDBCCollection</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.ejb3.PingServlet2Session2JDBCCollection</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>ejb3.PingServlet2MDBQueue</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2MDBQueue</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.ejb3.PingServlet2MDBQueue</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>ejb3.PingServlet2MDBTopic</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2MDBTopic</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.ejb3.PingServlet2MDBTopic</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>ejb3.PingServlet2TwoPhase</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2TwoPhase</servlet-class>
+        <servlet-class>org.apache.aries.samples.daytrader.web.prims.ejb3.PingServlet2TwoPhase</servlet-class>
     </servlet>
 -->
     <!-- End of EJB container primitives (EJB3) -->
@@ -283,7 +283,7 @@
     </servlet-mapping>
 <!-- JavaEE Only
     <servlet-mapping>
-        <servlet-name>org_apache_geronimo_samples_daytrader_TradeWSAction</servlet-name>
+        <servlet-name>org_apache_aries_samples_daytrader_TradeWSAction</servlet-name>
         <url-pattern>/services/TradeWSServices</url-pattern>
     </servlet-mapping>
 -->
@@ -437,13 +437,13 @@
     <ejb-ref>
         <ejb-ref-name>ejb/TradeSLSBBean</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <remote>org.apache.geronimo.samples.daytrader.ejb3.TradeSLSBRemote</remote>
+        <remote>org.apache.aries.samples.daytrader.ejb3.TradeSLSBRemote</remote>
         <ejb-link>TradeSLSBBean</ejb-link>
     </ejb-ref>
     <ejb-ref>
         <ejb-ref-name>ejb/DirectSLSBBean</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <remote>org.apache.geronimo.samples.daytrader.ejb3.DirectSLSBRemote</remote>
+        <remote>org.apache.aries.samples.daytrader.ejb3.DirectSLSBRemote</remote>
         <ejb-link>DirectSLSBBean</ejb-link>
     </ejb-ref>
 
@@ -463,12 +463,12 @@
     <service-ref>
         <description>WSDL Service Trade</description>
         <service-ref-name>service/Trade</service-ref-name>
-        <service-interface>org.apache.geronimo.samples.daytrader.client.ws.Trade</service-interface>
+        <service-interface>org.apache.aries.samples.daytrader.client.ws.Trade</service-interface>
         <wsdl-file>WEB-INF/wsdl/TradeServices.wsdl</wsdl-file>
         <jaxrpc-mapping-file>WEB-INF/TradeServicesClient_mapping.xml</jaxrpc-mapping-file>
-        <service-qname xmlns:pfx="http://daytrader.samples.geronimo.apache.org">pfx:Trade</service-qname>
+        <service-qname xmlns:pfx="http://daytrader.samples.aries.apache.org">pfx:Trade</service-qname>
         <port-component-ref>
-            <service-endpoint-interface>org.apache.geronimo.samples.daytrader.client.ws.TradeWSServices</service-endpoint-interface>
+            <service-endpoint-interface>org.apache.aries.samples.daytrader.client.ws.TradeWSServices</service-endpoint-interface>
         </port-component-ref>
     </service-ref>
 -->

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/account.jsp
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/account.jsp?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/account.jsp (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/account.jsp Mon Jan 18 21:40:30 2010
@@ -23,14 +23,14 @@
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
 <%@ page
-	import="java.util.Collection,java.util.Iterator,java.math.BigDecimal,org.apache.geronimo.samples.daytrader.api.*,org.apache.geronimo.samples.daytrader.persistence.api.*,org.apache.geronimo.samples.daytrader.util.*"
+	import="java.util.Collection,java.util.Iterator,java.math.BigDecimal,org.apache.aries.samples.daytrader.api.*,org.apache.aries.samples.daytrader.persistence.api.*,org.apache.aries.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
 <jsp:useBean id="accountData"
-	type="org.apache.geronimo.samples.daytrader.persistence.api.AccountDataBean"
+	type="org.apache.aries.samples.daytrader.persistence.api.AccountDataBean"
 	scope="request" />
 <jsp:useBean id="accountProfileData"
-	type="org.apache.geronimo.samples.daytrader.persistence.api.AccountProfileDataBean"
+	type="org.apache.aries.samples.daytrader.persistence.api.AccountProfileDataBean"
 	scope="request" />
 <jsp:useBean id="orderDataBeans" type="java.util.Collection"
 	scope="request" />

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/accountImg.jsp
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/accountImg.jsp?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/accountImg.jsp (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/accountImg.jsp Mon Jan 18 21:40:30 2010
@@ -23,14 +23,14 @@
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
 <%@ page
-	import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
+	import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.aries.samples.daytrader.api.*, org.apache.aries.samples.daytrader.persistence.api.*, org.apache.aries.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
 <jsp:useBean id="accountData"
-	type="org.apache.geronimo.samples.daytrader.persistence.api.AccountDataBean"
+	type="org.apache.aries.samples.daytrader.persistence.api.AccountDataBean"
 	scope="request" />
 <jsp:useBean id="accountProfileData"
-	type="org.apache.geronimo.samples.daytrader.persistence.api.AccountProfileDataBean"
+	type="org.apache.aries.samples.daytrader.persistence.api.AccountProfileDataBean"
 	scope="request" />
 <jsp:useBean id="orderDataBeans" type="java.util.Collection"
 	scope="request" />

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/config.jsp
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/config.jsp?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/config.jsp (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/config.jsp Mon Jan 18 21:40:30 2010
@@ -21,7 +21,7 @@
 <TITLE>Welcome to DayTrader</TITLE>
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099">
-<%@ page import="java.util.ArrayList, org.apache.geronimo.samples.daytrader.util.TradeConfig, org.apache.geronimo.samples.daytrader.api.*"
+<%@ page import="java.util.ArrayList, org.apache.aries.samples.daytrader.util.TradeConfig, org.apache.aries.samples.daytrader.api.*"
 	session="false" isThreadSafe="true" isErrorPage="false"%>
 
 <% 

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/displayQuote.jsp
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/displayQuote.jsp?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/displayQuote.jsp (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/displayQuote.jsp Mon Jan 18 21:40:30 2010
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <%@ page
-	import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
+	import="java.math.BigDecimal, org.apache.aries.samples.daytrader.api.*, org.apache.aries.samples.daytrader.persistence.api.*, org.apache.aries.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 <% 
     String symbol = request.getParameter("symbol");

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/marketSummary.jsp
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/marketSummary.jsp?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/marketSummary.jsp (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/marketSummary.jsp Mon Jan 18 21:40:30 2010
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <%@ page
-	import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
+	import="java.util.Collection, java.util.Iterator, org.apache.aries.samples.daytrader.api.*, org.apache.aries.samples.daytrader.persistence.api.*, org.apache.aries.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 
 <%

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/order.jsp
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/order.jsp?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/order.jsp (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/order.jsp Mon Jan 18 21:40:30 2010
@@ -22,7 +22,7 @@
 
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.aries.samples.daytrader.api.*, org.apache.aries.samples.daytrader.persistence.api.*, org.apache.aries.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
 
 <TABLE height="54">

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/orderImg.jsp
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/orderImg.jsp?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/orderImg.jsp (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/orderImg.jsp Mon Jan 18 21:40:30 2010
@@ -22,7 +22,7 @@
 
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.aries.samples.daytrader.api.*, org.apache.aries.samples.daytrader.persistence.api.*, org.apache.aries.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
 
 <TABLE height="54">

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/portfolio.jsp
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/portfolio.jsp?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/portfolio.jsp (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/portfolio.jsp Mon Jan 18 21:40:30 2010
@@ -22,7 +22,7 @@
 <LINK rel="stylesheet" href="style.css" type="text/css" />
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.aries.samples.daytrader.api.*, org.apache.aries.samples.daytrader.persistence.api.*, org.apache.aries.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
 <jsp:useBean id="holdingDataBeans" type="java.util.Collection" scope="request" />
 <jsp:useBean id="quoteDataBeans" type="java.util.Collection" scope="request"/>

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/portfolioImg.jsp
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/portfolioImg.jsp?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/portfolioImg.jsp (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/portfolioImg.jsp Mon Jan 18 21:40:30 2010
@@ -23,7 +23,7 @@
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
 <%@ page
-	import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
+	import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.aries.samples.daytrader.api.*, org.apache.aries.samples.daytrader.persistence.api.*, org.apache.aries.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
 <jsp:useBean id="holdingDataBeans" type="java.util.Collection"

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/quote.jsp
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/quote.jsp?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/quote.jsp (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/quote.jsp Mon Jan 18 21:40:30 2010
@@ -23,7 +23,7 @@
 </HEAD>
 
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.aries.samples.daytrader.api.*, org.apache.aries.samples.daytrader.persistence.api.*, org.apache.aries.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
 
 <TABLE height="54">
   <TBODY>

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/quoteImg.jsp
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/quoteImg.jsp?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/quoteImg.jsp (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/quoteImg.jsp Mon Jan 18 21:40:30 2010
@@ -24,7 +24,7 @@
 
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
 <%@ page
-	import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
+	import="java.util.Collection, java.util.Iterator, org.apache.aries.samples.daytrader.api.*, org.apache.aries.samples.daytrader.persistence.api.*, org.apache.aries.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 
 <TABLE height="54">

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/runStats.jsp
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/runStats.jsp?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/runStats.jsp (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/runStats.jsp Mon Jan 18 21:40:30 2010
@@ -21,11 +21,11 @@
 <TITLE>Welcome to Trade</TITLE>
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099">
-<%@ page import="org.apache.geronimo.samples.daytrader.util.*"
+<%@ page import="org.apache.aries.samples.daytrader.util.*"
 	session="false" isThreadSafe="true" isErrorPage="false"%>
 
 <jsp:useBean
-	class="org.apache.geronimo.samples.daytrader.persistence.api.RunStatsDataBean"
+	class="org.apache.aries.samples.daytrader.persistence.api.RunStatsDataBean"
 	id="runStatsData" scope="request" />
 <% 
 double loginPercentage = (double) ((TradeConfig.getScenarioMixes())[TradeConfig.workloadMix][TradeConfig.LOGOUT_OP]) / 100.0;
@@ -72,9 +72,9 @@
 	<TBODY>
 		<TR>
 			<TD bgcolor="#c93333" align="left" width="640" height="10" colspan=5><B><FONT
-				color="#ffffff">DayTrader Scenario Runtime Statistics</FONT></B></TD>
+				color="#ffffff">AriesTrader Scenario Runtime Statistics</FONT></B></TD>
 			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
-				color="#ffffff"><B>DayTrader</B></FONT></TD>
+				color="#ffffff"><B>AriesTrader</B></FONT></TD>
 		</TR>
 	</TBODY>
 </TABLE>
@@ -308,13 +308,13 @@
 		</TR>
 		<TR>
 			<TD bgcolor="#c93333" align="left" width="640" height="10" colspan=5><B><FONT
-				color="#ffffff">DayTrader Scenario Runtime Statistics</FONT></B></TD>
+				color="#ffffff">AriesTrader Scenario Runtime Statistics</FONT></B></TD>
 			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
-				color="#ffffff"><B>DayTrader</B></FONT></TD>
+				color="#ffffff"><B>AriesTrader</B></FONT></TD>
 		</TR>
 		<TR>
-			<TD colspan="2" align="center">Apache Geronimo Performance Benchmark
-			Sample DayTrader<BR>
+			<TD colspan="2" align="center">Apache Aries Performance Benchmark
+			Sample AriesTrader<BR>
 			Copyright 2005, Apache Software Foundation</TD>
 		</TR>
 	</TBODY>

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/tradehome.jsp
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/tradehome.jsp?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/tradehome.jsp (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/tradehome.jsp Mon Jan 18 21:40:30 2010
@@ -23,11 +23,11 @@
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
 <%@ page
-	import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
+	import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.aries.samples.daytrader.api.*, org.apache.aries.samples.daytrader.persistence.api.*, org.apache.aries.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
 <jsp:useBean id="accountData"
-	type="org.apache.geronimo.samples.daytrader.persistence.api.AccountDataBean"
+	type="org.apache.aries.samples.daytrader.persistence.api.AccountDataBean"
 	scope="request" />
 <jsp:useBean id="holdingDataBeans" type="java.util.Collection"
 	scope="request" />

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/tradehomeImg.jsp
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/tradehomeImg.jsp?rev=900579&r1=900578&r2=900579&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/tradehomeImg.jsp (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-web/src/main/resources/tradehomeImg.jsp Mon Jan 18 21:40:30 2010
@@ -23,11 +23,11 @@
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
 <%@ page
-	import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
+	import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.aries.samples.daytrader.api.*, org.apache.aries.samples.daytrader.persistence.api.*, org.apache.aries.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
 <jsp:useBean id="accountData"
-	type="org.apache.geronimo.samples.daytrader.persistence.api.AccountDataBean"
+	type="org.apache.aries.samples.daytrader.persistence.api.AccountDataBean"
 	scope="request" />
 <jsp:useBean id="holdingDataBeans" type="java.util.Collection"
 	scope="request" />