[jboss-cvs] JBossAS SVN: r97051 - in projects/snowdrop/trunk/documentation/samples/sportsclub: sportsclub-hibernate-dao/src/main/resources and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 26 18:11:57 EST 2009
Author: marius.bogoevici
Date: 2009-11-26 18:11:56 -0500 (Thu, 26 Nov 2009)
New Revision: 97051
Modified:
projects/snowdrop/trunk/documentation/samples/sportsclub/pom.xml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/resources/context.properties
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/pom.xml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/pom.xml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/WEB-INF/web.xml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml
Log:
Making spring provided inside the web apps (will be defined by the war) - to avoid conflicts with the deployer.
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/pom.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/pom.xml 2009-11-26 22:32:23 UTC (rev 97050)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/pom.xml 2009-11-26 23:11:56 UTC (rev 97051)
@@ -96,6 +96,20 @@
</dependency>
<dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_13</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>1.1.15.B1</version>
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/resources/context.properties
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/resources/context.properties 2009-11-26 22:32:23 UTC (rev 97050)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/resources/context.properties 2009-11-26 23:11:56 UTC (rev 97051)
@@ -1,2 +1,2 @@
hibernate.properties.location=classpath:/hibernate/hibernate.properties
-datasource.jndi.name=SportsClubDS
+datasource.jndi.name=java:/SportsClubDS
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-26 22:32:23 UTC (rev 97050)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/pom.xml 2009-11-26 23:11:56 UTC (rev 97051)
@@ -35,11 +35,18 @@
<version>${project.version}</version>
<type>jar</type>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -67,23 +74,5 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
- <!-- 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-subscriptions-web/pom.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/pom.xml 2009-11-26 22:32:23 UTC (rev 97050)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/pom.xml 2009-11-26 23:11:56 UTC (rev 97051)
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
- <artifactId>sportsclub-ejb</artifactId>
+ <artifactId>sportsclub-subscriptions-ejb</artifactId>
<version>${project.version}</version>
<type>ejb</type>
<scope>provided</scope>
@@ -37,6 +37,16 @@
</dependency>
<dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
</dependency>
@@ -52,9 +62,15 @@
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
</dependency>
</dependencies>
-
+
</project>
\ No newline at end of file
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/WEB-INF/web.xml 2009-11-26 22:32:23 UTC (rev 97050)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/WEB-INF/web.xml 2009-11-26 23:11:56 UTC (rev 97051)
@@ -32,6 +32,11 @@
</param-name>
<param-value>server</param-value>
</context-param>
+
+ <context-param>
+ <param-name>org.richfaces.SKIN</param-name>
+ <param-value>blueSky</param-value>
+ </context-param>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml 2009-11-26 22:32:23 UTC (rev 97050)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml 2009-11-26 23:11:56 UTC (rev 97051)
@@ -7,12 +7,12 @@
template="layout/template.xhtml">
<ui:define name="content">
<rich:panel>
- <f:facet name="Search for accounts">
+
<h:form>
<h:inputText value="#{accountManager.name}" label="Search name"/>
<h:commandButton action="#{accountManager.searchAccounts}"/>
</h:form>
- </f:facet>
+
</rich:panel>
</ui:define>
</ui:composition>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list