[jboss-cvs] JBossAS SVN: r96891 - in projects/snowdrop/trunk/documentation/samples/sportsclub: sportsclub-ear and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 24 15:01:38 EST 2009
Author: marius.bogoevici
Date: 2009-11-24 15:01:38 -0500 (Tue, 24 Nov 2009)
New Revision: 96891
Added:
projects/snowdrop/trunk/documentation/samples/sportsclub/database/sportsclub-ds.xml
projects/snowdrop/trunk/documentation/samples/sportsclub/database/sportsclubdb-startup.sh
Removed:
projects/snowdrop/trunk/documentation/samples/sportsclub/database/stayfit-ds.xml
Modified:
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-ear/pom.xml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-ejb/src/main/resources/META-INF/jboss-spring.xml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/pom.xml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-test-infrastructure/pom.xml
Log:
db initialization and structural changes
Copied: projects/snowdrop/trunk/documentation/samples/sportsclub/database/sportsclub-ds.xml (from rev 96867, projects/snowdrop/trunk/documentation/samples/sportsclub/database/stayfit-ds.xml)
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/database/sportsclub-ds.xml (rev 0)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/database/sportsclub-ds.xml 2009-11-24 20:01:38 UTC (rev 96891)
@@ -0,0 +1,68 @@
+<datasources>
+ <local-tx-datasource>
+
+ <jndi-name>StayFitDS</jndi-name>
+
+ <connection-url>jdbc:hsqldb:hsql://localhost/sportsclubdb</connection-url>
+
+ <!-- The driver class -->
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+
+ <!-- The login and password -->
+ <user-name>sa</user-name>
+ <password></password>
+
+ <!--example of how to specify class that determines if exception means connection should be destroyed-->
+ <!--exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyExceptionSorter</exception-sorter-class-name-->
+
+ <!-- this will be run before a managed connection is removed from the pool for use by a client-->
+ <!--<check-valid-connection-sql>select * from something</check-valid-connection-sql> -->
+
+ <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
+ <min-pool-size>5</min-pool-size>
+
+ <!-- The maximum connections in a pool/sub-pool -->
+ <max-pool-size>20</max-pool-size>
+
+ <!-- The time before an unused connection is destroyed -->
+ <!-- NOTE: This is the check period. It will be destroyed somewhere between 1x and 2x this timeout after last use -->
+ <!-- TEMPORARY FIX! - Disable idle connection removal, HSQLDB has a problem with not reaping threads on closed connections -->
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+
+ <!-- sql to call when connection is created
+ <new-connection-sql>some arbitrary sql</new-connection-sql>
+ -->
+
+ <!-- sql to call on an existing pooled connection when it is obtained from pool
+ <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
+ -->
+
+ <!-- example of how to specify a class that determines a connection is valid before it is handed out from the pool
+ <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyValidConnectionChecker</valid-connection-checker-class-name>
+ -->
+
+ <!-- Whether to check all statements are closed when the connection is returned to the pool,
+ this is a debugging feature that should be turned off in production -->
+ <track-statements/>
+
+ <application-managed-security/>
+
+ <!-- Use the security domain defined in conf/login-config.xml -->
+ <!--<security-domain>HsqlDbRealm</security-domain>-->
+
+ <!-- Use the security domain defined in conf/login-config.xml or the
+ getConnection(user, pw) for logins. The security domain takes precedence.
+ <security-domain-and-application>HsqlDbRealm</security-domain-and-application>
+ -->
+
+ <!-- HSQL DB benefits from prepared statement caching -->
+ <prepared-statement-cache-size>32</prepared-statement-cache-size>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <metadata>
+ <type-mapping>Hypersonic SQL</type-mapping>
+ </metadata>
+
+ </local-tx-datasource>
+
+</datasources>
\ No newline at end of file
Added: projects/snowdrop/trunk/documentation/samples/sportsclub/database/sportsclubdb-startup.sh
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/database/sportsclubdb-startup.sh (rev 0)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/database/sportsclubdb-startup.sh 2009-11-24 20:01:38 UTC (rev 96891)
@@ -0,0 +1 @@
+java -cp $HSQLDB_HOME/lib/hsqldb.jar org.hsqldb.Server -database.0 file:data/sportsclubdb -dbname.0 sportsclubdb
\ No newline at end of file
Deleted: projects/snowdrop/trunk/documentation/samples/sportsclub/database/stayfit-ds.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/database/stayfit-ds.xml 2009-11-24 20:00:33 UTC (rev 96890)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/database/stayfit-ds.xml 2009-11-24 20:01:38 UTC (rev 96891)
@@ -1,68 +0,0 @@
-<datasources>
- <local-tx-datasource>
-
- <jndi-name>StayFitDS</jndi-name>
-
- <connection-url>jdbc:hsqldb:hsql://localhost/accountsdb</connection-url>
-
- <!-- The driver class -->
- <driver-class>org.hsqldb.jdbcDriver</driver-class>
-
- <!-- The login and password -->
- <user-name>sa</user-name>
- <password></password>
-
- <!--example of how to specify class that determines if exception means connection should be destroyed-->
- <!--exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyExceptionSorter</exception-sorter-class-name-->
-
- <!-- this will be run before a managed connection is removed from the pool for use by a client-->
- <!--<check-valid-connection-sql>select * from something</check-valid-connection-sql> -->
-
- <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
- <min-pool-size>5</min-pool-size>
-
- <!-- The maximum connections in a pool/sub-pool -->
- <max-pool-size>20</max-pool-size>
-
- <!-- The time before an unused connection is destroyed -->
- <!-- NOTE: This is the check period. It will be destroyed somewhere between 1x and 2x this timeout after last use -->
- <!-- TEMPORARY FIX! - Disable idle connection removal, HSQLDB has a problem with not reaping threads on closed connections -->
- <idle-timeout-minutes>0</idle-timeout-minutes>
-
- <!-- sql to call when connection is created
- <new-connection-sql>some arbitrary sql</new-connection-sql>
- -->
-
- <!-- sql to call on an existing pooled connection when it is obtained from pool
- <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
- -->
-
- <!-- example of how to specify a class that determines a connection is valid before it is handed out from the pool
- <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyValidConnectionChecker</valid-connection-checker-class-name>
- -->
-
- <!-- Whether to check all statements are closed when the connection is returned to the pool,
- this is a debugging feature that should be turned off in production -->
- <track-statements/>
-
- <application-managed-security/>
-
- <!-- Use the security domain defined in conf/login-config.xml -->
- <!--<security-domain>HsqlDbRealm</security-domain>-->
-
- <!-- Use the security domain defined in conf/login-config.xml or the
- getConnection(user, pw) for logins. The security domain takes precedence.
- <security-domain-and-application>HsqlDbRealm</security-domain-and-application>
- -->
-
- <!-- HSQL DB benefits from prepared statement caching -->
- <prepared-statement-cache-size>32</prepared-statement-cache-size>
-
- <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
- <metadata>
- <type-mapping>Hypersonic SQL</type-mapping>
- </metadata>
-
- </local-tx-datasource>
-
-</datasources>
\ No newline at end of file
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-ear/pom.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-ear/pom.xml 2009-11-24 20:00:33 UTC (rev 96890)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-ear/pom.xml 2009-11-24 20:01:38 UTC (rev 96891)
@@ -38,7 +38,7 @@
<type>jar</type>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
<artifactId>sportsclub-reservations-spring</artifactId>
<type>jar</type>
@@ -58,7 +58,7 @@
<artifactId>maven-ear-plugin</artifactId>
<version>2.4</version>
<configuration>
- <displayName>Stay Fit! Sample Application</displayName>
+ <displayName>Sports Club Sample Application</displayName>
<defaultLibBundleDir>/lib/</defaultLibBundleDir>
<modules>
<ejbModule>
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-ejb/src/main/resources/META-INF/jboss-spring.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-ejb/src/main/resources/META-INF/jboss-spring.xml 2009-11-24 20:00:33 UTC (rev 96890)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-ejb/src/main/resources/META-INF/jboss-spring.xml 2009-11-24 20:01:38 UTC (rev 96891)
@@ -5,8 +5,8 @@
<description>BeanFactory=(SpringDao)</description>
- <import resource="classpath:dao-context.xml"/>
- <import resource="classpath:infrastructure.xml"/>
+ <import resource="classpath*:dao-context.xml"/>
+ <import resource="classpath*:infrastructure.xml"/>
</beans>
\ No newline at end of file
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/pom.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/pom.xml 2009-11-24 20:00:33 UTC (rev 96890)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/pom.xml 2009-11-24 20:01:38 UTC (rev 96891)
@@ -57,11 +57,25 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
</dependency>
</dependencies>
- <build>
- <finalName>sportsclub-reservations-web</finalName>
- </build>
+ <!-- Make WAR skinny if deployed inside .ear -->
+ <build>
+ <finalName>sportsclub-reservations-web</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1-alpha-2</version>
+ <configuration>
+ <packagingExcludes>WEB-INF/lib/spring*.jar</packagingExcludes>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>lib/</classpathPrefix>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml 2009-11-24 20:00:33 UTC (rev 96890)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml 2009-11-24 20:01:38 UTC (rev 96891)
@@ -9,6 +9,8 @@
<import resource="classpath*:reservations-service.xml"/>
+ <import resource="classpath*:infrastructure.xml"/>
+
<bean id="availableEquipments" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.AvailableEquipments" scope="request">
<property name="equipmentRepository" ref="equipmentRepository"/>
</bean>
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-test-infrastructure/pom.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-test-infrastructure/pom.xml 2009-11-24 20:00:33 UTC (rev 96890)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-test-infrastructure/pom.xml 2009-11-24 20:01:38 UTC (rev 96891)
@@ -2,17 +2,68 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>sportsclub-parent</artifactId>
- <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>sportsclub-parent</artifactId>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
- <artifactId>sportsclub-test-infrastructure</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Sports Club Unit Test Infrastructure</name>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-test-infrastructure</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Sports Club Unit Test Infrastructure</name>
+ <dependencies>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.8</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.8</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.11.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list