[jboss-cvs] JBossAS SVN: r97963 - in projects/snowdrop/examples/trunk/sportsclub: sportsclub-reservations-web and 14 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 17 12:03:47 EST 2009
Author: lvlcek at redhat.com
Date: 2009-12-17 12:03:46 -0500 (Thu, 17 Dec 2009)
New Revision: 97963
Added:
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentConverter.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentConverterHelper.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentTypeConverter.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/resources/
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/test/java/org/
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/test/java/org/jboss/
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/test/java/org/jboss/snowdrop/
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/test/java/org/jboss/snowdrop/samples/
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/test/java/org/jboss/snowdrop/samples/sportsclub/
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/test/java/org/jboss/snowdrop/samples/sportsclub/jsf/
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/test/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/test/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/test/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentConverterHelperTest.java
Removed:
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/EquipmentTypeConverter.java
Modified:
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/sportsclub/service/EquipmentService.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/sportsclub/service/EquipmentServiceImpl.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/pom.xml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/index.xhtml
Log:
Equipment converter + test for TestNG
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/sportsclub/service/EquipmentService.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/sportsclub/service/EquipmentService.java 2009-12-17 16:01:56 UTC (rev 97962)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/sportsclub/service/EquipmentService.java 2009-12-17 17:03:46 UTC (rev 97963)
@@ -1,6 +1,7 @@
package org.jboss.snowdrop.samples.sportsclub.service;
import org.jboss.snowdrop.samples.sportsclub.domain.entity.EquipmentType;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Equipment;
/**
* @author <a href="mailto:lvlcek at redhat.com">Lukas Vlcek</a>
@@ -8,4 +9,6 @@
public interface EquipmentService
{
public EquipmentType[] getEquipmentTypes();
+
+ public Equipment findEquipmentById(int id);
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/sportsclub/service/EquipmentServiceImpl.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/sportsclub/service/EquipmentServiceImpl.java 2009-12-17 16:01:56 UTC (rev 97962)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/sportsclub/service/EquipmentServiceImpl.java 2009-12-17 17:03:46 UTC (rev 97963)
@@ -1,11 +1,14 @@
package org.jboss.snowdrop.samples.sportsclub.service;
import org.jboss.snowdrop.samples.sportsclub.domain.entity.EquipmentType;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Equipment;
import org.jboss.snowdrop.samples.sportsclub.domain.repository.EquipmentRepository;
+import org.springframework.transaction.annotation.Transactional;
/**
* @author <a href="mailto:lvlcek at redhat.com">Lukas Vlcek</a>
*/
+ at Transactional(readOnly = true)
public class EquipmentServiceImpl implements EquipmentService
{
private EquipmentRepository equipmentRepository;
@@ -15,6 +18,11 @@
return equipmentRepository.getEquipmentTypes();
}
+ public Equipment findEquipmentById(int id)
+ {
+ return equipmentRepository.findById(id);
+ }
+
public EquipmentRepository getEquipmentRepository()
{
return equipmentRepository;
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/pom.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/pom.xml 2009-12-17 16:01:56 UTC (rev 97962)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/pom.xml 2009-12-17 17:03:46 UTC (rev 97963)
@@ -43,6 +43,12 @@
</exclusions>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.jboss.snowdrop.samples.sportsclub</groupId>-->
+ <!--<artifactId>sportsclub-test-infrastructure</artifactId>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
@@ -85,10 +91,25 @@
<artifactId>richfaces-ui</artifactId>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>junit</groupId>-->
+ <!--<artifactId>junit</artifactId>-->
+ <!--</dependency>-->
+
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.5</version>
+ <scope>test</scope>
+ <classifier>jdk15</classifier>
</dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Deleted: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/EquipmentTypeConverter.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/EquipmentTypeConverter.java 2009-12-17 16:01:56 UTC (rev 97962)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/EquipmentTypeConverter.java 2009-12-17 17:03:46 UTC (rev 97963)
@@ -1,16 +0,0 @@
-package org.jboss.snowdrop.samples.sportsclub.jsf.beans;
-
-import org.jboss.snowdrop.samples.sportsclub.domain.entity.EquipmentType;
-
-import javax.faces.convert.EnumConverter;
-
-/**
- * @author <a href="mailto:lvlcek at redhat.com">Lukas Vlcek</a>
- */
-public class EquipmentTypeConverter extends EnumConverter
-{
- public EquipmentTypeConverter()
- {
- super(EquipmentType.class);
- }
-}
Added: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentConverter.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentConverter.java (rev 0)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentConverter.java 2009-12-17 17:03:46 UTC (rev 97963)
@@ -0,0 +1,56 @@
+package org.jboss.snowdrop.samples.sportsclub.jsf.beans.converter;
+
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Equipment;
+
+import javax.faces.convert.Converter;
+import javax.faces.convert.ConverterException;
+import javax.faces.context.FacesContext;
+import javax.faces.component.UIComponent;
+
+/**
+ * @author <a href="mailto:lvlcek at redhat.com">Lukas Vlcek</a>
+ */
+public class EquipmentConverter implements Converter
+{
+
+ private EquipmentConverterHelper equipmentConverterHelper;
+
+ public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String s)
+ {
+ if (s == null || "".equals(s.trim())) return null;
+ Equipment eqp;
+ try
+ {
+ eqp = equipmentConverterHelper.getAsEquipment(s);
+ } catch (RuntimeException e)
+ {
+ throw new ConverterException(e);
+ }
+ return eqp;
+ }
+
+ public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object o)
+ {
+ if (o == null) return null;
+ String s;
+ try {
+ Equipment e = (Equipment)o;
+ s = equipmentConverterHelper.getAsString(e);
+ }
+ catch (RuntimeException e)
+ {
+ throw new ConverterException(e);
+ }
+ return s;
+ }
+
+ public EquipmentConverterHelper getEquipmentConverterHelper()
+ {
+ return equipmentConverterHelper;
+ }
+
+ public void setEquipmentConverterHelper(EquipmentConverterHelper equipmentConverterHelper)
+ {
+ this.equipmentConverterHelper = equipmentConverterHelper;
+ }
+}
Added: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentConverterHelper.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentConverterHelper.java (rev 0)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentConverterHelper.java 2009-12-17 17:03:46 UTC (rev 97963)
@@ -0,0 +1,37 @@
+package org.jboss.snowdrop.samples.sportsclub.jsf.beans.converter;
+
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Equipment;
+import org.jboss.snowdrop.samples.sportsclub.service.EquipmentService;
+
+/**
+ * @author <a href="mailto:lvlcek at redhat.com">Lukas Vlcek</a>
+ */
+public class EquipmentConverterHelper
+{
+
+ private EquipmentService equipmentService;
+
+ public String getAsString(Equipment e) throws RuntimeException
+ {
+ String s = e.getId() + " " + e.getName();
+ return s;
+ }
+
+ public Equipment getAsEquipment(String s) throws RuntimeException
+ {
+ String[] items = s.split(" ",2);
+ Equipment e = getEquipmentService().findEquipmentById(Integer.parseInt(items[0]));
+ return e;
+ }
+
+
+ public EquipmentService getEquipmentService()
+ {
+ return equipmentService;
+ }
+
+ public void setEquipmentService(EquipmentService equipmentService)
+ {
+ this.equipmentService = equipmentService;
+ }
+}
Copied: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentTypeConverter.java (from rev 97929, projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/EquipmentTypeConverter.java)
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentTypeConverter.java (rev 0)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentTypeConverter.java 2009-12-17 17:03:46 UTC (rev 97963)
@@ -0,0 +1,16 @@
+package org.jboss.snowdrop.samples.sportsclub.jsf.beans.converter;
+
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.EquipmentType;
+
+import javax.faces.convert.EnumConverter;
+
+/**
+ * @author <a href="mailto:lvlcek at redhat.com">Lukas Vlcek</a>
+ */
+public class EquipmentTypeConverter extends EnumConverter
+{
+ public EquipmentTypeConverter()
+ {
+ super(EquipmentType.class);
+ }
+}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml 2009-12-17 16:01:56 UTC (rev 97962)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml 2009-12-17 17:03:46 UTC (rev 97963)
@@ -11,6 +11,9 @@
<import resource="classpath*:infrastructure.xml"/>
+ <import resource="classpath*:spring-converterHelpers.xml"/>
+
+ <!-- Request scoped beans -->
<bean id="reservationSearch" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.ReservationSearch" scope="request">
<property name="reservationService" ref="reservationService"/>
<property name="tableState" ref="reservationSearchTableState"/>
@@ -21,20 +24,27 @@
<property name="reservationService" ref="reservationService"/>
</bean>
- <!-- Keeps search table state in the session -->
+
+ <!-- Session scoped beans -->
<bean id="reservationSearchTableState" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.ReservationTableState" scope="session"/>
<bean id="reservationSearchOptions" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.ReservationSearchOptions" scope="session" init-method="init">
<property name="equipmentService" ref="equipmentService"/>
</bean>
+
<!-- Application scoped service -->
<bean id="referenceData" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.ReferenceData">
<property name="equipmentService" ref="equipmentService"/>
</bean>
+
<!-- JSF Converters managed by Spring -->
- <bean id="equipmentTypeConverter" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.EquipmentTypeConverter"/>
+ <bean id="equipmentTypeConverter" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.converter.EquipmentTypeConverter"/>
+
+ <bean id="equipmentConverter" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.converter.EquipmentConverter">
+ <property name="equipmentConverterHelper" ref="equipmentConverterHelper"/>
+ </bean>
<context:annotation-config/>
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/index.xhtml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/index.xhtml 2009-12-17 16:01:56 UTC (rev 97962)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/index.xhtml 2009-12-17 17:03:46 UTC (rev 97963)
@@ -6,8 +6,8 @@
xmlns:a4j="http://richfaces.org/a4j"
template="layout/template.xhtml">
<ui:define name="content">
- <h:outputLink value="reservationSearch.jsf"><h:outputText value="Search Reservations"/></h:outputLink>
- <rich:separator/>
- <h:outputLink value="createReservationForm.jsf"><h:outputText value="Create New Reservation"/></h:outputLink>
+ <rich:panel>
+ <h:outputText value="Welcome to the Sportsclub Reservation System"/>
+ </rich:panel>
</ui:define>
</ui:composition>
\ No newline at end of file
Added: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/test/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentConverterHelperTest.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/test/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentConverterHelperTest.java (rev 0)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/test/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentConverterHelperTest.java 2009-12-17 17:03:46 UTC (rev 97963)
@@ -0,0 +1,36 @@
+package org.jboss.snowdrop.samples.sportsclub.jsf.beans.converter;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.testng.annotations.Test;
+import org.testng.Assert;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Equipment;
+
+/**
+ * @author <a href="mailto:lvlcek at redhat.com">Lukas Vlcek</a>
+ */
+ at ContextConfiguration(locations = {"classpath:test-infrastructure.xml", "classpath:dao-context.xml", "classpath:spring-converterHelpers.xml"})
+public class EquipmentConverterHelperTest extends AbstractTestNGSpringContextTests
+{
+
+ @Autowired
+ EquipmentConverterHelper equipmentConverterHelper;
+
+ public EquipmentConverterHelperTest()
+ {
+ super();
+ }
+
+ @Test
+ @Transactional
+ public void testConversion()
+ {
+ // test that Spring wired EquipmentConverterHelper
+ Assert.assertNotNull(equipmentConverterHelper);
+
+ Equipment e = equipmentConverterHelper.getAsEquipment("1 Dummy");
+ }
+
+}
More information about the jboss-cvs-commits
mailing list