Seam SVN: r15353 - branches/enterprise/WFK-2_1/examples/booking/booking-ear/src/main/resources.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-11-05 16:43:04 -0500 (Mon, 05 Nov 2012)
New Revision: 15353
Removed:
branches/enterprise/WFK-2_1/examples/booking/booking-ear/src/main/resources/application-for-ant-only.xml
Log:
removed ant related application.xml
Deleted: branches/enterprise/WFK-2_1/examples/booking/booking-ear/src/main/resources/application-for-ant-only.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/booking/booking-ear/src/main/resources/application-for-ant-only.xml 2012-11-05 21:41:17 UTC (rev 15352)
+++ branches/enterprise/WFK-2_1/examples/booking/booking-ear/src/main/resources/application-for-ant-only.xml 2012-11-05 21:43:04 UTC (rev 15353)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC
- "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
- "http://java.sun.com/dtd/application_1_3.dtd">
-<application>
- <display-name>booking-ear</display-name>
- <description>Examples for Seam 2 Framework in Java EE6 environment</description>
- <module>
- <web>
- <web-uri>booking-web.war</web-uri>
- <context-root>/seam-booking</context-root>
- </web>
- </module>
- <module>
- <ejb>booking-ejb.jar</ejb>
- </module>
- <module>
- <ejb>jboss-seam.jar</ejb>
- </module>
-</application>
\ No newline at end of file
12 years
Seam SVN: r15352 - in branches/enterprise/WFK-2_1/jboss-seam-gen/dist: src and 1 other directory.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-11-05 16:41:17 -0500 (Mon, 05 Nov 2012)
New Revision: 15352
Modified:
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/resources/WEB-INF/web.xml
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/FormAction.java
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/FormActionBean.java
Log:
rolled back of moved bean validation annotation and disabled default BeanValidator in web.xml
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/resources/WEB-INF/web.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/resources/WEB-INF/web.xml 2012-11-05 21:41:07 UTC (rev 15351)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/resources/WEB-INF/web.xml 2012-11-05 21:41:17 UTC (rev 15352)
@@ -66,6 +66,12 @@
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
+
+ <!-- disabling Bean validation -->
+ <context-param>
+ <param-name>javax.faces.validator.DISABLE_DEFAULT_BEAN_VALIDATOR</param-name>
+ <param-value>true</param-value>
+ </context-param>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/FormAction.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/FormAction.java 2012-11-05 21:41:07 UTC (rev 15351)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/FormAction.java 2012-11-05 21:41:17 UTC (rev 15352)
@@ -1,13 +1,11 @@
package @actionPackage@;
import javax.ejb.Local;
-import javax.validation.constraints.Size;
@Local
public interface @interfaceName@
{
public void @methodName@();
- @Size(max = 10)
public String getValue();
public void setValue(String value);
public void destroy();
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/FormActionBean.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/FormActionBean.java 2012-11-05 21:41:07 UTC (rev 15351)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/FormActionBean.java 2012-11-05 21:41:17 UTC (rev 15352)
@@ -7,6 +7,7 @@
import org.jboss.seam.annotations.Logger;
import org.jboss.seam.log.Log;
import org.jboss.seam.international.StatusMessages;
+import javax.validation.constraints.Size;
@Stateful
@Name("@componentName@")
@@ -26,7 +27,7 @@
}
// add additional action methods
-
+ @Size(max = 10)
public String getValue()
{
return value;
12 years
Seam SVN: r15351 - in branches/enterprise/WFK-2_1/examples/booking: booking-ear and 3 other directories.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-11-05 16:41:07 -0500 (Mon, 05 Nov 2012)
New Revision: 15351
Removed:
branches/enterprise/WFK-2_1/examples/booking/booking-ear/build.xml
branches/enterprise/WFK-2_1/examples/booking/booking-ejb/build.xml
branches/enterprise/WFK-2_1/examples/booking/booking-tests/build.xml
branches/enterprise/WFK-2_1/examples/booking/booking-web/build.xml
branches/enterprise/WFK-2_1/examples/booking/build.xml
Log:
removed ant scripts from booking example
Deleted: branches/enterprise/WFK-2_1/examples/booking/booking-ear/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/booking/booking-ear/build.xml 2012-11-05 19:30:40 UTC (rev 15350)
+++ branches/enterprise/WFK-2_1/examples/booking/booking-ear/build.xml 2012-11-05 21:41:07 UTC (rev 15351)
@@ -1,118 +0,0 @@
-<?xml version="1.0"?>
-<project name="booking-ejb" basedir="."
- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
- <!-- set global properties for this build -->
- <property environment="env"/>
- <property name="project.name" value="booking-ear"/>
-
- <property name="root.dir" value="../../.."/>
- <property name="project.parent.dir" value=".."/>
-
- <property name="target.dir" value="target"/>
- <property name="target.classes.dir" value="${target.dir}/classes"/>
- <property name="target.test-classes.dir" value="${target.dir}/test-classes"/>
- <property name="target.booking.ear.dir" value="${target.dir}/booking-ear"/>
-
- <property name="src.main.resources.dir" value="${basedir}/src/main/resources"/>
- <property name="src.main.application.dir" value="${basedir}/src/main/application"/>
-
- <property name="booking.ejb.dir" value="${project.parent.dir}/booking-ejb"/>
- <property name="booking.web.dir" value="${project.parent.dir}/booking-web"/>
-
-
- <path id="build.lib.classpath">
- <fileset dir="${root.dir}/build/lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="antlib:org.apache.maven.artifact.ant"
- classpathref="build.lib.classpath"/>
-
- <artifact:dependencies pathId="build.classpath">
- <dependency groupId="org.codehaus.groovy" artifactId="groovy" version="2.0.1"/>
- <dependency groupId="org.codehaus.groovy" artifactId="groovy-ant" version="2.0.1"/>
- <dependency groupId="commons-cli" artifactId="commons-cli" version="1.2"/>
- <dependency groupId="junit" artifactId="junit" version="4.10" scope="test"/>
- </artifact:dependencies>
-
-
- <artifact:dependencies pathId="project.classpath" filesetId="project.fileset">
- <dependency groupId="org.jboss.seam" artifactId="jboss-seam" version="2.3.0.Final-redhat-1" scope="compile">
- <exclusion groupId="org.testng" artifactId="testng"/>
- <exclusion groupId="junit" artifactId="junit"/>
- <exclusion groupId="org.jboss.spec.javax.faces" artifactId="jboss-jsf-api_2.0_spec"/>
- <exclusion groupId="javax.el" artifactId="el-api"/>
- <exclusion groupId="org.jboss.el" artifactId="jboss-el"/>
- </dependency>
- </artifact:dependencies>
-
- <artifact:dependencies pathId="lib.classpath" filesetId="lib.fileset">
- <dependency groupId="org.jboss.el" artifactId="jboss-el" version="1.0_02.CR6">
- <exclusion groupId="javax.el" artifactId="el-api"/>
- </dependency>
- </artifact:dependencies>
-
- <target name="clean" description="Cleans up the target directory">
- <delete dir="${target.dir}"/>
- </target>
-
- <target name="init">
- <tstamp/>
- <mkdir dir="${target.dir}"/>
- <condition property="booking.jar.exists">
- <and>
- <available file="${booking.ejb.dir}/target" type="dir"/>
- <available file="${booking.ejb.dir}/target/booking-ejb.jar"/>
- </and>
- </condition>
- <condition property="booking.web.exists">
- <and>
- <available file="${booking.web.dir}/target" type="dir"/>
- <available file="${booking.web.dir}/target/booking-web.war"/>
- </and>
- </condition>
- <echo message="${booking.jar.exists}"/>
- <echo message="${booking.war.exists}"/>
-
- </target>
-
- <target name="build-booking-ejb" depends="init" unless="booking.jar.exists">
- <ant antfile="${booking.ejb.dir}/build.xml" target="package" inheritAll="false"/>
- </target>
-
- <target name="build-booking-web" depends="build-booking-ejb" unless="booking.web.exists">
- <ant antfile="${booking.web.dir}/build.xml" target="package" inheritAll="false"/>
- </target>
-
- <target name="package" depends="build-booking-web" description="Compile the Java source code">
- <copy todir="${target.booking.ear.dir}">
- <fileset refid="project.fileset"/>
- <!-- This mapper strips off all leading directory information -->
- <chainedmapper>
- <mapper type="flatten"/>
- <mapper type="glob" from="jboss-seam*.jar" to="jboss-seam.jar"/>
- </chainedmapper>
- </copy>
-
- <copy todir="${target.booking.ear.dir}/lib">
- <fileset refid="lib.fileset"/>
- <mapper type="flatten"/>
- </copy>
-
- <ear destfile="${target.dir}/seam-booking.ear"
- appxml="${src.main.resources.dir}/application-for-ant-only.xml">
- <metainf dir="${src.main.application.dir}/META-INF">
- <include name="*.xml"/>
- </metainf>
-
- <fileset file="${booking.ejb.dir}/target/booking-ejb.jar"/>
- <fileset file="${booking.web.dir}/target/booking-web.war"/>
- <fileset dir="${target.booking.ear.dir}">
- <include name="**/*"/>
- </fileset>
- </ear>
- </target>
-</project>
\ No newline at end of file
Deleted: branches/enterprise/WFK-2_1/examples/booking/booking-ejb/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/booking/booking-ejb/build.xml 2012-11-05 19:30:40 UTC (rev 15350)
+++ branches/enterprise/WFK-2_1/examples/booking/booking-ejb/build.xml 2012-11-05 21:41:07 UTC (rev 15351)
@@ -1,146 +0,0 @@
-<?xml version="1.0"?>
-<project name="booking-ejb" basedir="."
- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
- <!-- set global properties for this build -->
- <property environment="env"/>
- <property name="project.name" value="booking-ejb"/>
- <property name="root.dir" value="../../.."/>
-
- <property name="target.dir" value="target"/>
- <property name="target.classes.dir" value="${target.dir}/classes"/>
- <property name="target.test-classes.dir" value="${target.dir}/test-classes"/>
-
- <property name="src.main.java.dir" value="${basedir}/src/main/java"/>
- <property name="src.test.java.dir" value="${basedir}/src/test/java"/>
- <property name="src.main.groovy.dir" value="${basedir}/src/main/groovy"/>
- <property name="src.test.groovy.dir" value="${basedir}/src/test/groovy"/>
- <property name="src.main.resources.dir" value="${basedir}/src/main/resources"/>
-
- <property name="javac.debug" value="true"/>
- <property name="javac.deprecation" value="false"/>
- <property name="debug" value="false"/>
- <property name="groovy.home" value="${env.GROOVY_HOME}"/>
-
- <path id="build.lib.classpath">
- <fileset dir="${root.dir}/build/lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="antlib:org.apache.maven.artifact.ant"
- classpathref="build.lib.classpath"/>
-
- <artifact:dependencies pathId="build.classpath">
- <dependency groupId="org.codehaus.groovy" artifactId="groovy" version="2.0.1"/>
- <dependency groupId="org.codehaus.groovy" artifactId="groovy-ant" version="2.0.1"/>
- <dependency groupId="commons-cli" artifactId="commons-cli" version="1.2"/>
- <dependency groupId="junit" artifactId="junit" version="4.10" scope="test"/>
- </artifact:dependencies>
-
-
- <artifact:dependencies pathId="project.classpath">
- <dependency groupId="antlr" artifactId="antlr" version="2.7.6" scope="provided"/>
- <dependency groupId="commons-collections" artifactId="commons-collections" version="3.2" scope="provided"/>
- <dependency groupId="dom4j" artifactId="dom4j" version="1.6.1-redhat-1" scope="provided"/>
- <dependency groupId="javax.validation" artifactId="validation-api" version="1.0.0.GA" scope="provided"/>
- <dependency groupId="org.hibernate" artifactId="hibernate-core" version="4.1.0.Final" scope="provided"/>
- <dependency groupId="org.hibernate" artifactId="hibernate-entitymanager" version="4.1.0.Final"
- scope="provided"/>
- <dependency groupId="org.hibernate" artifactId="hibernate-validator" version="4.2.0.Final" scope="provided"/>
- <dependency groupId="org.hibernate.common" artifactId="hibernate-commons-annotations" version="4.0.1.Final"
- scope="provided"/>
- <dependency groupId="org.hibernate.javax.persistence" artifactId="hibernate-jpa-2.0-api" version="1.0.1.Final"
- scope="provided"/>
- <dependency groupId="org.javassist" artifactId="javassist" version="3.15.0-GA" scope="provided"/>
- <dependency groupId="org.jboss.el" artifactId="jboss-el" version="1.0_02.CR6" scope="compile"/>
- <dependency groupId="org.jboss.logging" artifactId="jboss-logging" version="3.1.0.CR2" scope="provided"/>
- <dependency groupId="org.jboss.seam" artifactId="jboss-seam" version="2.3.0.Final-redhat-1" scope="compile">
- <exclusion groupId="org.testng" artifactId="testng"/>
- <exclusion groupId="junit" artifactId="junit"/>
- <exclusion groupId="org.jboss.spec.javax.faces" artifactId="jboss-jsf-api_2.0_spec"/>
- <exclusion groupId="javax.el" artifactId="el-api"/>
- </dependency>
- <dependency groupId="org.jboss.spec.javax.ejb" artifactId="jboss-ejb-api_3.1_spec" version="1.0.1.Final"
- scope="provided"/>
- <dependency groupId="org.jboss.spec.javax.faces" artifactId="jboss-jsf-api_2.0_spec" version="1.0.0.Final"
- scope="provided"/>
- <dependency groupId="org.jboss.spec.javax.servlet" artifactId="jboss-servlet-api_3.0_spec" version="1.0.0.Final"
- scope="provided"/>
- <dependency groupId="org.jboss.spec.javax.transaction" artifactId="jboss-transaction-api_1.1_spec"
- version="1.0.0.Final" scope="provided"/>
- <dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.6.1" scope="provided"/>
- </artifact:dependencies>
-
- <taskdef name="groovyc"
- classname="org.codehaus.groovy.ant.Groovyc"
- classpathref="build.classpath"/>
-
- <target name="clean" description="Cleans up the target directory">
- <delete dir="${target.dir}"/>
- </target>
-
- <target name="init">
- <tstamp/>
- <mkdir dir="${target.dir}"/>
- <mkdir dir="${src.main.java.dir}"/>
- <condition property="src.test.java.dir.exists">
- <available file="${src.test.java.dir}" type="dir"/>
- </condition>
- </target>
-
- <target name="compile" depends="init"
- description="Compile the Java source code">
- <mkdir dir="${target.classes.dir}"/>
- <javac source="1.6" target="1.6" debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- nowarn="on"
- includeantruntime="false"
- destdir="${target.classes.dir}">
- <src path="${src.main.java.dir}"/>
- <classpath refid="project.classpath"/>
- <compilerarg value="-Xlint"/>
- </javac>
- </target>
-
- <target name="compile-test" depends="compile"
- if="${src.test.java.dir.exists}">
- <mkdir dir="${target.test-classes.dir}"/>
- <javac source="1.6" target="1.6" debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- destdir="${target.test-classes.dir}"
- nowarn="on"
- includeantruntime="false">
- <compilerarg value="-Xlint"/>
- <src path="${src.test.java.dir}"/>
- <classpath refid="project.classpath"/>
- </javac>
- </target>
-
- <target name="test" depends="compile-test"
- if="${src.test.java.dir.exists}">
- <mkdir dir="${target.test.classes.dir}"/>
- <junit printsummary="yes" haltonfailure="yes">
- <formatter type="xml"/>
- <classpath refid="project.classpath"/>
- <batchtest fork="yes" todir="${test.results.dir}">
- <fileset dir="${target.test.classes.dir}"/>
- </batchtest>
- </junit>
- </target>
-
- <target name="package" depends="test"
- description="Compile the Java source code">
- <jar destfile="${target.dir}/booking-ejb.jar"
- basedir="${target.classes.dir}">
- <metainf dir="${src.main.resources.dir}/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="persistence.xml"/>
- </metainf>
- <fileset dir="${src.main.resources.dir}">
- <include name="import.sql"/>
- <include name="seam.properties"/>
- </fileset>
- </jar>
- </target>
-</project>
\ No newline at end of file
Deleted: branches/enterprise/WFK-2_1/examples/booking/booking-tests/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/booking/booking-tests/build.xml 2012-11-05 19:30:40 UTC (rev 15350)
+++ branches/enterprise/WFK-2_1/examples/booking/booking-tests/build.xml 2012-11-05 21:41:07 UTC (rev 15351)
@@ -1,173 +0,0 @@
-<?xml version="1.0"?>
-<project name="booking-test" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
- <!-- set global properties for this build -->
- <property environment="env"/>
- <property name="project.name" value="booking-ejb"/>
- <property name="root.dir" value="../../.."/>
-
- <property name="target.dir" value="target"/>
- <property name="target.classes.dir" value="${target.dir}/classes"/>
- <property name="target.test.classes.dir" value="${target.dir}/test-classes"/>
- <property name="target.test.results.dir" value="${target.dir}/test-results"/>
- <property name="target.test.reports.dir" value="${target.dir}/test-reports"/>
-
- <property name="src.main.java.dir" value="${basedir}/src/main/java"/>
- <property name="src.test.java.dir" value="${basedir}/src/test/java"/>
- <property name="src.main.groovy.dir" value="${basedir}/src/main/groovy"/>
- <property name="src.test.groovy.dir" value="${basedir}/src/test/groovy"/>
- <property name="src.main.resources.dir" value="${basedir}/src/main/resources"/>
- <property name="booking.ear.dir" value="../booking-ear"/>
- <property name="booking.ejb.dir" value="../booking-ejb"/>
- <property name="javac.debug" value="true"/>
- <property name="javac.deprecation" value="false"/>
- <property name="debug" value="false"/>
- <property name="version.jbossas7" value="${7.1.1.Final}"/>
-
- <path id="build.lib.classpath">
- <fileset dir="${root.dir}/build/lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="antlib:org.apache.maven.artifact.ant"
- classpathref="build.lib.classpath"/>
-
- <artifact:dependencies pathId="build.classpath">
- <dependency groupId="org.codehaus.groovy" artifactId="groovy" version="2.0.1"/>
- <dependency groupId="org.codehaus.groovy" artifactId="groovy-ant" version="2.0.1"/>
- <dependency groupId="commons-cli" artifactId="commons-cli" version="1.2"/>
- <dependency groupId="junit" artifactId="junit" version="4.10" scope="test"/>
- </artifact:dependencies>
-
- <artifact:dependencies pathId="project.classpath">
- <dependency groupId="org.jboss.seam" artifactId="jboss-seam" scope="test" version="2.3.0.Final-redhat-1"/>
- <dependency groupId="org.slf4j" artifactId="slf4j-log4j12" scope="test" version="1.6.1"/>
- <dependency groupId="org.hibernate.javax.persistence" artifactId="hibernate-jpa-2.0-api" version="1.0.1.Final"/>
- <dependency groupId="org.jboss.spec.javax.faces" artifactId="jboss-jsf-api_2.0_spec" version="1.0.0.Final"/>
- <dependency groupId="javax.mail" artifactId="mail" version="1.4"/>
- <dependency groupId="org.seleniumhq.selenium" artifactId="selenium-server" version="2.21.0"/>
- <dependency groupId="org.seleniumhq.selenium" artifactId="selenium-java" version="2.21.0"/>
- <dependency groupId="org.jboss.seam" artifactId="functional-tests" scope="test" version="2.3.0.Final-redhat-1"/>
- <dependency groupId="junit" artifactId="junit" scope="test" version="4.8.2"/>
- <dependency groupId="org.jboss.arquillian.junit" artifactId="arquillian-junit-container" scope="test"
- version="1.0.1.Final"/>
- <dependency groupId="org.jboss.arquillian.protocol" artifactId="arquillian-protocol-servlet" scope="test"
- version="1.0.1.Final"/>
- <dependency groupId="org.jboss.spec.javax.el" artifactId="jboss-el-api_2.2_spec" version="1.0.2.Final"/>
- <dependency groupId="org.jboss.as" artifactId="jboss-as-arquillian-container-managed" version="7.1.2.Final" scope="test"/>
- </artifact:dependencies>
-
- <path id="combined.project.classpath">
- <path refid="project.classpath"/>
- <pathelement location="${booking.ejb.dir}/target/classes"/>
- </path>
-
- <path id="combined.test.project.classpath">
- <path refid="combined.project.classpath"/>
- <pathelement location="${target.test.classes.dir}"/>
- </path>
-
- <taskdef name="groovyc"
- classname="org.codehaus.groovy.ant.Groovyc"
- classpathref="build.classpath"/>
-
- <target name="clean" description="Cleans up the target directory">
- <delete dir="${target.dir}"/>
- </target>
-
- <target name="init">
- <tstamp/>
- <mkdir dir="${target.dir}"/>
- <condition property="src.test.java.dir.exists">
- <available file="${src.test.java.dir}" type="dir"/>
- </condition>
- <condition property="booking.ejb.target.classes.dir.exists">
- <available file="${booking.ejb.dir}/target/classes" type="dir"/>
- </condition>
- <condition property="booking.ear.exists">
- <available file="${booking.ear.dir}/target/seam-booking.ear" type="dir"/>
- </condition>
- <condition property="src.main.java.exists">
- <available file="${src.main.java.dir}" type="dir"/>
- </condition>
- </target>
-
- <target name="build-booking-ejb" depends="init" unless="booking.ejb.target.classes.dir.exists">
- <ant antfile="${booking.ejb.dir}/build.xml" target="compile" inheritAll="false"/>
- </target>
-
- <target name="build-booking-ear" depends="build-booking-ejb" unless="booking.ear.exists">
- <ant antfile="${booking.ear.dir}/build.xml" target="package" inheritAll="false"/>
- </target>
-
- <target name="compile" depends="build-booking-ear" if="${src.main.java.exists}"
- description="Compile the Java source code">
- <mkdir dir="${target.classes.dir}"/>
- <javac source="1.6" target="1.6" debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- nowarn="on"
- includeantruntime="false">
- <src path="${src.main.java.dir}"/>
- <classpath refid="combined.project.classpath"/>
- <compilerarg value="-Xlint"/>
- </javac>
- </target>
-
- <target name="compile-test" depends="compile"
- if="${src.test.java.dir.exists}">
- <mkdir dir="${target.test.classes.dir}"/>
- <property name="myclasspath" refid="combined.project.classpath"/>
- <echo message="${myclasspath}"/>
- <javac source="1.6" target="1.6" debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- destdir="${target.test.classes.dir}"
- nowarn="on"
- includeantruntime="false">
- <compilerarg value="-Xlint"/>
- <src path="${src.test.java.dir}"/>
- <classpath refid="combined.project.classpath"/>
- </javac>
- </target>
-
- <target name="process-test-resources" depends="compile-test">
- <copy todir="${target.test.classes.dir}">
- <fileset dir="${src.test.resources}">
- <include name="*"/>
- </fileset>
- <fileset dir="${src.test.resources-integration}">
- <include name="*"/>
- </fileset>
- <fileset dir="${booking.web.dir}/src/main/resources">
- <include name="*"/>
- </fileset>
- <filterset begintoken="${" endtoken="}">
- <filter token="version.jbossas7" value="${version.jbossas7}"/>
- </filterset>
- </copy>
- </target>
-
- <target name="test" depends="compile-test"
- if="${src.test.java.dir.exists}">
- <mkdir dir="${target.test.classes.dir}"/>
- <mkdir dir="${target.test.results.dir}"/>
- <mkdir dir="${target.test.reports.dir}"/>
- <junit printsummary="yes" haltonfailure="no">
- <formatter type="xml"/>
- <classpath refid="combined.test.project.classpath"/>
- <batchtest fork="yes" todir="${target.test.results.dir}">
- <fileset dir="${target.test.classes.dir}">
- <exclude name="**/Deployments.class"/>
- </fileset>
- </batchtest>
- </junit>
- <junitreport todir="${target.test.reports.dir}">
- <fileset dir="${target.test.results.dir}">
- <include name="TEST-*.xml" />
- </fileset>
- <report todir="${target.test.reports.dir}" />
- </junitreport>
- </target>
-
-</project>
Deleted: branches/enterprise/WFK-2_1/examples/booking/booking-web/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/booking/booking-web/build.xml 2012-11-05 19:30:40 UTC (rev 15350)
+++ branches/enterprise/WFK-2_1/examples/booking/booking-web/build.xml 2012-11-05 21:41:07 UTC (rev 15351)
@@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-<project name="booking-ejb" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
- <!-- set global properties for this build -->
- <property environment="env"/>
- <property name="project.name" value="booking-ejb"/>
- <property name="root.dir" value="../../.."/>
-
- <property name="target.dir" value="target"/>
- <property name="target.classes.dir" value="${target.dir}/classes"/>
- <property name="target.web.dir" value="${target.dir}/webapp"/>
-
- <property name="src.main.java.dir" value="${basedir}/src/main/java"/>
- <property name="src.test.java.dir" value="${basedir}/src/test/java"/>
- <property name="src.main.groovy.dir" value="${basedir}/src/main/groovy"/>
- <property name="src.test.groovy.dir" value="${basedir}/src/test/groovy"/>
- <property name="src.main.webapp.dir" value="${basedir}/src/main/webapp"/>
- <property name="src.main.resources.dir" value="${basedir}/src/main/resources"/>
-
- <property name="javac.debug" value="true"/>
- <property name="javac.deprecation" value="false"/>
- <property name="debug" value="false"/>
- <property name="groovy.home" value="${env.GROOVY_HOME}"/>
-
- <property name="jndiPattern" value="java:app/booking-ejb/#{ejbName}"/>
- <property name="distributable" value="false"/>
-
- <path id="build.lib.classpath">
- <fileset dir="${root.dir}/build/lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="antlib:org.apache.maven.artifact.ant"
- classpathref="build.lib.classpath"/>
-
- <artifact:dependencies pathId="build.classpath">
- <dependency groupId="org.codehaus.groovy" artifactId="groovy" version="2.0.1"/>
- <dependency groupId="org.codehaus.groovy" artifactId="groovy-ant" version="2.0.1"/>
- <dependency groupId="commons-cli" artifactId="commons-cli" version="1.2"/>
- <dependency groupId="junit" artifactId="junit" version="4.10" scope="test"/>
- </artifact:dependencies>
-
- <artifact:dependencies pathId="project.classpath" filesetId="project.fileset" useScope="runtime">
- <dependency groupId="org.jboss.seam" artifactId="jboss-seam-ui" version="2.3.0.Final-redhat-1" scope="runtime">
- <exclusion groupId="org.jboss.seam" artifactId="jboss-seam"/>
- </dependency>
- <dependency groupId="org.jboss.seam" artifactId="jboss-seam-debug" version="2.3.0.Final-redhat-1"
- scope="compile">
- <exclusion groupId="org.jboss.seam" artifactId="jboss-seam"/>
- </dependency>
- <dependency groupId="commons-beanutils" artifactId="commons-beanutils" version="1.8.3" scope="compile">
- <exclusion groupId="commons-collections" artifactId="commons-collections"/>
- </dependency>
- <dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1" scope="compile"/>
- <dependency groupId="org.richfaces.ui" artifactId="richfaces-components-ui" version="4.3.0.20120802-M1"
- scope="compile"/>
- <dependency groupId="org.richfaces.core" artifactId="richfaces-core-impl" version="4.3.0.20120802-M1"
- scope="compile"/>
- <dependency groupId="org.richfaces.core" artifactId="richfaces-core-api" version="4.3.0.20120802-M1"
- scope="compile"/>
- </artifact:dependencies>
-
- <taskdef name="groovyc"
- classname="org.codehaus.groovy.ant.Groovyc"
- classpathref="build.classpath"/>
-
- <target name="clean" description="Cleans up the target directory">
- <delete dir="${target.dir}"/>
- </target>
-
- <target name="init">
- <tstamp/>
- <mkdir dir="${target.dir}"/>
- <mkdir dir="${src.main.java.dir}"/>
- <condition property="src.test.java.dir.exists">
- <available file="${src.test.java.dir}" type="dir"/>
- </condition>
- </target>
-
- <target name="compile" depends="init"
- description="Compile the Java source code">
- <mkdir dir="${target.classes.dir}"/>
- <javac source="1.6" target="1.6" debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- nowarn="on"
- includeantruntime="false">
- <src path="${src.main.java.dir}"/>
- <classpath refid="project.classpath"/>
- <compilerarg value="-Xlint"/>
- </javac>
- </target>
-
- <target name="compile-test" depends="compile"
- if="${src.test.java.dir.exists}">
- <mkdir dir="${target.test-classes.dir}"/>
- <javac source="1.6" target="1.6" debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- destdir="${target.test-classes.dir}"
- nowarn="on"
- includeantruntime="false">
- <compilerarg value="-Xlint"/>
- <src path="${src.test.java.dir}"/>
- <classpath refid="project.classpath"/>
- </javac>
- </target>
-
- <target name="test" depends="compile-test"
- if="${src.test.java.dir.exists}">
- <junit printsummary="yes" haltonfailure="yes">
- <formatter type="xml"/>
- <classpath refid="project.classpath"/>
- <batchtest fork="yes" todir="${test.results.dir}">
- <fileset dir="${target.test.classes.dir}"/>
- </batchtest>
- </junit>
- </target>
-
- <target name="package" depends="compile"
- description="Compile the Java source code">
- <mkdir dir="${target.web.dir}"/>
- <copy todir="${target.web.dir}">
- <fileset dir="${src.main.webapp.dir}"/>
- <filterset begintoken="${" endtoken="}">
- <filter token="jndiPattern" value="${jndiPattern}"/>
- <filter token="distributable" value="${distributable}"/>
- </filterset>
- </copy>
-
- <copy todir="${target.web.dir}/WEB-INF/lib">
- <fileset refid="project.fileset"/>
- <!-- This mapper strips off all leading directory information -->
- <mapper type="flatten"/>
- </copy>
-
- <war destfile="${target.dir}/booking-web.war"
- webxml="${target.web.dir}/WEB-INF/web.xml">
- <fileset dir="${target.web.dir}">
- <exclude name="/WEB-INF/web.xml"/>
- </fileset>
- <classes dir="${target.classes.dir}"/>
- </war>
- </target>
-</project>
Deleted: branches/enterprise/WFK-2_1/examples/booking/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/booking/build.xml 2012-11-05 19:30:40 UTC (rev 15350)
+++ branches/enterprise/WFK-2_1/examples/booking/build.xml 2012-11-05 21:41:07 UTC (rev 15351)
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<project name="booking" basedir="." >
-
- <property name="booking.ear.dir" value="${basedir}/booking-ear"/>
- <property name="booking.ejb.dir" value="${basedir}/booking-ejb"/>
- <property name="booking.web.dir" value="${basedir}/booking-web"/>
- <property name="booking.tests.dir" value="${basedir}/booking-tests"/>
-
- <target name="clean" description="Cleans up the target directory in every module">
- <ant antfile="${booking.ear.dir}/build.xml" target="clean" inheritAll="false"/>
- <ant antfile="${booking.ejb.dir}/build.xml" target="clean" inheritAll="false"/>
- <ant antfile="${booking.web.dir}/build.xml" target="clean" inheritAll="false"/>
- <ant antfile="${booking.tests.dir}/build.xml" target="clean" inheritAll="false"/>
- </target>
-
- <target name="package" description="Cleans up the target directory in every module">
- <ant antfile="${booking.ear.dir}/build.xml" target="package" inheritAll="false"/>
- <ant antfile="${booking.ejb.dir}/build.xml" target="package" inheritAll="false"/>
- <ant antfile="${booking.web.dir}/build.xml" target="package" inheritAll="false"/>
- </target>
-
-</project>
12 years
Seam SVN: r15350 - branches/enterprise/WFK-2_1/bom.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-11-05 14:30:40 -0500 (Mon, 05 Nov 2012)
New Revision: 15350
Modified:
branches/enterprise/WFK-2_1/bom/pom.xml
Log:
updated from arquillian BOM to javaee-with-tools
Modified: branches/enterprise/WFK-2_1/bom/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/bom/pom.xml 2012-11-05 19:30:33 UTC (rev 15349)
+++ branches/enterprise/WFK-2_1/bom/pom.xml 2012-11-05 19:30:40 UTC (rev 15350)
@@ -68,8 +68,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.bom</groupId>
- <artifactId>jboss-wfk-arquillian</artifactId>
+ <groupId>com.redhat.jboss.wfk.boms</groupId>
+ <artifactId>jboss-javaee-6.0-with-tools</artifactId>
<version>${version.org.jboss.bom}</version>
<type>pom</type>
<scope>import</scope>
12 years
Seam SVN: r15349 - in branches/enterprise/WFK-2_1/examples/seamspace: seamspace-ear and 4 other directories.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-11-05 14:30:33 -0500 (Mon, 05 Nov 2012)
New Revision: 15349
Removed:
branches/enterprise/WFK-2_1/examples/seamspace/build.xml
branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ear/build.xml
branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ear/src/main/resources/application-for-ant-only.xml
branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb/build.xml
branches/enterprise/WFK-2_1/examples/seamspace/seamspace-tests/build.xml
branches/enterprise/WFK-2_1/examples/seamspace/seamspace-web/build.xml
Log:
removed ant scripts from seamspace example
Deleted: branches/enterprise/WFK-2_1/examples/seamspace/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamspace/build.xml 2012-11-05 14:33:10 UTC (rev 15348)
+++ branches/enterprise/WFK-2_1/examples/seamspace/build.xml 2012-11-05 19:30:33 UTC (rev 15349)
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<project name="seamspace" basedir="." >
-
- <property name="seamspace.ear.dir" value="${basedir}/seamspace-ear"/>
- <property name="seamspace.ejb.dir" value="${basedir}/seamspace-ejb"/>
- <property name="seamspace.web.dir" value="${basedir}/seamspace-web"/>
- <property name="seamspace.tests.dir" value="${basedir}/seamspace-tests"/>
-
- <target name="clean" description="Cleans up the target directory in every module">
- <ant antfile="${seamspace.ear.dir}/build.xml" target="clean" inheritAll="false"/>
- <ant antfile="${seamspace.ejb.dir}/build.xml" target="clean" inheritAll="false"/>
- <ant antfile="${seamspace.web.dir}/build.xml" target="clean" inheritAll="false"/>
- <ant antfile="${seamspace.tests.dir}/build.xml" target="clean" inheritAll="false"/>
- </target>
-
- <target name="package" description="Cleans up the target directory in every module">
- <ant antfile="${seamspace.ear.dir}/build.xml" target="package" inheritAll="false"/>
- <ant antfile="${seamspace.ejb.dir}/build.xml" target="package" inheritAll="false"/>
- <ant antfile="${seamspace.web.dir}/build.xml" target="package" inheritAll="false"/>
- </target>
-
-</project>
Deleted: branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ear/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ear/build.xml 2012-11-05 14:33:10 UTC (rev 15348)
+++ branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ear/build.xml 2012-11-05 19:30:33 UTC (rev 15349)
@@ -1,152 +0,0 @@
-<?xml version="1.0"?>
-<project name="seamspace-ear" basedir="."
- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
- <!-- set global properties for this build -->
- <property environment="env"/>
- <property name="project.name" value="seamspace-ear"/>
-
- <property name="root.dir" value="../../.."/>
- <property name="project.parent.dir" value=".."/>
-
- <property name="target.dir" value="target"/>
- <property name="target.classes.dir" value="${target.dir}/classes"/>
- <property name="target.test-classes.dir" value="${target.dir}/test-classes"/>
- <property name="target.seamspace.ear.dir" value="${target.dir}/seamspace-ear"/>
-
- <property name="src.main.resources.dir" value="${basedir}/src/main/resources"/>
- <property name="src.main.application.dir" value="${basedir}/src/main/application"/>
-
- <property name="seamspace.ejb.dir" value="${project.parent.dir}/seamspace-ejb"/>
- <property name="seamspace.web.dir" value="${project.parent.dir}/seamspace-web"/>
-
-
- <path id="build.lib.classpath">
- <fileset dir="${root.dir}/build/lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="antlib:org.apache.maven.artifact.ant"
- classpathref="build.lib.classpath"/>
-
- <artifact:dependencies pathId="build.classpath">
- <dependency groupId="org.codehaus.groovy" artifactId="groovy" version="2.0.1"/>
- <dependency groupId="org.codehaus.groovy" artifactId="groovy-ant" version="2.0.1"/>
- <dependency groupId="commons-cli" artifactId="commons-cli" version="1.2"/>
- <dependency groupId="junit" artifactId="junit" version="4.10" scope="test"/>
- </artifact:dependencies>
-
-
- <artifact:dependencies pathId="project.classpath" filesetId="project.fileset">
- <dependency groupId="org.jboss.seam" artifactId="jboss-seam" version="2.3.0.Final-redhat-1 scope="compile">
- <exclusion groupId="org.testng" artifactId="testng"/>
- <exclusion groupId="junit" artifactId="junit"/>
- <exclusion groupId="org.jboss.spec.javax.faces" artifactId="jboss-jsf-api_2.0_spec"/>
- <exclusion groupId="javax.el" artifactId="el-api"/>
- <exclusion groupId="org.jboss.el" artifactId="jboss-el"/>
- </dependency>
- <dependency groupId="commons-digester" artifactId="commons-digester" version="2.1"/>
- <dependency groupId="org.drools" artifactId="drools-core" version="5.1.1">
- <exclusion groupId="joda-time" artifactId="joda-time"/>
- </dependency>
- <dependency groupId="org.drools" artifactId="drools-compiler" version="5.1.1"/>
- <dependency groupId="org.drools" artifactId="drools-decisiontables" version="5.1.1"/>
- <dependency groupId="org.drools" artifactId="drools-templates" version="5.1.1"/>
- <dependency groupId="net.sourceforge.jexcelapi" artifactId="jxl" version="2.6.10">
- <exclusion groupId="log4j" artifactId="log4j"/>
- </dependency>
- </artifact:dependencies>
-
- <artifact:dependencies pathId="lib.classpath" filesetId="lib.fileset">
- <dependency groupId="org.hibernate" artifactId="hibernate-entitymanager" version="4.1.0.Final"
- scope="provided"/>
- <dependency groupId="org.hibernate" artifactId="hibernate-validator" version="4.2.0.Final" scope="provided"/>
- <dependency groupId="org.hibernate.javax.persistence" artifactId="hibernate-jpa-2.0-api" version="1.0.1.Final"
- scope="provided"/>
- <dependency groupId="org.jboss.seam" artifactId="jboss-seam" version="2.3.0.Final-redhat-1 scope="compile">
- <exclusion groupId="org.testng" artifactId="testng"/>
- <exclusion groupId="junit" artifactId="junit"/>
- <exclusion groupId="org.jboss.spec.javax.faces" artifactId="jboss-jsf-api_2.0_spec"/>
- <exclusion groupId="javax.el" artifactId="el-api"/>
- </dependency>
- <dependency groupId="org.jboss.spec.javax.ejb" artifactId="jboss-ejb-api_3.1_spec" version="1.0.1.Final"
- scope="provided"/>
- <dependency groupId="org.jboss.spec.javax.faces" artifactId="jboss-jsf-api_2.0_spec" version="1.0.0.Final"
- scope="provided"/>
- <dependency groupId="org.jboss.spec.javax.servlet" artifactId="jboss-servlet-api_3.0_spec" version="1.0.0.Final"
- scope="provided"/>
- <dependency groupId="org.drools" artifactId="drools-core" version="5.1.1">
- <exclusion groupId="joda-time" artifactId="joda-time"/>
- </dependency>
- <dependency groupId="org.drools" artifactId="drools-compiler" version="5.1.1"/>
- <dependency groupId="org.drools" artifactId="drools-decisiontables" version="5.1.1"/>
- <dependency groupId="org.drools" artifactId="drools-templates" version="5.1.1"/>
- <dependency groupId="org.drools" artifactId="knowledge-api" version="5.3.3.Final" />
- <dependency groupId="net.sourceforge.jexcelapi" artifactId="jxl" version="2.6.10">
- <exclusion groupId="log4j" artifactId="log4j"/>
- </dependency>
- </artifact:dependencies>
-
- <target name="clean" description="Cleans up the target directory">
- <delete dir="${target.dir}"/>
- </target>
-
- <target name="init">
- <tstamp/>
- <mkdir dir="${target.dir}"/>
- <condition property="seamspace.jar.exists">
- <and>
- <available file="${seamspace.ejb.dir}/target" type="dir"/>
- <available file="${seamspace.ejb.dir}/target/seamspace-ejb.jar"/>
- </and>
- </condition>
- <condition property="seamspace.web.exists">
- <and>
- <available file="${seamspace.web.dir}/target" type="dir"/>
- <available file="${seamspace.web.dir}/target/seamspace-web.war"/>
- </and>
- </condition>
- <echo message="${seamspace.jar.exists}"/>
- <echo message="${seamspace.war.exists}"/>
-
- </target>
-
- <target name="build-seamspace-ejb" depends="init" unless="seamspace.jar.exists">
- <ant antfile="${seamspace.ejb.dir}/build.xml" target="package" inheritAll="false"/>
- </target>
-
- <target name="build-seamspace-web" depends="build-seamspace-ejb" unless="seamspace.web.exists">
- <ant antfile="${seamspace.web.dir}/build.xml" target="package" inheritAll="false"/>
- </target>
-
- <target name="package" depends="build-seamspace-web" description="Compile the Java source code">
- <copy todir="${target.seamspace.ear.dir}">
- <fileset refid="project.fileset"/>
- <!-- This mapper strips off all leading directory information -->
- <chainedmapper>
- <mapper type="flatten"/>
- <mapper type="glob" from="jboss-seam*.jar" to="jboss-seam.jar"/>
- </chainedmapper>
- </copy>
-
- <copy todir="${target.seamspace.ear.dir}/lib">
- <fileset refid="lib.fileset"/>
- <mapper type="flatten"/>
- </copy>
-
- <ear destfile="${target.dir}/seam-seamspace.ear"
- appxml="${src.main.resources.dir}/application-for-ant-only.xml">
- <metainf dir="${src.main.application.dir}/META-INF">
- <include name="*.xml"/>
- </metainf>
-
- <fileset file="${seamspace.ejb.dir}/target/seamspace-ejb.jar"/>
- <fileset file="${seamspace.web.dir}/target/seamspace-web.war"/>
- <fileset dir="${target.seamspace.ear.dir}">
- <include name="**/*"/>
- </fileset>
- </ear>
- </target>
-</project>
\ No newline at end of file
Deleted: branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ear/src/main/resources/application-for-ant-only.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ear/src/main/resources/application-for-ant-only.xml 2012-11-05 14:33:10 UTC (rev 15348)
+++ branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ear/src/main/resources/application-for-ant-only.xml 2012-11-05 19:30:33 UTC (rev 15349)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application 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/application_6.xsd" version="6">
- <description>Examples for Seam 2 Framework in Java EE6 environment</description>
- <display-name>seamspace-ear</display-name>
- <module>
- <web>
- <web-uri>seamspace-web.war</web-uri>
- <context-root>/seam-seamspace</context-root>
- </web>
- </module>
- <module>
- <ejb>seamspace-ejb.jar</ejb>
- </module>
- <module>
- <ejb>jboss-seam.jar</ejb>
- </module>
- <library-directory>lib</library-directory>
-</application>
Deleted: branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb/build.xml 2012-11-05 14:33:10 UTC (rev 15348)
+++ branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb/build.xml 2012-11-05 19:30:33 UTC (rev 15349)
@@ -1,142 +0,0 @@
-<?xml version="1.0"?>
-<project name="seamspace-ejb" basedir="."
- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
- <!-- set global properties for this build -->
- <property environment="env"/>
- <property name="project.name" value="seamspace-ejb"/>
- <property name="root.dir" value="../../.."/>
-
- <property name="target.dir" value="target"/>
- <property name="target.classes.dir" value="${target.dir}/classes"/>
- <property name="target.test-classes.dir" value="${target.dir}/test-classes"/>
-
- <property name="src.main.java.dir" value="${basedir}/src/main/java"/>
- <property name="src.test.java.dir" value="${basedir}/src/test/java"/>
- <property name="src.main.groovy.dir" value="${basedir}/src/main/groovy"/>
- <property name="src.test.groovy.dir" value="${basedir}/src/test/groovy"/>
- <property name="src.main.resources.dir" value="${basedir}/src/main/resources"/>
-
- <property name="javac.debug" value="true"/>
- <property name="javac.deprecation" value="false"/>
- <property name="debug" value="false"/>
- <property name="groovy.home" value="${env.GROOVY_HOME}"/>
-
- <path id="build.lib.classpath">
- <fileset dir="${root.dir}/build/lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="antlib:org.apache.maven.artifact.ant"
- classpathref="build.lib.classpath"/>
-
- <artifact:dependencies pathId="build.classpath">
- <dependency groupId="org.codehaus.groovy" artifactId="groovy" version="2.0.1"/>
- <dependency groupId="org.codehaus.groovy" artifactId="groovy-ant" version="2.0.1"/>
- <dependency groupId="commons-cli" artifactId="commons-cli" version="1.2"/>
- <dependency groupId="junit" artifactId="junit" version="4.10" scope="test"/>
- </artifact:dependencies>
-
-
- <artifact:dependencies pathId="project.classpath">
- <dependency groupId="org.hibernate" artifactId="hibernate-entitymanager" version="4.1.0.Final"
- scope="provided"/>
- <dependency groupId="org.hibernate" artifactId="hibernate-validator" version="4.2.0.Final" scope="provided"/>
- <dependency groupId="org.hibernate.javax.persistence" artifactId="hibernate-jpa-2.0-api" version="1.0.1.Final"
- scope="provided"/>
- <dependency groupId="org.jboss.seam" artifactId="jboss-seam" version="2.3.0.Final-redhat-1 scope="compile">
- <exclusion groupId="org.testng" artifactId="testng"/>
- <exclusion groupId="junit" artifactId="junit"/>
- <exclusion groupId="org.jboss.spec.javax.faces" artifactId="jboss-jsf-api_2.0_spec"/>
- <exclusion groupId="javax.el" artifactId="el-api"/>
- </dependency>
- <dependency groupId="org.jboss.spec.javax.ejb" artifactId="jboss-ejb-api_3.1_spec" version="1.0.1.Final"
- scope="provided"/>
- <dependency groupId="org.jboss.spec.javax.faces" artifactId="jboss-jsf-api_2.0_spec" version="1.0.0.Final"
- scope="provided"/>
- <dependency groupId="org.jboss.spec.javax.servlet" artifactId="jboss-servlet-api_3.0_spec" version="1.0.0.Final"
- scope="provided"/>
- <dependency groupId="org.drools" artifactId="drools-core" version="5.1.1">
- <exclusion groupId="joda-time" artifactId="joda-time"/>
- </dependency>
- <dependency groupId="org.drools" artifactId="drools-compiler" version="5.1.1"/>
- <dependency groupId="org.drools" artifactId="drools-decisiontables" version="5.1.1"/>
- <dependency groupId="org.drools" artifactId="drools-templates" version="5.1.1"/>
- <dependency groupId="net.sourceforge.jexcelapi" artifactId="jxl" version="2.6.10">
- <exclusion groupId="log4j" artifactId="log4j"/>
- </dependency>
- </artifact:dependencies>
-
- <taskdef name="groovyc"
- classname="org.codehaus.groovy.ant.Groovyc"
- classpathref="build.classpath"/>
-
- <target name="clean" description="Cleans up the target directory">
- <delete dir="${target.dir}"/>
- </target>
-
- <target name="init">
- <tstamp/>
- <mkdir dir="${target.dir}"/>
- <mkdir dir="${src.main.java.dir}"/>
- <condition property="src.test.java.dir.exists">
- <available file="${src.test.java.dir}" type="dir"/>
- </condition>
- </target>
-
- <target name="compile" depends="init"
- description="Compile the Java source code">
- <mkdir dir="${target.classes.dir}"/>
- <javac source="1.6" target="1.6" debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- nowarn="on"
- includeantruntime="false"
- destdir="${target.classes.dir}">
- <src path="${src.main.java.dir}"/>
- <classpath refid="project.classpath"/>
- <compilerarg value="-Xlint"/>
- </javac>
- </target>
-
- <target name="compile-test" depends="compile"
- if="${src.test.java.dir.exists}">
- <mkdir dir="${target.test-classes.dir}"/>
- <javac source="1.6" target="1.6" debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- destdir="${target.test-classes.dir}"
- nowarn="on"
- includeantruntime="false">
- <compilerarg value="-Xlint"/>
- <src path="${src.test.java.dir}"/>
- <classpath refid="project.classpath"/>
- </javac>
- </target>
-
- <target name="test" depends="compile-test"
- if="${src.test.java.dir.exists}">
- <mkdir dir="${target.test.classes.dir}"/>
- <junit printsummary="yes" haltonfailure="yes">
- <formatter type="xml"/>
- <classpath refid="project.classpath"/>
- <batchtest fork="yes" todir="${test.results.dir}">
- <fileset dir="${target.test.classes.dir}"/>
- </batchtest>
- </junit>
- </target>
-
- <target name="package" depends="test"
- description="Compile the Java source code">
- <jar destfile="${target.dir}/seamspace-ejb.jar"
- basedir="${target.classes.dir}">
- <metainf dir="${src.main.resources.dir}/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="persistence.xml"/>
- </metainf>
- <fileset dir="${src.main.resources.dir}">
- <include name="import.sql"/>
- <include name="seam.properties"/>
- </fileset>
- </jar>
- </target>
-</project>
\ No newline at end of file
Deleted: branches/enterprise/WFK-2_1/examples/seamspace/seamspace-tests/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamspace/seamspace-tests/build.xml 2012-11-05 14:33:10 UTC (rev 15348)
+++ branches/enterprise/WFK-2_1/examples/seamspace/seamspace-tests/build.xml 2012-11-05 19:30:33 UTC (rev 15349)
@@ -1,198 +0,0 @@
-<?xml version="1.0"?>
-<project name="seamspace-test" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
- <!-- set global properties for this build -->
- <property environment="env"/>
- <property name="project.name" value="seamspace-ejb"/>
- <property name="root.dir" value="../../.."/>
-
- <property name="target.dir" value="target"/>
- <property name="target.classes.dir" value="${target.dir}/classes"/>
- <property name="target.test.classes.dir" value="${target.dir}/test-classes"/>
- <property name="target.test.results.dir" value="${target.dir}/test-results"/>
- <property name="target.test.reports.dir" value="${target.dir}/test-reports"/>
-
- <property name="src.main.java.dir" value="${basedir}/src/main/java"/>
- <property name="src.test.java.dir" value="${basedir}/src/test/java"/>
- <property name="src.test.resources.dir" value="${basedir}/src/test/resources"/>
- <property name="src.test.resources-integration.dir" value="${basedir}/src/test/resources-integration"/>
- <property name="src.main.groovy.dir" value="${basedir}/src/main/groovy"/>
- <property name="src.test.groovy.dir" value="${basedir}/src/test/groovy"/>
- <property name="src.main.resources.dir" value="${basedir}/src/main/resources"/>
- <property name="seamspace.ear.dir" value="../seamspace-ear"/>
- <property name="seamspace.ejb.dir" value="../seamspace-ejb"/>
- <property name="seamspace.web.dir" value="../seamspace-web"/>
- <property name="javac.debug" value="true"/>
- <property name="javac.deprecation" value="false"/>
- <property name="debug" value="false"/>
- <property name="version.jbossas7" value="7.1.1.Final"/>
-
- <path id="build.lib.classpath">
- <fileset dir="${root.dir}/build/lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="antlib:org.apache.maven.artifact.ant"
- classpathref="build.lib.classpath"/>
-
- <artifact:dependencies pathId="build.classpath">
- <dependency groupId="org.codehaus.groovy" artifactId="groovy" version="2.0.1"/>
- <dependency groupId="org.codehaus.groovy" artifactId="groovy-ant" version="2.0.1"/>
- <dependency groupId="commons-cli" artifactId="commons-cli" version="1.2"/>
- <dependency groupId="junit" artifactId="junit" version="4.10" scope="test"/>
-
- </artifact:dependencies>
-
- <artifact:dependencies pathId="project.classpath" filesetId="project.fileset">
- <dependency groupId="org.jboss.seam" artifactId="jboss-seam" scope="test" version="2.3.0.Final-redhat-1/>
- <dependency groupId="org.slf4j" artifactId="slf4j-log4j12" scope="test" version="1.6.1"/>
- <dependency groupId="org.hibernate.javax.persistence" scope="test" artifactId="hibernate-jpa-2.0-api" version="1.0.1.Final"/>
- <dependency groupId="org.jboss.spec.javax.faces" scope="test" artifactId="jboss-jsf-api_2.0_spec" version="1.0.0.Final"/>
- <dependency groupId="javax.mail" artifactId="mail" version="1.4"/>
- <dependency groupId="org.seleniumhq.selenium" artifactId="selenium-server" version="2.21.0"/>
- <dependency groupId="org.seleniumhq.selenium" artifactId="selenium-java" version="2.21.0"/>
- <dependency groupId="org.jboss.seam" artifactId="functional-tests" scope="test" version="2.3.0.Final-redhat-1/>
- <dependency groupId="junit" artifactId="junit" scope="test" version="4.8.2"/>
- <dependency groupId="org.jboss.arquillian.junit" artifactId="arquillian-junit-container" scope="test"
- version="1.0.1.Final"/>
- <dependency groupId="org.jboss.arquillian.protocol" artifactId="arquillian-protocol-servlet" scope="test"
- version="1.0.1.Final"/>
- <dependency groupId="org.jboss.spec.javax.el" artifactId="jboss-el-api_2.2_spec" version="1.0.2.Final"/>
- <dependency groupId="org.jboss.as" artifactId="jboss-as-arquillian-container-managed" version="7.1.2.Final" scope="test"/>
- </artifact:dependencies>
-
- <artifact:dependencies pathId="jbossas.classpath" filesetId="jbossas.fileset" >
- <dependency groupId="org.jboss.as" artifactId="jboss-as-dist" version="7.1.1.Final" type="zip"/>
- </artifact:dependencies>
-
- <path id="combined.project.classpath">
- <path refid="project.classpath"/>
- <pathelement location="${seamspace.ejb.dir}/target/seamspace-ejb.jar"/>
- </path>
-
- <path id="combined.test.project.classpath">
- <path refid="combined.project.classpath"/>
- <pathelement location="${target.test.classes.dir}"/>
- </path>
-
- <taskdef name="groovyc"
- classname="org.codehaus.groovy.ant.Groovyc"
- classpathref="build.classpath"/>
-
- <target name="clean" description="Cleans up the target directory">
- <delete dir="${target.dir}"/>
- </target>
-
- <target name="init">
- <tstamp/>
- <mkdir dir="${target.dir}"/>
- <condition property="src.test.java.dir.exists">
- <available file="${src.test.java.dir}" type="dir"/>
- </condition>
- <condition property="seamspace.ejb.target.classes.dir.exists">
- <available file="${seamspace.ejb.dir}/target/classes" type="dir"/>
- </condition>
- <condition property="seamspace.ear.exists">
- <available file="${seamspace.ear.dir}/target/seam-seamspace.ear" type="dir"/>
- </condition>
- <condition property="src.main.java.exists">
- <available file="${src.main.java.dir}" type="dir"/>
- </condition>
- </target>
-
- <target name="build-seamspace-ejb" depends="init" unless="seamspace.ejb.target.classes.dir.exists">
- <ant antfile="${seamspace.ejb.dir}/build.xml" target="compile" inheritAll="false"/>
- </target>
-
- <target name="build-seamspace-ear" depends="build-seamspace-ejb" unless="seamspace.ear.exists">
- <ant antfile="${seamspace.ear.dir}/build.xml" target="package" inheritAll="false"/>
- </target>
-
- <target name="compile" depends="build-seamspace-ear" if="${src.main.java.exists}"
- description="Compile the Java source code">
- <mkdir dir="${target.classes.dir}"/>
- <javac source="1.6" target="1.6" debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- nowarn="on"
- includeantruntime="false">
- <src path="${src.main.java.dir}"/>
- <classpath refid="combined.project.classpath"/>
- <compilerarg value="-Xlint"/>
- </javac>
- </target>
-
- <target name="compile-test" depends="compile"
- if="${src.test.java.dir.exists}">
- <mkdir dir="${target.test.classes.dir}"/>
-
- <javac source="1.6" target="1.6" debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- destdir="${target.test.classes.dir}"
- nowarn="on"
- includeantruntime="false">
- <compilerarg value="-Xlint"/>
- <src path="${src.test.java.dir}"/>
- <classpath refid="combined.test.project.classpath"/>
- </javac>
- </target>
-
- <target name="process-test-resources" depends="compile-test">
- <mkdir dir="${src.test.resources-integration.dir}"/>
- <copy todir="${target.test.classes.dir}">
- <!--<fileset dir="${src.test.resources.dir}">-->
- <!--<include name="**/*"/>-->
- <!--</fileset>-->
- <fileset dir="${src.test.resources-integration.dir}">
- <include name="*"/>
- </fileset>
- <!--<fileset dir="${seamspace.web.dir}/src/main/resources">-->
- <!--<include name="*"/>-->
- <!--</fileset>-->
- <filterset begintoken="${" endtoken="}">
- <filter token="version.jbossas7" value="${version.jbossas7}"/>
- </filterset>
- </copy>
- </target>
-
- <target name="process-jbossas" depends="process-test-resources">
- <copy todir="${target.dir}">
- <fileset refid="jbossas.fileset" />
- <mapper type="flatten"/>
- </copy>
- <unzip dest="${target.dir}">
- <fileset dir="${target.dir}">
- <include name="**/*.zip"/>
- <exclude name="**/tmp*.zip"/>
- </fileset>
- </unzip>
- </target>
-
- <target name="test" depends="process-jbossas"
- if="${src.test.java.dir.exists}">
- <mkdir dir="${target.test.classes.dir}"/>
- <mkdir dir="${target.test.results.dir}"/>
- <mkdir dir="${target.test.reports.dir}"/>
- <property name="myclasspath" refid="combined.test.project.classpath"/>
- <echo message="${myclasspath}"/>
- <junit printsummary="yes" haltonfailure="no">
- <formatter type="xml"/>
- <classpath refid="combined.test.project.classpath"/>
- <batchtest fork="yes" todir="${target.test.results.dir}">
- <fileset dir="${target.test.classes.dir}">
- <exclude name="**/Deployments.class"/>
- <exclude name="**/selenium/*"/>
- <include name="**/*Test.class"/>
- </fileset>
- </batchtest>
- </junit>
- <junitreport todir="${target.test.reports.dir}">
- <fileset dir="${target.test.results.dir}">
- <include name="TEST-*.xml"/>
- </fileset>
- <report todir="${target.test.reports.dir}"/>
- </junitreport>
- </target>
-
-</project>
Deleted: branches/enterprise/WFK-2_1/examples/seamspace/seamspace-web/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamspace/seamspace-web/build.xml 2012-11-05 14:33:10 UTC (rev 15348)
+++ branches/enterprise/WFK-2_1/examples/seamspace/seamspace-web/build.xml 2012-11-05 19:30:33 UTC (rev 15349)
@@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-<project name="seamspace-web" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
- <!-- set global properties for this build -->
- <property environment="env"/>
- <property name="project.name" value="seamspace-ejb"/>
- <property name="root.dir" value="../../.."/>
-
- <property name="target.dir" value="target"/>
- <property name="target.classes.dir" value="${target.dir}/classes"/>
- <property name="target.web.dir" value="${target.dir}/webapp"/>
-
- <property name="src.main.java.dir" value="${basedir}/src/main/java"/>
- <property name="src.test.java.dir" value="${basedir}/src/test/java"/>
- <property name="src.main.groovy.dir" value="${basedir}/src/main/groovy"/>
- <property name="src.test.groovy.dir" value="${basedir}/src/test/groovy"/>
- <property name="src.main.webapp.dir" value="${basedir}/src/main/webapp"/>
- <property name="src.main.resources.dir" value="${basedir}/src/main/resources"/>
-
- <property name="javac.debug" value="true"/>
- <property name="javac.deprecation" value="false"/>
- <property name="debug" value="false"/>
- <property name="groovy.home" value="${env.GROOVY_HOME}"/>
-
- <property name="jndiPattern" value="java:app/seamspace-ejb/#{ejbName}"/>
- <property name="distributable" value="false"/>
-
- <path id="build.lib.classpath">
- <fileset dir="${root.dir}/build/lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="antlib:org.apache.maven.artifact.ant"
- classpathref="build.lib.classpath"/>
-
- <artifact:dependencies pathId="build.classpath">
- <dependency groupId="org.codehaus.groovy" artifactId="groovy" version="2.0.1"/>
- <dependency groupId="org.codehaus.groovy" artifactId="groovy-ant" version="2.0.1"/>
- <dependency groupId="commons-cli" artifactId="commons-cli" version="1.2"/>
- <dependency groupId="junit" artifactId="junit" version="4.10" scope="test"/>
- </artifact:dependencies>
-
- <artifact:dependencies pathId="project.classpath" filesetId="project.fileset" useScope="runtime">
- <dependency groupId="org.jboss.seam" artifactId="jboss-seam-ui" version="2.3.0.Final-redhat-1 scope="runtime">
- <exclusion groupId="org.jboss.seam" artifactId="jboss-seam"/>
- </dependency>
- <dependency groupId="org.jboss.seam" artifactId="jboss-seam-debug" version="2.3.0.Final-redhat-1
- scope="compile">
- <exclusion groupId="org.jboss.seam" artifactId="jboss-seam"/>
- </dependency>
- <dependency groupId="commons-beanutils" artifactId="commons-beanutils" version="1.8.3" scope="compile">
- <exclusion groupId="commons-collections" artifactId="commons-collections"/>
- </dependency>
- <dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1" scope="compile"/>
- <dependency groupId="org.richfaces.ui" artifactId="richfaces-components-ui" version="4.3.0.20120802-M1"
- scope="compile"/>
- <dependency groupId="org.richfaces.core" artifactId="richfaces-core-impl" version="4.3.0.20120802-M1"
- scope="compile"/>
- <dependency groupId="org.richfaces.core" artifactId="richfaces-core-api" version="4.3.0.20120802-M1"
- scope="compile"/>
- </artifact:dependencies>
-
- <taskdef name="groovyc"
- classname="org.codehaus.groovy.ant.Groovyc"
- classpathref="build.classpath"/>
-
- <target name="clean" description="Cleans up the target directory">
- <delete dir="${target.dir}"/>
- </target>
-
- <target name="init">
- <tstamp/>
- <mkdir dir="${target.dir}"/>
- <mkdir dir="${src.main.java.dir}"/>
- <condition property="src.test.java.dir.exists">
- <available file="${src.test.java.dir}" type="dir"/>
- </condition>
- </target>
-
- <target name="compile" depends="init"
- description="Compile the Java source code">
- <mkdir dir="${target.classes.dir}"/>
- <javac source="1.6" target="1.6" debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- nowarn="on"
- includeantruntime="false">
- <src path="${src.main.java.dir}"/>
- <classpath refid="project.classpath"/>
- <compilerarg value="-Xlint"/>
- </javac>
- </target>
-
- <target name="compile-test" depends="compile"
- if="${src.test.java.dir.exists}">
- <mkdir dir="${target.test-classes.dir}"/>
- <javac source="1.6" target="1.6" debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- destdir="${target.test-classes.dir}"
- nowarn="on"
- includeantruntime="false">
- <compilerarg value="-Xlint"/>
- <src path="${src.test.java.dir}"/>
- <classpath refid="project.classpath"/>
- </javac>
- </target>
-
- <target name="test" depends="compile-test"
- if="${src.test.java.dir.exists}">
- <junit printsummary="yes" haltonfailure="yes">
- <formatter type="xml"/>
- <classpath refid="project.classpath"/>
- <batchtest fork="yes" todir="${test.results.dir}">
- <fileset dir="${target.test.classes.dir}"/>
- </batchtest>
- </junit>
- </target>
-
- <target name="package" depends="compile"
- description="Compile the Java source code">
- <mkdir dir="${target.web.dir}"/>
- <copy todir="${target.web.dir}">
- <fileset dir="${src.main.webapp.dir}"/>
- <filterset begintoken="${" endtoken="}">
- <filter token="jndiPattern" value="${jndiPattern}"/>
- <filter token="distributable" value="${distributable}"/>
- </filterset>
- </copy>
-
- <copy todir="${target.web.dir}/WEB-INF/lib">
- <fileset refid="project.fileset"/>
- <!-- This mapper strips off all leading directory information -->
- <mapper type="flatten"/>
- </copy>
-
- <war destfile="${target.dir}/seamspace-web.war"
- webxml="${target.web.dir}/WEB-INF/web.xml">
- <fileset dir="${target.web.dir}">
- <exclude name="/WEB-INF/web.xml"/>
- </fileset>
- <classes dir="${target.classes.dir}"/>
- </war>
- </target>
-</project>
12 years
Seam SVN: r15348 - in branches/community/Seam_2_3/examples/blog/blog-web/src/main/webapp: WEB-INF and 1 other directory.
by seam-commits@lists.jboss.org
Author: vdedik
Date: 2012-11-05 09:33:10 -0500 (Mon, 05 Nov 2012)
New Revision: 15348
Modified:
branches/community/Seam_2_3/examples/blog/blog-web/src/main/webapp/WEB-INF/web.xml
branches/community/Seam_2_3/examples/blog/blog-web/src/main/webapp/index.xml
Log:
bz #869348 - atom feeds in blog example fixed
Modified: branches/community/Seam_2_3/examples/blog/blog-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/community/Seam_2_3/examples/blog/blog-web/src/main/webapp/WEB-INF/web.xml 2012-11-05 14:22:30 UTC (rev 15347)
+++ branches/community/Seam_2_3/examples/blog/blog-web/src/main/webapp/WEB-INF/web.xml 2012-11-05 14:33:10 UTC (rev 15348)
@@ -44,5 +44,10 @@
<session-config>
<session-timeout>10</session-timeout>
</session-config>
+
+ <context-param>
+ <param-name>javax.faces.FACELETS_VIEW_MAPPINGS</param-name>
+ <param-value>*.xhtml;*.xml</param-value>
+ </context-param>
</web-app>
Modified: branches/community/Seam_2_3/examples/blog/blog-web/src/main/webapp/index.xml
===================================================================
--- branches/community/Seam_2_3/examples/blog/blog-web/src/main/webapp/index.xml 2012-11-05 14:22:30 UTC (rev 15347)
+++ branches/community/Seam_2_3/examples/blog/blog-web/src/main/webapp/index.xml 2012-11-05 14:33:10 UTC (rev 15348)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<f:view contentType="application/atom+xml"
+<f:view contentType="application/xml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
12 years
Seam SVN: r15347 - in branches/enterprise/WFK-2_1/examples/blog/blog-web/src/main/webapp: WEB-INF and 1 other directory.
by seam-commits@lists.jboss.org
Author: vdedik
Date: 2012-11-05 09:22:30 -0500 (Mon, 05 Nov 2012)
New Revision: 15347
Modified:
branches/enterprise/WFK-2_1/examples/blog/blog-web/src/main/webapp/WEB-INF/web.xml
branches/enterprise/WFK-2_1/examples/blog/blog-web/src/main/webapp/index.xml
Log:
bz #869348 - atom feeds in blog example fixed
Modified: branches/enterprise/WFK-2_1/examples/blog/blog-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/blog/blog-web/src/main/webapp/WEB-INF/web.xml 2012-11-04 23:20:45 UTC (rev 15346)
+++ branches/enterprise/WFK-2_1/examples/blog/blog-web/src/main/webapp/WEB-INF/web.xml 2012-11-05 14:22:30 UTC (rev 15347)
@@ -44,5 +44,10 @@
<session-config>
<session-timeout>10</session-timeout>
</session-config>
+
+ <context-param>
+ <param-name>javax.faces.FACELETS_VIEW_MAPPINGS</param-name>
+ <param-value>*.xhtml;*.xml</param-value>
+ </context-param>
</web-app>
Modified: branches/enterprise/WFK-2_1/examples/blog/blog-web/src/main/webapp/index.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/blog/blog-web/src/main/webapp/index.xml 2012-11-04 23:20:45 UTC (rev 15346)
+++ branches/enterprise/WFK-2_1/examples/blog/blog-web/src/main/webapp/index.xml 2012-11-05 14:22:30 UTC (rev 15347)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<f:view contentType="application/atom+xml"
+<f:view contentType="application/xml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
12 years
Seam SVN: r15346 - branches/enterprise/WFK-2_1/jboss-seam-gen/dist.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-11-04 18:20:45 -0500 (Sun, 04 Nov 2012)
New Revision: 15346
Modified:
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml
Log:
default jdbc driver is set to h2 as it is in EAP 6
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml 2012-11-04 22:59:00 UTC (rev 15345)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml 2012-11-04 23:20:45 UTC (rev 15346)
@@ -429,7 +429,7 @@
<property name="hibernate.connection.dataSource_class.default" value="org.h2.jdbcx.JdbcDataSource"/>
<property name="hibernate.connection.url.default" value="jdbc:h2:."/>
- <property name="driver.jar.default" value=""/>
+ <property name="driver.jar.default" value="h2"/>
<input addproperty="driver.jar.new"
message="Enter the filesystem path to the JDBC driver jar [${driver.jar.default}]"
defaultvalue="${driver.jar.default}"/>
12 years
Seam SVN: r15345 - branches/enterprise/WFK-2_1/build.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-11-04 17:59:00 -0500 (Sun, 04 Nov 2012)
New Revision: 15345
Modified:
branches/enterprise/WFK-2_1/build/common.build.xml
Log:
fixed seamdir property
Modified: branches/enterprise/WFK-2_1/build/common.build.xml
===================================================================
--- branches/enterprise/WFK-2_1/build/common.build.xml 2012-11-04 22:58:55 UTC (rev 15344)
+++ branches/enterprise/WFK-2_1/build/common.build.xml 2012-11-04 22:59:00 UTC (rev 15345)
@@ -12,7 +12,7 @@
<tstamp />
- <property name="seam.dir" value="." />
+ <property name="seam.dir" value=".." />
<property name="build.dir" value="${seam.dir}/build" />
<property name="tmp.dir" value="${seam.dir}/classes" />
12 years
Seam SVN: r15344 - branches/enterprise/WFK-2_1/distribution.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-11-04 17:58:55 -0500 (Sun, 04 Nov 2012)
New Revision: 15344
Modified:
branches/enterprise/WFK-2_1/distribution/get-arquillian-libs.xml
Log:
rolled back addition of erroronmissing="false"
Modified: branches/enterprise/WFK-2_1/distribution/get-arquillian-libs.xml
===================================================================
--- branches/enterprise/WFK-2_1/distribution/get-arquillian-libs.xml 2012-11-04 22:58:48 UTC (rev 15343)
+++ branches/enterprise/WFK-2_1/distribution/get-arquillian-libs.xml 2012-11-04 22:58:55 UTC (rev 15344)
@@ -1,8 +1,7 @@
<project xmlns:aether="antlib:org.sonatype.aether.ant" default="copyarq">
<taskdef uri="antlib:org.sonatype.aether.ant" resource="org/sonatype/aether/ant/antlib.xml">
<classpath>
- <fileset dir="../build/lib" includes="aether-ant-tasks-*.jar" erroronmissingdir="false"/>
- <fileset dir="build/lib" includes="aether-ant-tasks-*.jar" erroronmissingdir="false"/>
+ <fileset dir="../build/lib" includes="aether-ant-tasks-*.jar"/>
</classpath>
</taskdef>
12 years