[jboss-cvs] JBossAS SVN: r103806 - in projects/snowdrop/examples/trunk/sportsclub: jbossconf and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 12 02:49:54 EDT 2010
Author: marius.bogoevici
Date: 2010-04-12 02:49:53 -0400 (Mon, 12 Apr 2010)
New Revision: 103806
Removed:
projects/snowdrop/examples/trunk/sportsclub/database/resetdb.sh
Modified:
projects/snowdrop/examples/trunk/sportsclub/database/pom.xml
projects/snowdrop/examples/trunk/sportsclub/jbossconf/jbossas.properties
projects/snowdrop/examples/trunk/sportsclub/jbossconf/pom.xml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/PaymentController.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/WEB-INF/jsp/paymentNotification.jsp
Log:
minor fixes
Modified: projects/snowdrop/examples/trunk/sportsclub/database/pom.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/database/pom.xml 2010-04-12 06:48:21 UTC (rev 103805)
+++ projects/snowdrop/examples/trunk/sportsclub/database/pom.xml 2010-04-12 06:49:53 UTC (rev 103806)
@@ -7,6 +7,7 @@
<groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
<artifactId>database</artifactId>
<version>1.0-SNAPSHOT</version>
+ <description>Database setup utility</description>
<packaging>pom</packaging>
Deleted: projects/snowdrop/examples/trunk/sportsclub/database/resetdb.sh
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/database/resetdb.sh 2010-04-12 06:48:21 UTC (rev 103805)
+++ projects/snowdrop/examples/trunk/sportsclub/database/resetdb.sh 2010-04-12 06:49:53 UTC (rev 103806)
@@ -1,8 +0,0 @@
-if [ "x$HSQLDB_JAR_LOCATION" = "x" ]; then
- if [ "x$HSQLDB_HOME" = "x" ]; then
- HSQLDB_JAR_LOCATION=$HOME/.m2/repository/hsqldb/hsqldb/1.8.0.10/hsqldb-1.8.0.10.jar
- else
- HSQLDB_JAR_LOCATION=$HSQLDB_HOME/lib/hsqldb.jar
- fi
-fi
-java -jar $HSQLDB_JAR_LOCATION --inlineRc URL=jdbc:hsqldb:hsql://localhost/sportsclubdb,USER=sa,PASSWORD= db-setup.sql
\ No newline at end of file
Modified: projects/snowdrop/examples/trunk/sportsclub/jbossconf/jbossas.properties
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/jbossconf/jbossas.properties 2010-04-12 06:48:21 UTC (rev 103805)
+++ projects/snowdrop/examples/trunk/sportsclub/jbossconf/jbossas.properties 2010-04-12 06:49:53 UTC (rev 103806)
@@ -1,5 +1,6 @@
# Custom JBoss AS configuration
-jboss.home=/opt/jboss/jboss-eap-5.0/jboss-as
+#jboss.home=/opt/jboss/jboss-eap-5.0/jboss-as
+jboss.home=<location-of-jboss-as->
jboss.server.name=default
jboss.timeout=200000
jboss.port=8080
Modified: projects/snowdrop/examples/trunk/sportsclub/jbossconf/pom.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/jbossconf/pom.xml 2010-04-12 06:48:21 UTC (rev 103805)
+++ projects/snowdrop/examples/trunk/sportsclub/jbossconf/pom.xml 2010-04-12 06:49:53 UTC (rev 103806)
@@ -21,13 +21,6 @@
<artifactId>hsqldb</artifactId>
<version>1.8.0.10</version>
</dependency>
-
- <dependency>
- <groupId>org.jboss.snowdrop</groupId>
- <artifactId>jboss-spring-deployer</artifactId>
- <version>${snowdrop.version}</version>
- <type>zip</type>
- </dependency>
</dependencies>
<profiles>
@@ -40,22 +33,6 @@
<defaultGoal>package</defaultGoal>
<plugins>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>extract-deployer</id>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <stripVersion>true</stripVersion>
- <includeArtifactIds>jboss-spring-deployer</includeArtifactIds>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.3</version>
<executions>
@@ -68,8 +45,7 @@
<configuration>
<tasks>
<property file="${basedir}/local.jbossas.properties"/>
- <property file="${basedir}/jbossas.properties"/>
- <property name="jboss.home" value="${env.JBOSS_HOME}"/>
+ <property file="${basedir}/jbossas.properties"/> <property name="jboss.home" value="${env.JBOSS_HOME}"/>
<property name="jboss.deploy.destination"
value="${jboss.home}/server/${jboss.server.name}/deploy"/>
<delete
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/PaymentController.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/PaymentController.java 2010-04-12 06:48:21 UTC (rev 103805)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/PaymentController.java 2010-04-12 06:49:53 UTC (rev 103806)
@@ -36,6 +36,9 @@
paymentNotification.setAccountNumber(accountId);
paymentNotification.setAmount(BigDecimal.valueOf(amount));
jmsTemplate.convertAndSend(paymentNotification);
- return new ModelAndView("paymentNotification", "amount", amount);
+ ModelAndView modelAndView = new ModelAndView("paymentNotification");
+ modelAndView.addObject("amount", amount);
+ modelAndView.addObject("accountId", accountId);
+ return modelAndView;
}
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/WEB-INF/jsp/paymentNotification.jsp
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/WEB-INF/jsp/paymentNotification.jsp 2010-04-12 06:48:21 UTC (rev 103805)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/WEB-INF/jsp/paymentNotification.jsp 2010-04-12 06:49:53 UTC (rev 103806)
@@ -8,7 +8,7 @@
</head>
<body class="main-body">
<%@ include file="../../template/header.html" %>
- Payment amount: <c:out value="${amount}"/>
+ A payment has been sent to be processed for account <c:out value="${accountId}"/> . Amount: <c:out value="${amount}"/>
<%@ include file="../../template/footer.html" %>
</body>
</html>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list