aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r1059128 - in /aries/trunk/samples/ariestrader/modules/ariestrader-web: pom.xml src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java src/main/webapp/web_prmtv.html
Date Fri, 14 Jan 2011 19:18:48 GMT
Author: jbohn
Date: Fri Jan 14 19:18:47 2011
New Revision: 1059128

URL: http://svn.apache.org/viewvc?rev=1059128&view=rev
Log:
ARIES-539 make loading of dbscripts work again.  Also a minor tweak to some html instructions
that were not quite correct

Modified:
    aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml
    aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java
    aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/webapp/web_prmtv.html

Modified: aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml?rev=1059128&r1=1059127&r2=1059128&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml Fri Jan 14 19:18:47 2011
@@ -70,6 +70,7 @@
                 <instructions>
                   <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                   <Bundle-Version>${pom.version}</Bundle-Version>
+                  <Bundle-ClassPath>dbscripts</Bundle-ClassPath>
                   <Web-ContextPath>/ariestrader</Web-ContextPath>
                   <Web-JSPExtractLocation>/</Web-JSPExtractLocation>
                   <Private-Package>org.apache.aries.samples.ariestrader.web.*</Private-Package>

Modified: aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java?rev=1059128&r1=1059127&r2=1059128&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java
(original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java
Fri Jan 14 19:18:47 2011
@@ -98,13 +98,13 @@ public class TradeBuildDB {
                 out.println("<BR>TradeBuildDB: **** Database Product detected: "
                     + dbProductName + " ****</BR>");
                 if (dbProductName.startsWith("DB2/")) { // if db is DB2
-                    fileLocation = File.separatorChar + "dbscripts" + File.separatorChar
+ "db2" + File.separatorChar + "Table.ddl";
+                    fileLocation = File.separatorChar + "db2" + File.separatorChar + "Table.ddl";
                 } else if (dbProductName.startsWith("Apache Derby")) { // if db is Derby
-                    fileLocation = File.separatorChar + "dbscripts" + File.separatorChar
+ "derby" + File.separatorChar + "Table.ddl";
+                    fileLocation = File.separatorChar + "derby" + File.separatorChar + "Table.ddl";
                 } else if (dbProductName.startsWith("Oracle")) { // if the Db is Oracle
-                    fileLocation = File.separatorChar + "dbscripts" + File.separatorChar
+ "oracle" + File.separatorChar + "Table.ddl";
+                    fileLocation = File.separatorChar + "oracle" + File.separatorChar + "Table.ddl";
                 } else { // Unsupported "Other" Database
-                    fileLocation = File.separatorChar + "dbscripts" + File.separatorChar
+ "other" + File.separatorChar + "Table.ddl";
+                    fileLocation = File.separatorChar + "other" + File.separatorChar + "Table.ddl";
                     out.println("<BR>TradeBuildDB: **** This Database is "
                         + "unsupported/untested use at your own risk ****</BR>");
                 }

Modified: aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/webapp/web_prmtv.html
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/webapp/web_prmtv.html?rev=1059128&r1=1059127&r2=1059128&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/webapp/web_prmtv.html
(original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-web/src/main/webapp/web_prmtv.html
Fri Jan 14 19:18:47 2011
@@ -112,16 +112,16 @@
 		<TR>
 			<TD align="center"><FONT size="-1"><A href="PingJsp.jsp">PingJSP</A></FONT></TD>
 			<TD><FONT size="-1">PingJSP tests a direct call to JavaServer Page
-			providing server-side dynamic HTML through JSP scripting.
-			<B><P>Note: This test requires that the AriesTrader database is populated
with fictitious 
-            stock quotes using the "(Re)-populate option from the configuration utilities</B>
-            </FONT></TD>
+            providing server-side dynamic HTML through JSP scripting.</FONT></TD>
 		</TR>
 		<TR>
 			<TD align="center"><FONT size="-1"><A href="PingJspEL.jsp">PingJSPEL</A></FONT></TD>
 			<TD><FONT size="-1">PingJSPEL tests a direct call to JavaServer Page
 			providing server-side dynamic HTML through JSP scripting and the
-			usage of the new JSP 2.0 Expression Language.</FONT></TD>
+			usage of the new JSP 2.0 Expression Language.
+            <B><P>Note: This test requires that the AriesTrader database is populated
with fictitious 
+            stock quotes using the "(Re)-populate option from the configuration utilities</B>
+            </FONT></TD>
 		</TR>
 		<TR>
 			<TD align="center"><FONT size="-1"><A href="servlet/PingServlet2Jsp">PingServlet2JSP</A></FONT></TD>



Mime
View raw message