Seam SVN: r7834 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-07 13:17:05 -0400 (Mon, 07 Apr 2008)
New Revision: 7834
Modified:
trunk/build/common.build.xml
trunk/build/root.pom.xml
Log:
Minor
Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml 2008-04-07 14:46:02 UTC (rev 7833)
+++ trunk/build/common.build.xml 2008-04-07 17:17:05 UTC (rev 7834)
@@ -92,7 +92,7 @@
<install pom="${root.pom}" />
<pomfile name="parent.pom" value="${build.dir}/parent.pom.xml" />
<install pom="${parent.pom}" />
- <pomfile name="core.pom" value="${build.dir}/core.pom.xml" />
+ <pomfile name="core.pom" value="${build.dir}/core.pom.xml" artifactName="jboss-seam" />
<pomfile name="core.wls.pom" value="${build.dir}/core.pom.xml" artifactName="jboss-seam-wls-compatible" />
<pomfile name="debug.pom" value="${build.dir}/debug.pom.xml" />
<pomfile name="wicket.pom" value="${build.dir}/wicket.pom.xml" />
@@ -289,7 +289,7 @@
<attribute name="output" default="${tmp.dir}/poms/(a){module}-dependency-report.txt" />
<sequential>
<maven target="-f @{pom} dependency:tree" basedir="${seam.dir}">
- <arg line="-Doutput=@{output}" />
+ <arg line="-DoutputFile=@{output}" />
<arg line="-q" />
</maven>
</sequential>
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-04-07 14:46:02 UTC (rev 7833)
+++ trunk/build/root.pom.xml 2008-04-07 17:17:05 UTC (rev 7834)
@@ -1022,13 +1022,6 @@
<version>2.2.1</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.0</version>
- </plugin>
-
-
</plugins>
</pluginManagement>
</build>
16 years, 3 months
Seam SVN: r7833 - branches/Seam_2_0/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-07 10:46:02 -0400 (Mon, 07 Apr 2008)
New Revision: 7833
Modified:
branches/Seam_2_0/build/docs.pom.xml
Log:
Switch back to snapshot plugins
Modified: branches/Seam_2_0/build/docs.pom.xml
===================================================================
--- branches/Seam_2_0/build/docs.pom.xml 2008-04-07 14:30:05 UTC (rev 7832)
+++ branches/Seam_2_0/build/docs.pom.xml 2008-04-07 14:46:02 UTC (rev 7833)
@@ -48,18 +48,18 @@
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>seam-docbook-xslt</artifactId>
- <version>1.1.0.BETA1</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>seam-jdocbook-style</artifactId>
- <version>1.1.0.BETA1</version>
+ <version>1.1.0-SNAPSHOT</version>
<type>jdocbook-style</type>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0-200803311754</version>
+ <version>1.1.0-SNAPSHOT</version>
<type>jdocbook-style</type>
</dependency>
</dependencies>
16 years, 3 months
Seam SVN: r7832 - branches/Seam_2_0/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-07 10:30:05 -0400 (Mon, 07 Apr 2008)
New Revision: 7832
Modified:
branches/Seam_2_0/build/default.build.properties
Log:
Revert to -SNAPSHOT for development
Modified: branches/Seam_2_0/build/default.build.properties
===================================================================
--- branches/Seam_2_0/build/default.build.properties 2008-04-07 14:25:43 UTC (rev 7831)
+++ branches/Seam_2_0/build/default.build.properties 2008-04-07 14:30:05 UTC (rev 7832)
@@ -8,7 +8,7 @@
major.version 2
minor.version .0
patchlevel .2
-qualifier .CR1
+qualifier -SNAPSHOT
#
# Other program locations
# -----------------------
16 years, 3 months
Seam SVN: r7830 - in maven-plugins/trunk: seam-jdocbook-style and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-07 10:24:45 -0400 (Mon, 07 Apr 2008)
New Revision: 7830
Modified:
maven-plugins/trunk/seam-docbook-xslt/pom.xml
maven-plugins/trunk/seam-jdocbook-style/pom.xml
Log:
And add snapshot repo
Modified: maven-plugins/trunk/seam-docbook-xslt/pom.xml
===================================================================
--- maven-plugins/trunk/seam-docbook-xslt/pom.xml 2008-04-07 14:22:58 UTC (rev 7829)
+++ maven-plugins/trunk/seam-docbook-xslt/pom.xml 2008-04-07 14:24:45 UTC (rev 7830)
@@ -26,6 +26,12 @@
<name>JBoss Repository</name>
<url>http://repository.jboss.org/maven2</url>
</repository>
+ <repository>
+ <snapshots />
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>http://snapshots.jboss.org/maven2</url>
+ </repository>
</repositories>
<dependencies>
Modified: maven-plugins/trunk/seam-jdocbook-style/pom.xml
===================================================================
--- maven-plugins/trunk/seam-jdocbook-style/pom.xml 2008-04-07 14:22:58 UTC (rev 7829)
+++ maven-plugins/trunk/seam-jdocbook-style/pom.xml 2008-04-07 14:24:45 UTC (rev 7830)
@@ -25,6 +25,12 @@
<name>JBoss Repository</name>
<url>http://repository.jboss.org/maven2</url>
</repository>
+ <repository>
+ <snapshots />
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>http://snapshots.jboss.org/maven2</url>
+ </repository>
</repositories>
<pluginRepositories>
16 years, 3 months
Seam SVN: r7828 - branches/Seam_2_0/build and 2 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-07 10:08:06 -0400 (Mon, 07 Apr 2008)
New Revision: 7828
Modified:
branches/Seam_2_0/build.xml
branches/Seam_2_0/build/common.build.xml
branches/Seam_2_0/build/core.pom.xml
branches/Seam_2_0/build/utilities.build.xml
trunk/build.xml
trunk/build/common.build.xml
trunk/build/core.pom.xml
trunk/build/utilities.build.xml
Log:
Generate a jboss-seam-wls-compatible.jar that excludes TimerServiceDispatcher
Modified: branches/Seam_2_0/build/common.build.xml
===================================================================
--- branches/Seam_2_0/build/common.build.xml 2008-04-07 12:48:53 UTC (rev 7827)
+++ branches/Seam_2_0/build/common.build.xml 2008-04-07 14:08:06 UTC (rev 7828)
@@ -92,7 +92,8 @@
<install pom="${root.pom}" />
<pomfile name="parent.pom" value="${build.dir}/parent.pom.xml" />
<install pom="${parent.pom}" />
- <pomfile name="core.pom" value="${build.dir}/core.pom.xml" />
+ <pomfile name="core.pom" value="${build.dir}/core.pom.xml" artifactName="jboss-seam" />
+ <pomfile name="core.wls.pom" value="${build.dir}/core.pom.xml" artifactName="jboss-seam-wls-compatible" />
<pomfile name="debug.pom" value="${build.dir}/debug.pom.xml" />
<pomfile name="jbas5.pom" value="${build.dir}/jbas5.pom.xml" />
<pomfile name="gen.pom" value="${build.dir}/gen.pom.xml" />
@@ -108,7 +109,6 @@
<target name="copyseamdependencies" if="mavenized.property" unless="copyseamdependenciesdone" depends="initcopy, initpoms">
<copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="runtime" />
- <copyDependencies id="jbas5" pom="${jbas5.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="runtime" />
Modified: branches/Seam_2_0/build/core.pom.xml
===================================================================
--- branches/Seam_2_0/build/core.pom.xml 2008-04-07 12:48:53 UTC (rev 7827)
+++ branches/Seam_2_0/build/core.pom.xml 2008-04-07 14:08:06 UTC (rev 7828)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
+ <artifactId>@artifact.name@</artifactId>
<parent>
<groupId>org.jboss.seam</groupId>
<artifactId>parent</artifactId>
Modified: branches/Seam_2_0/build/utilities.build.xml
===================================================================
--- branches/Seam_2_0/build/utilities.build.xml 2008-04-07 12:48:53 UTC (rev 7827)
+++ branches/Seam_2_0/build/utilities.build.xml 2008-04-07 14:08:06 UTC (rev 7828)
@@ -11,6 +11,7 @@
<macrodef name="pomfile">
<attribute name="name" />
<attribute name="value" />
+ <attribute name="artifactName" default=""/>
<attribute name="todir" default="${tmp.dir}/poms" />
<attribute name="tofile" default="@{todir}/@{name}" />
<sequential>
@@ -18,6 +19,7 @@
<copy file="@{value}" tofile="@{tofile}" overwrite="on" verbose="false">
<filterset>
<filter token="seam.version" value="${complete.version}" />
+ <filter token="artifact.name" value="@{artifactName}" />
</filterset>
</copy>
<property name="@{name}" value="@{tofile}" />
Modified: branches/Seam_2_0/build.xml
===================================================================
--- branches/Seam_2_0/build.xml 2008-04-07 12:48:53 UTC (rev 7827)
+++ branches/Seam_2_0/build.xml 2008-04-07 14:08:06 UTC (rev 7828)
@@ -185,6 +185,11 @@
<target name="jarcore" depends="compilecore" description="Build the distribution .jar file using M2 dependency management">
<archive classesdir="${classes.core.dir}" module="jboss-seam" pom="${core.pom}" srcdir="${src.core.dir}" />
+ <archive classesdir="${classes.core.dir}" module="jboss-seam-wls-compatible" pom="${core.wls.pom}" srcdir="${src.core.dir}" outputdir="${lib.dir}/interop">
+ <excludes>
+ <exclude name="org/jboss/seam/async/TimerServiceDispatcher*" />
+ </excludes>
+ </archive>
</target>
<!-- ########################### PDF TARGETS ###########################-->
@@ -752,6 +757,7 @@
<attribute name="pom" />
<attribute name="srcdir" />
<attribute name="outputdir" default="${lib.dir}" />
+ <element name="excludes" optional="true"/>
<sequential>
<mkdir dir="@{outputdir}" />
<mkdir dir="@{outputdir}/src" />
@@ -759,6 +765,7 @@
<include name="**/*.class" />
<exclude name="**/test/*.class" />
<patternset refid="meta.files" />
+ <excludes />
<manifest>
<attribute name="Seam-Version" value="${complete.version}" />
<attribute name="Implementation-Version" value="${complete.version}" />
@@ -768,6 +775,7 @@
<include name="**/*.java" />
<exclude name="**/test/*.java" />
<patternset refid="meta.files" />
+ <excludes />
<manifest>
<attribute name="Seam-Version" value="${complete.version}" />
<attribute name="Implementation-Version" value="${complete.version}" />
Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml 2008-04-07 12:48:53 UTC (rev 7827)
+++ trunk/build/common.build.xml 2008-04-07 14:08:06 UTC (rev 7828)
@@ -93,6 +93,7 @@
<pomfile name="parent.pom" value="${build.dir}/parent.pom.xml" />
<install pom="${parent.pom}" />
<pomfile name="core.pom" value="${build.dir}/core.pom.xml" />
+ <pomfile name="core.wls.pom" value="${build.dir}/core.pom.xml" artifactName="jboss-seam-wls-compatible" />
<pomfile name="debug.pom" value="${build.dir}/debug.pom.xml" />
<pomfile name="wicket.pom" value="${build.dir}/wicket.pom.xml" />
<pomfile name="jbas5.pom" value="${build.dir}/jbas5.pom.xml" />
@@ -111,7 +112,6 @@
<copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="wicket" pom="${wicket.pom}" todir="${lib.dir}" scope="runtime" />
- <copyDependencies id="jbas5" pom="${jbas5.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="runtime" />
@@ -120,7 +120,6 @@
<copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="wicket" pom="${wicket.pom}" todir="${lib.dir}" scope="compile" />
- <copyDependencies id="jbas5" pom="${jbas5.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="compile" />
Modified: trunk/build/core.pom.xml
===================================================================
--- trunk/build/core.pom.xml 2008-04-07 12:48:53 UTC (rev 7827)
+++ trunk/build/core.pom.xml 2008-04-07 14:08:06 UTC (rev 7828)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
+ <artifactId>@artifact.name@</artifactId>
<parent>
<groupId>org.jboss.seam</groupId>
<artifactId>parent</artifactId>
Modified: trunk/build/utilities.build.xml
===================================================================
--- trunk/build/utilities.build.xml 2008-04-07 12:48:53 UTC (rev 7827)
+++ trunk/build/utilities.build.xml 2008-04-07 14:08:06 UTC (rev 7828)
@@ -11,6 +11,7 @@
<macrodef name="pomfile">
<attribute name="name" />
<attribute name="value" />
+ <attribute name="artifactName" default=""/>
<attribute name="todir" default="${tmp.dir}/poms" />
<attribute name="tofile" default="@{todir}/@{name}" />
<sequential>
@@ -18,6 +19,7 @@
<copy file="@{value}" tofile="@{tofile}" overwrite="on" verbose="false">
<filterset>
<filter token="seam.version" value="${complete.version}" />
+ <filter token="artifact.name" value="@{artifactName}" />
</filterset>
</copy>
<property name="@{name}" value="@{tofile}" />
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-04-07 12:48:53 UTC (rev 7827)
+++ trunk/build.xml 2008-04-07 14:08:06 UTC (rev 7828)
@@ -189,6 +189,11 @@
<target name="jarcore" depends="compilecore" description="Build the distribution .jar file using M2 dependency management">
<archive classesdir="${classes.core.dir}" module="jboss-seam" pom="${core.pom}" srcdir="${src.core.dir}" />
+ <archive classesdir="${classes.core.dir}" module="jboss-seam-wls-compatible" pom="${core.wls.pom}" srcdir="${src.core.dir}" outputdir="${lib.dir}/interop">
+ <excludes>
+ <exclude name="org/jboss/seam/async/TimerServiceDispatcher*" />
+ </excludes>
+ </archive>
</target>
<!-- ########################### PDF TARGETS ###########################-->
@@ -798,6 +803,7 @@
<attribute name="pom" />
<attribute name="srcdir" />
<attribute name="outputdir" default="${lib.dir}" />
+ <element name="excludes" optional="true"/>
<sequential>
<mkdir dir="@{outputdir}" />
<mkdir dir="@{outputdir}/src" />
@@ -805,6 +811,7 @@
<include name="**/*.class" />
<exclude name="**/test/*.class" />
<patternset refid="meta.files" />
+ <excludes />
<manifest>
<attribute name="Seam-Version" value="${complete.version}" />
<attribute name="Implementation-Version" value="${complete.version}" />
@@ -814,6 +821,7 @@
<include name="**/*.java" />
<exclude name="**/test/*.java" />
<patternset refid="meta.files" />
+ <excludes />
<manifest>
<attribute name="Seam-Version" value="${complete.version}" />
<attribute name="Implementation-Version" value="${complete.version}" />
16 years, 3 months
Seam SVN: r7827 - in maven-plugins/trunk: seam-jdocbook-style/src/main/css/css and 1 other directory.
by seam-commits＠lists.jboss.org
Author: newtonm
Date: 2008-04-07 08:48:53 -0400 (Mon, 07 Apr 2008)
New Revision: 7827
Modified:
maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-pdf.xsl
maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css
Log:
Use new XSL params for chapter and section title colours. Made all HTML headings 2-6 use the same colour in CSS.
Modified: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-pdf.xsl
===================================================================
--- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-pdf.xsl 2008-04-07 12:33:11 UTC (rev 7826)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-pdf.xsl 2008-04-07 12:48:53 UTC (rev 7827)
@@ -17,8 +17,8 @@
<!-- Change the font color for titles to SeamFramework.org one -->
<xsl:param name="title.color">#576C74</xsl:param>
<xsl:param name="titlepage.color">#885324</xsl:param>
- <xsl:param name="chaptertitle.color">#BA5624</xsl:param>
- <xsl:param name="section.level1.title.color">#BA5624</xsl:param>
+ <xsl:param name="chapter.title.color">#BA5624</xsl:param>
+ <xsl:param name="section.title.color">#BA5624</xsl:param>
<!-- Style tables to look like SeamFramework.org-->
<xsl:param name="table.cell.border.color">#D3D2D1</xsl:param>
Modified: maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css
===================================================================
--- maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css 2008-04-07 12:33:11 UTC (rev 7826)
+++ maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css 2008-04-07 12:48:53 UTC (rev 7827)
@@ -19,15 +19,11 @@
background-image: url(../images/seamframework/title_hdr.png);
}
-h2 {
- color: #BA5624;
-}
-
/*
- Use sfwk colour for title
+ Use sfwk colour for titles
*/
-h3,h4,h5,h6 {
- color: #576C74;
+h2,h3,h4,h5,h6 {
+ color: #BA5624;
}
div.note {
@@ -211,7 +207,3 @@
.navfooter td.up a {
background-image: url(../images/seamframework/stock-go-up.png);
}
-
-.programlistingco pre {
- font-family: Courier, 'Courier New', 'Lucida Console', Monaco, monospace;
-}
\ No newline at end of file
16 years, 3 months
Seam SVN: r7826 - branches/Seam_2_0/src/main/org/jboss/seam/persistence.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-07 08:33:11 -0400 (Mon, 07 Apr 2008)
New Revision: 7826
Modified:
branches/Seam_2_0/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java
Log:
Wrong way around if using hibernate only
Modified: branches/Seam_2_0/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java 2008-04-07 12:32:41 UTC (rev 7825)
+++ branches/Seam_2_0/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java 2008-04-07 12:33:11 UTC (rev 7826)
@@ -318,10 +318,10 @@
public static Class getEntityClass(Object bean)
{
- Class clazz = Entity.forBean(bean).getBeanClass();
+ Class clazz = Hibernate.getClass(bean);
if (clazz == null)
{
- clazz = Hibernate.getClass(bean);
+ clazz = Entity.forBean(bean).getBeanClass();
}
return clazz;
}
16 years, 3 months
Seam SVN: r7825 - branches/Seam_2_0/examples.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-07 08:32:41 -0400 (Mon, 07 Apr 2008)
New Revision: 7825
Modified:
branches/Seam_2_0/examples/build.xml
Log:
Include .hbm.xml
Modified: branches/Seam_2_0/examples/build.xml
===================================================================
--- branches/Seam_2_0/examples/build.xml 2008-04-07 12:31:48 UTC (rev 7824)
+++ branches/Seam_2_0/examples/build.xml 2008-04-07 12:32:41 UTC (rev 7825)
@@ -472,6 +472,7 @@
<copy todir="${jar.dir}">
<fileset dir="${src.java.dir}">
<include name="**/*.component.xml" />
+ <include name="**/*.hbm.xml" />
</fileset>
</copy>
</target>
16 years, 3 months