[jboss-cvs] JBossBlog SVN: r324 - in trunk: resources and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 26 07:48:20 EDT 2008
Author: adamw
Date: 2008-08-26 07:48:20 -0400 (Tue, 26 Aug 2008)
New Revision: 324
Removed:
trunk/resources/META-INF/persistence-design.xml
trunk/resources/WEB-INF/web-design.xml
trunk/resources/blog-design-ds.xml
Modified:
trunk/build.xml
trunk/resources-portlet/WEB-INF/web.xml
trunk/resources/META-INF/application.xml
trunk/resources/META-INF/persistence-dev.xml
trunk/resources/WEB-INF/web-dev.xml
trunk/resources/WEB-INF/web-prod.xml
Log:
Commenting out support for portal and shotoku
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-08-26 11:25:57 UTC (rev 323)
+++ trunk/build.xml 2008-08-26 11:48:20 UTC (rev 324)
@@ -76,12 +76,12 @@
<mkdir dir="${jar.impl.dir}" />
<mkdir dir="${jar.api.dir}" />
<mkdir dir="${jar.shotoku.dir}" />
- <mkdir dir="${jar.portal.dir}" />
+ <!--<mkdir dir="${jar.portal.dir}" />-->
<mkdir dir="${ear.dir}" />
<mkdir dir="${war.dir}" />
- <mkdir dir="${portal.dir}" />
+ <!--<mkdir dir="${portal.dir}" />
<mkdir dir="${portal.dir}/WEB-INF" />
- <mkdir dir="${portal.dir}/WEB-INF/lib" />
+ <mkdir dir="${portal.dir}/WEB-INF/lib" />-->
<mkdir dir="${dist.dir}" />
</target>
@@ -103,7 +103,7 @@
nowarn="on">
<src path="${src.action.dir}" />
</javac>
- <javac classpathref="build.dep.classpath"
+ <!--<javac classpathref="build.dep.classpath"
destdir="${jar.portal.dir}"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
@@ -116,7 +116,7 @@
deprecation="${javac.deprecation}"
nowarn="on">
<src path="${src.shotoku.dir}" />
- </javac>
+ </javac>-->
</target>
<target name="jar" depends="compile"
@@ -131,19 +131,19 @@
</fileset>
</copy>
- <!-- TODO: remove this marker for scanner -->
+ <!-- TODO: remove this marker for scanner
<copy todir="${jar.shotoku.dir}">
<fileset dir="${basedir}/resources">
<include name="seam.properties" />
</fileset>
- </copy>
+ </copy> -->
- <!-- TODO: remove this marker for scanner -->
+ <!-- TODO: remove this marker for scanner
<copy todir="${jar.portal.dir}">
<fileset dir="${basedir}/resources">
<include name="seam.properties" />
</fileset>
- </copy>
+ </copy> -->
<copy todir="${jar.impl.dir}/META-INF">
<fileset dir="${basedir}/resources/META-INF">
@@ -205,7 +205,7 @@
</fileset>
</copy>
- <copy todir="${portal.dir}">
+ <!--<copy todir="${portal.dir}">
<fileset dir="${basedir}/resources-portlet">
<include name="**/*"/>
</fileset>
@@ -220,7 +220,7 @@
<include name="jstl.jar" />
<include name="standard.jar" />
</fileset>
- </copy>
+ </copy>-->
</target>
<target name="ear" description="Build the EAR">
@@ -288,17 +288,17 @@
description="Package the archives">
<jar jarfile="${dist.dir}/${jar.impl.name}" basedir="${jar.impl.dir}"/>
<jar jarfile="${dist.dir}/${jar.shotoku.name}" basedir="${jar.shotoku.dir}"/>
- <jar jarfile="${dist.dir}/${jar.portal.name}" basedir="${jar.portal.dir}"/>
+ <!--<jar jarfile="${dist.dir}/${jar.portal.name}" basedir="${jar.portal.dir}"/>-->
<jar jarfile="${dist.dir}/${project.name}.war" basedir="${war.dir}"/>
- <jar jarfile="${dist.dir}/${portal.name}" basedir="${portal.dir}"/>
+ <!--<jar jarfile="${dist.dir}/${portal.name}" basedir="${portal.dir}"/>-->
<jar jarfile="${dist.dir}/${project.name}.ear">
<fileset dir="${ear.dir}"/>
<fileset dir="${dist.dir}">
<include name="${jar.impl.name}"/>
<include name="${jar.shotoku.name}"/>
- <include name="${jar.portal.name}"/>
+ <!--<include name="${jar.portal.name}"/>-->
<include name="${project.name}.war"/>
- <include name="${portal.name}"/>
+ <!--<include name="${portal.name}"/>-->
</fileset>
</jar>
</target>
@@ -331,23 +331,23 @@
<mkdir dir="${jar.deploy.dir}"/>
<mkdir dir="${war.deploy.dir}"/>
- <mkdir dir="${portal.deploy.dir}"/>
+ <!--<mkdir dir="${portal.deploy.dir}"/>-->
<copy todir="${jar.deploy.dir}">
<fileset dir="${jar.impl.dir}"/>
</copy>
- <copy todir="${jar.shotoku.deploy.dir}">
+ <!--<copy todir="${jar.shotoku.deploy.dir}">
<fileset dir="${jar.shotoku.dir}"/>
</copy>
<copy todir="${jar.portal.deploy.dir}">
<fileset dir="${jar.portal.dir}"/>
- </copy>
+ </copy>-->
<copy todir="${war.deploy.dir}">
<fileset dir="${war.dir}"/>
</copy>
- <copy todir="${portal.deploy.dir}">
+ <!--<copy todir="${portal.deploy.dir}">
<fileset dir="${portal.dir}"/>
- </copy>
+ </copy>-->
<copy todir="${ear.deploy.dir}">
<fileset dir="${ear.dir}"/>
</copy>
Modified: trunk/resources/META-INF/application.xml
===================================================================
--- trunk/resources/META-INF/application.xml 2008-08-26 11:25:57 UTC (rev 323)
+++ trunk/resources/META-INF/application.xml 2008-08-26 11:48:20 UTC (rev 324)
@@ -15,13 +15,13 @@
<ejb>blog-impl.jar</ejb>
</module>
- <module>
+ <!--<module>
<ejb>blog-shotoku.jar</ejb>
- </module>
+ </module>-->
- <module>
+ <!--<module>
<ejb>blog-portal.jar</ejb>
- </module>
+ </module>-->
<module>
<web>
@@ -30,10 +30,10 @@
</web>
</module>
- <module>
+ <!--<module>
<web>
<web-uri>blog-portal.war</web-uri>
<context-root>/blog-portal</context-root>
</web>
- </module>
+ </module>-->
</application>
Deleted: trunk/resources/META-INF/persistence-design.xml
===================================================================
--- trunk/resources/META-INF/persistence-design.xml 2008-08-26 11:25:57 UTC (rev 323)
+++ trunk/resources/META-INF/persistence-design.xml 2008-08-26 11:48:20 UTC (rev 324)
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Persistence deployment descriptor for dev profile -->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
- version="1.0">
-
- <persistence-unit name="blog">
- <provider>org.hibernate.ejb.HibernatePersistence</provider>
- <jta-data-source>java:/blogDatasource</jta-data-source>
- <class>org.jboss.blog.model.Group</class>
- <class>org.jboss.blog.model.feed.Feed</class>
- <class>org.jboss.blog.model.feed.RemoteFeed</class>
- <class>org.jboss.blog.model.feed.AggregatedFeed</class>
- <class>org.jboss.blog.model.feed.HighlightsFeed</class>
- <class>org.jboss.blog.model.feed.IndividualPostsFeed</class>
- <class>org.jboss.blog.model.feed.IndividualPostInfo</class>
- <class>org.jboss.blog.model.Category</class>
- <class>org.jboss.blog.model.Post</class>
- <class>org.jboss.blog.model.Enclosure</class>
- <class>org.jboss.blog.model.Image</class>
- <class>org.jboss.blog.model.Template</class>
- <class>org.jboss.blog.model.configuration.Configuration</class>
- <class>org.jboss.blog.model.security.SecurityMapping</class>
- <class>org.jboss.blog.model.security.SecurityGroup</class>
- <class>org.jboss.blog.model.security.SecurityUser</class>
- <class>org.jboss.blog.model.shotoku.ShotokuFeed</class>
- <class>org.jboss.blog.model.log.PropositionsLog</class>
- <properties>
- <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
- <property name="hibernate.hbm2ddl.auto" value="update"/>
- <property name="hibernate.show_sql" value="false"/>
- <property name="hibernate.format_sql" value="false"/>
- <property name="jboss.entity.manager.factory.jndi.name" value="java:/blogEntityManagerFactory"/>
- <property name="hibernate.connection.useUnicode" value="true" />
- <property name="hibernate.connection.characterEncoding" value="UTF-8" />
-
- <property name="hibernate.jdbc.batch_size" value="0" />
-
- <property name="hibernate.cache.use_query_cache" value="true"/>
- <property name="hibernate.cache.use_second_level_cache" value="true"/>
- <property name="hibernate.cache.provider_class" value="org.hibernate.cache.EhCacheProvider" />
- <property name="hibernate.cache.provider_configuration_file_resource_path" value="blog-ehcache.xml" />
-
- <!-- TODO Search -->
- <!-- use a file system based index
- <property name="hibernate.search.default.directory_provider"
- value="org.hibernate.search.store.FSDirectoryProvider"/> -->
- <!-- directory where the indexes will be stored
- <property name="hibernate.search.default.indexBase"
- value="/Users/adamwarski/jboss/blog-index"/>
-
- <property name="hibernate.ejb.event.post-insert"
- value="org.hibernate.search.event.FullTextIndexEventListener"/>
- <property name="hibernate.ejb.event.post-update"
- value="org.hibernate.search.event.FullTextIndexEventListener"/>
- <property name="hibernate.ejb.event.post-delete"
- value="org.hibernate.search.event.FullTextIndexEventListener"/>-->
- </properties>
- </persistence-unit>
-
-</persistence>
Modified: trunk/resources/META-INF/persistence-dev.xml
===================================================================
--- trunk/resources/META-INF/persistence-dev.xml 2008-08-26 11:25:57 UTC (rev 323)
+++ trunk/resources/META-INF/persistence-dev.xml 2008-08-26 11:48:20 UTC (rev 324)
@@ -23,7 +23,7 @@
<class>org.jboss.blog.model.security.SecurityMapping</class>
<class>org.jboss.blog.model.security.SecurityGroup</class>
<class>org.jboss.blog.model.security.SecurityUser</class>
- <class>org.jboss.blog.model.shotoku.ShotokuFeed</class>
+ <!--<class>org.jboss.blog.model.shotoku.ShotokuFeed</class>-->
<class>org.jboss.blog.model.log.PropositionsLog</class>
<properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
Deleted: trunk/resources/WEB-INF/web-design.xml
===================================================================
--- trunk/resources/WEB-INF/web-design.xml 2008-08-26 11:25:57 UTC (rev 323)
+++ trunk/resources/WEB-INF/web-design.xml 2008-08-26 11:48:20 UTC (rev 324)
@@ -1,147 +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/jboss/jboss-design/server/default/deploy/blog.ear/blog.war</param-value>
- </context-param>
-
- <!-- URL rewrite -->
-
- <filter>
- <filter-name>UrlRewriteFilter</filter-name>
- <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
- <init-param>
- <param-name>logLevel</param-name>
- <param-value>WARN</param-value>
- </init-param>
- <init-param>
- <param-name>statusEnabled</param-name>
- <param-value>false</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>UrlRewriteFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <!-- 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>
- -->
-
- <context-param>
- <param-name>facelets.SKIP_COMMENTS</param-name>
- <param-value>true</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/WEB-INF/web-dev.xml
===================================================================
--- trunk/resources/WEB-INF/web-dev.xml 2008-08-26 11:25:57 UTC (rev 323)
+++ trunk/resources/WEB-INF/web-dev.xml 2008-08-26 11:48:20 UTC (rev 324)
@@ -57,7 +57,7 @@
<!-- Resources filter -->
- <filter>
+ <!--<filter>
<filter-name>Resources Filter</filter-name>
<filter-class>org.jboss.shotoku.web.ResourcesFilter</filter-class>
</filter>
@@ -69,7 +69,7 @@
<dispatcher>FORWARD</dispatcher>
<dispatcher>INCLUDE</dispatcher>
<dispatcher>REQUEST</dispatcher>
- </filter-mapping>
+ </filter-mapping>-->
<servlet>
<servlet-name>Seam Resource Servlet</servlet-name>
@@ -92,10 +92,10 @@
<param-value>0</param-value>
</context-param>
- <context-param>
+ <!--<context-param>
<param-name>facelets.RESOURCE_RESOLVER</param-name>
<param-value>org.jboss.shotoku.web.FilesystemResourceResolver</param-value>
- </context-param>
+ </context-param>-->
<context-param>
<param-name>facelets.SKIP_COMMENTS</param-name>
Modified: trunk/resources/WEB-INF/web-prod.xml
===================================================================
--- trunk/resources/WEB-INF/web-prod.xml 2008-08-26 11:25:57 UTC (rev 323)
+++ trunk/resources/WEB-INF/web-prod.xml 2008-08-26 11:48:20 UTC (rev 324)
@@ -30,7 +30,7 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
- <!-- Resources filter -->
+ <!-- Resources filter
<filter>
<filter-name>Resources Filter</filter-name>
@@ -44,7 +44,7 @@
<dispatcher>FORWARD</dispatcher>
<dispatcher>INCLUDE</dispatcher>
<dispatcher>REQUEST</dispatcher>
- </filter-mapping>
+ </filter-mapping> -->
<!-- Seam -->
@@ -88,10 +88,10 @@
<param-value>0</param-value>
</context-param>
- <context-param>
+ <!--<context-param>
<param-name>facelets.RESOURCE_RESOLVER</param-name>
<param-value>org.jboss.shotoku.web.ShotokuFilesystemResourceResolver</param-value>
- </context-param>
+ </context-param>-->
<context-param>
<param-name>facelets.SKIP_COMMENTS</param-name>
Deleted: trunk/resources/blog-design-ds.xml
===================================================================
--- trunk/resources/blog-design-ds.xml 2008-08-26 11:25:57 UTC (rev 323)
+++ trunk/resources/blog-design-ds.xml 2008-08-26 11:48:20 UTC (rev 324)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE datasources
- PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
-
-<datasources>
-
- <local-tx-datasource>
- <jndi-name>blogDatasource</jndi-name>
- <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
- <driver-class>org.hsqldb.jdbcDriver</driver-class>
- <user-name>sa</user-name>
- <password></password>
- </local-tx-datasource>
-
-</datasources>
-
Modified: trunk/resources-portlet/WEB-INF/web.xml
===================================================================
--- trunk/resources-portlet/WEB-INF/web.xml 2008-08-26 11:25:57 UTC (rev 323)
+++ trunk/resources-portlet/WEB-INF/web.xml 2008-08-26 11:48:20 UTC (rev 324)
@@ -3,7 +3,7 @@
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">
- <filter>
+ <!--<filter>
<filter-name>Resources Filter</filter-name>
<filter-class>org.jboss.shotoku.web.ShotokuResourcesFilter</filter-class>
</filter>
@@ -15,5 +15,5 @@
<dispatcher>FORWARD</dispatcher>
<dispatcher>INCLUDE</dispatcher>
<dispatcher>REQUEST</dispatcher>
- </filter-mapping>
+ </filter-mapping>-->
</web-app>
More information about the jboss-cvs-commits
mailing list