[jboss-cvs] JBossBlog SVN: r152 - in trunk: resources and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 3 16:23:14 EST 2007
Author: adamw
Date: 2007-12-03 16:23:14 -0500 (Mon, 03 Dec 2007)
New Revision: 152
Added:
trunk/resources/WEB-INF/web-dev.xml
trunk/resources/WEB-INF/web-prod.xml
Removed:
trunk/resources/WEB-INF/web.xml
Modified:
trunk/build.xml
trunk/resources/META-INF/persistence-prod.xml
trunk/resources/blog-prod-ds.xml
Log:
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2007-12-03 21:01:29 UTC (rev 151)
+++ trunk/build.xml 2007-12-03 21:23:14 UTC (rev 152)
@@ -106,6 +106,7 @@
<include name="*.*"/>
<include name="classes/**/*.*"/>
<exclude name="classes/**/*.class"/>
+ <exclude name="web-${profile}.xml" />
</fileset>
<filterset>
<filter token="debug" value="${debug}" />
@@ -113,6 +114,13 @@
<filter token="embeddedEjb" value="false" />
</filterset>
</copy>
+ <copy tofile="${war.dir}/WEB-INF/web.xml" file="${basedir}/resources/WEB-INF/web-${profile}.xml">
+ <filterset>
+ <filter token="debug" value="${debug}" />
+ <filter token="jndiPattern" value="${project.name}/#{ejbName}/local" />
+ <filter token="embeddedEjb" value="false" />
+ </filterset>
+ </copy>
<copy todir="${war.dir}/WEB-INF">
<fileset dir="${basedir}/resources/WEB-INF">
<include name="lib/*.*"/>
Modified: trunk/resources/META-INF/persistence-prod.xml
===================================================================
--- trunk/resources/META-INF/persistence-prod.xml 2007-12-03 21:01:29 UTC (rev 151)
+++ trunk/resources/META-INF/persistence-prod.xml 2007-12-03 21:23:14 UTC (rev 152)
@@ -10,7 +10,7 @@
<jta-data-source>java:/blogDatasource</jta-data-source>
<properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
- <property name="hibernate.hbm2ddl.auto" value="validate"/>
+ <property name="hibernate.hbm2ddl.auto" value="update"/>
<property name="hibernate.jdbc.batch_size" value="20"/>
<property name="jboss.entity.manager.factory.jndi.name" value="java:/blogEntityManagerFactory"/>
<property name="hibernate.connection.useUnicode" value="true" />
Copied: trunk/resources/WEB-INF/web-dev.xml (from rev 148, trunk/resources/WEB-INF/web.xml)
===================================================================
--- trunk/resources/WEB-INF/web-dev.xml (rev 0)
+++ trunk/resources/WEB-INF/web-dev.xml 2007-12-03 21:23:14 UTC (rev 152)
@@ -0,0 +1,119 @@
+<?xml version="1.0" ?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
+
+ <!-- Ajax4jsf -->
+
+ <context-param>
+ <param-name>org.richfaces.SKIN</param-name>
+ <param-value>blueSky</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>sourceBasePath</param-name>
+ <param-value>/Users/adamwarski/blog/view</param-value>
+ </context-param>
+
+ <!-- Seam -->
+
+ <listener>
+ <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
+ </listener>
+
+ <filter>
+ <filter-name>Seam Filter</filter-name>
+ <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>Seam Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+
+ <!-- Resources filter -->
+
+ <filter>
+ <filter-name>Resources Filter</filter-name>
+ <filter-class>org.jboss.shotoku.web.ResourcesFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>Resources Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+
+ <servlet>
+ <servlet-name>Seam Resource Servlet</servlet-name>
+ <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Seam Resource Servlet</servlet-name>
+ <url-pattern>/seam/resource/*</url-pattern>
+ </servlet-mapping>
+ <!-- Facelets development mode (disable in production) -->
+
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>facelets.REFRESH_PERIOD</param-name>
+ <param-value>0</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>facelets.RESOURCE_RESOLVER</param-name>
+ <param-value>org.jboss.shotoku.web.FilesystemResourceResolver</param-value>
+ </context-param>
+
+ <!-- JSF -->
+
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.seam</url-pattern>
+ </servlet-mapping>
+
+ <security-constraint>
+ <display-name>Restrict raw XHTML Documents</display-name>
+ <web-resource-collection>
+ <web-resource-name>XHTML</web-resource-name>
+ <url-pattern>*.xhtml</url-pattern>
+ </web-resource-collection>
+ <auth-constraint/>
+ </security-constraint>
+
+ <!-- Feeds servlet -->
+
+ <servlet>
+ <servlet-name>Feeds Servlet</servlet-name>
+ <servlet-class>org.jboss.blog.servlet.FeedsServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Feeds Servlet</servlet-name>
+ <url-pattern>/feeds.seam</url-pattern>
+ </servlet-mapping>
+</web-app>
Copied: trunk/resources/WEB-INF/web-prod.xml (from rev 148, trunk/resources/WEB-INF/web.xml)
===================================================================
--- trunk/resources/WEB-INF/web-prod.xml (rev 0)
+++ trunk/resources/WEB-INF/web-prod.xml 2007-12-03 21:23:14 UTC (rev 152)
@@ -0,0 +1,88 @@
+<?xml version="1.0" ?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
+
+ <!-- Ajax4jsf -->
+
+ <context-param>
+ <param-name>org.richfaces.SKIN</param-name>
+ <param-value>blueSky</param-value>
+ </context-param>
+
+ <!-- Seam -->
+
+ <listener>
+ <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
+ </listener>
+
+ <filter>
+ <filter-name>Seam Filter</filter-name>
+ <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>Seam Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+
+ <servlet>
+ <servlet-name>Seam Resource Servlet</servlet-name>
+ <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Seam Resource Servlet</servlet-name>
+ <url-pattern>/seam/resource/*</url-pattern>
+ </servlet-mapping>
+ <!-- Facelets development mode (disable in production) -->
+
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>false</param-value>
+ </context-param>
+
+ <!-- JSF -->
+
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.seam</url-pattern>
+ </servlet-mapping>
+
+ <security-constraint>
+ <display-name>Restrict raw XHTML Documents</display-name>
+ <web-resource-collection>
+ <web-resource-name>XHTML</web-resource-name>
+ <url-pattern>*.xhtml</url-pattern>
+ </web-resource-collection>
+ <auth-constraint/>
+ </security-constraint>
+
+ <!-- Feeds servlet -->
+
+ <servlet>
+ <servlet-name>Feeds Servlet</servlet-name>
+ <servlet-class>org.jboss.blog.servlet.FeedsServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Feeds Servlet</servlet-name>
+ <url-pattern>/feeds.seam</url-pattern>
+ </servlet-mapping>
+</web-app>
Deleted: trunk/resources/WEB-INF/web.xml
===================================================================
--- trunk/resources/WEB-INF/web.xml 2007-12-03 21:01:29 UTC (rev 151)
+++ trunk/resources/WEB-INF/web.xml 2007-12-03 21:23:14 UTC (rev 152)
@@ -1,119 +0,0 @@
-<?xml version="1.0" ?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- version="2.5">
-
- <!-- Ajax4jsf -->
-
- <context-param>
- <param-name>org.richfaces.SKIN</param-name>
- <param-value>blueSky</param-value>
- </context-param>
-
- <context-param>
- <param-name>sourceBasePath</param-name>
- <param-value>/Users/adamwarski/blog/view</param-value>
- </context-param>
-
- <!-- Seam -->
-
- <listener>
- <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
- </listener>
-
- <filter>
- <filter-name>Seam Filter</filter-name>
- <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>Seam Filter</filter-name>
- <url-pattern>/*</url-pattern>
- <dispatcher>ERROR</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>INCLUDE</dispatcher>
- <dispatcher>REQUEST</dispatcher>
- </filter-mapping>
-
- <!-- Resources filter -->
-
- <filter>
- <filter-name>Resources Filter</filter-name>
- <filter-class>org.jboss.shotoku.web.ResourcesFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>Resources Filter</filter-name>
- <url-pattern>/*</url-pattern>
- <dispatcher>ERROR</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>INCLUDE</dispatcher>
- <dispatcher>REQUEST</dispatcher>
- </filter-mapping>
-
- <servlet>
- <servlet-name>Seam Resource Servlet</servlet-name>
- <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Seam Resource Servlet</servlet-name>
- <url-pattern>/seam/resource/*</url-pattern>
- </servlet-mapping>
- <!-- Facelets development mode (disable in production) -->
-
- <context-param>
- <param-name>facelets.DEVELOPMENT</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <param-name>facelets.REFRESH_PERIOD</param-name>
- <param-value>0</param-value>
- </context-param>
-
- <context-param>
- <param-name>facelets.RESOURCE_RESOLVER</param-name>
- <param-value>org.jboss.shotoku.web.FilesystemResourceResolver</param-value>
- </context-param>
-
- <!-- JSF -->
-
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.xhtml</param-value>
- </context-param>
-
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.seam</url-pattern>
- </servlet-mapping>
-
- <security-constraint>
- <display-name>Restrict raw XHTML Documents</display-name>
- <web-resource-collection>
- <web-resource-name>XHTML</web-resource-name>
- <url-pattern>*.xhtml</url-pattern>
- </web-resource-collection>
- <auth-constraint/>
- </security-constraint>
-
- <!-- Feeds servlet -->
-
- <servlet>
- <servlet-name>Feeds Servlet</servlet-name>
- <servlet-class>org.jboss.blog.servlet.FeedsServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Feeds Servlet</servlet-name>
- <url-pattern>/feeds.seam</url-pattern>
- </servlet-mapping>
-</web-app>
Modified: trunk/resources/blog-prod-ds.xml
===================================================================
--- trunk/resources/blog-prod-ds.xml 2007-12-03 21:01:29 UTC (rev 151)
+++ trunk/resources/blog-prod-ds.xml 2007-12-03 21:23:14 UTC (rev 152)
@@ -8,10 +8,10 @@
<local-tx-datasource>
<jndi-name>blogDatasource</jndi-name>
- <connection-url>jdbc:mysql:///blog?useUnicode=true&characterEncoding=UTF-8</connection-url>
+ <connection-url>jdbc:mysql:///adam_blog?useUnicode=true&characterEncoding=UTF-8</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
- <user-name>root</user-name>
- <password></password>
+ <user-name>blog</user-name>
+ <password>blog</password>
<!--
<exception-sorter-class-name>
org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter
More information about the jboss-cvs-commits
mailing list