Seam SVN: r8068 - in trunk/examples/wiki: src/main/org/jboss/seam/wiki/core/nestedset/ui and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-28 17:15:01 -0400 (Mon, 28 Apr 2008)
New Revision: 8068
Modified:
trunk/examples/wiki/build.xml
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/nestedset/ui/NestedSetNodeWrapperEntityConverter.java
Log:
Minor fixes to make build complete
Modified: trunk/examples/wiki/build.xml
===================================================================
--- trunk/examples/wiki/build.xml 2008-04-28 20:45:53 UTC (rev 8067)
+++ trunk/examples/wiki/build.xml 2008-04-28 21:15:01 UTC (rev 8068)
@@ -411,6 +411,7 @@
<classpath>
<path refid="test.classpath" />
<path refid="runtime.emma.path" />
+ <path path="${classes.dir}" />
</classpath>
<src path="${src.test.dir}" />
</javac>
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/nestedset/ui/NestedSetNodeWrapperEntityConverter.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/nestedset/ui/NestedSetNodeWrapperEntityConverter.java 2008-04-28 20:45:53 UTC (rev 8067)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/nestedset/ui/NestedSetNodeWrapperEntityConverter.java 2008-04-28 21:15:01 UTC (rev 8068)
@@ -1,7 +1,7 @@
package org.jboss.seam.wiki.core.nestedset.ui;
import org.jboss.seam.annotations.Name;
-import org.jboss.seam.ui.converter.EntityConverter;
+import org.jboss.seam.ui.EntityConverter;
import org.jboss.seam.wiki.core.nestedset.query.NestedSetNodeWrapper;
import org.jboss.seam.wiki.core.nestedset.NestedSetNode;
16 years
Seam SVN: r8067 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-28 16:45:53 -0400 (Mon, 28 Apr 2008)
New Revision: 8067
Modified:
trunk/build/utilities.build.xml
Log:
oops
Modified: trunk/build/utilities.build.xml
===================================================================
--- trunk/build/utilities.build.xml 2008-04-28 20:40:34 UTC (rev 8066)
+++ trunk/build/utilities.build.xml 2008-04-28 20:45:53 UTC (rev 8067)
@@ -75,7 +75,7 @@
<attribute name="jar" default="" />
<element name="args" implicit="true" optional="true" />
<sequential>
- <artifact:install file="@{jar}" settingsFile="${maven.settings.file}">
+ <artifact:install file="@{jar}" settingsFile="${maven.settings.xml}">
<pom file="@{pom}" />
<args />
</artifact:install>
@@ -89,7 +89,7 @@
<attribute name="repositoryId" default="" />
<element name="credentials" implicit="true" optional="true" />
<sequential>
- <artifact:deploy file="@{jar}" uniqueVersion="@{unique}" settingsFile="${maven.settings.file}">
+ <artifact:deploy file="@{jar}" uniqueVersion="@{unique}" settingsFile="${maven.settings.xml}">
<pom file="@{pom}" />
<remoteRepository refId="@{repositoryId}">
<credentials />
@@ -105,7 +105,7 @@
<attribute name="repositoryId" default="" />
<element name="credentials" implicit="true" optional="true" />
<sequential>
- <artifact:deploy file="@{jar}" settingsFile="${maven.settings.file}">
+ <artifact:deploy file="@{jar}" settingsFile="${maven.settings.xml}">
<pom file="@{pom}" />
<remoteRepository refId="@{repositoryId}">
<credentials />
@@ -123,7 +123,7 @@
<attribute name="repositoryId" default="" />
<element name="credentials" implicit="true" optional="true" />
<sequential>
- <artifact:deploy file="@{jar}" uniqueVersion="@{unique}" settingsFile="${maven.settings.file}">
+ <artifact:deploy file="@{jar}" uniqueVersion="@{unique}" settingsFile="${maven.settings.xml}">
<pom file="@{pom}" />
<remoteRepository refId="@{repositoryId}">
<credentials />
16 years
Seam SVN: r8066 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-28 16:40:34 -0400 (Mon, 28 Apr 2008)
New Revision: 8066
Modified:
trunk/build/utilities.build.xml
Log:
minor
Modified: trunk/build/utilities.build.xml
===================================================================
--- trunk/build/utilities.build.xml 2008-04-28 20:34:28 UTC (rev 8065)
+++ trunk/build/utilities.build.xml 2008-04-28 20:40:34 UTC (rev 8066)
@@ -75,7 +75,7 @@
<attribute name="jar" default="" />
<element name="args" implicit="true" optional="true" />
<sequential>
- <artifact:install file="@{jar}">
+ <artifact:install file="@{jar}" settingsFile="${maven.settings.file}">
<pom file="@{pom}" />
<args />
</artifact:install>
@@ -89,7 +89,7 @@
<attribute name="repositoryId" default="" />
<element name="credentials" implicit="true" optional="true" />
<sequential>
- <artifact:deploy file="@{jar}" uniqueVersion="@{unique}">
+ <artifact:deploy file="@{jar}" uniqueVersion="@{unique}" settingsFile="${maven.settings.file}">
<pom file="@{pom}" />
<remoteRepository refId="@{repositoryId}">
<credentials />
@@ -105,7 +105,7 @@
<attribute name="repositoryId" default="" />
<element name="credentials" implicit="true" optional="true" />
<sequential>
- <artifact:deploy file="@{jar}">
+ <artifact:deploy file="@{jar}" settingsFile="${maven.settings.file}">
<pom file="@{pom}" />
<remoteRepository refId="@{repositoryId}">
<credentials />
@@ -123,7 +123,7 @@
<attribute name="repositoryId" default="" />
<element name="credentials" implicit="true" optional="true" />
<sequential>
- <artifact:deploy file="@{jar}" uniqueVersion="@{unique}">
+ <artifact:deploy file="@{jar}" uniqueVersion="@{unique}" settingsFile="${maven.settings.file}">
<pom file="@{pom}" />
<remoteRepository refId="@{repositoryId}">
<credentials />
16 years
Seam SVN: r8065 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-28 16:34:28 -0400 (Mon, 28 Apr 2008)
New Revision: 8065
Modified:
trunk/build/root.pom.xml
Log:
newer version of HAN doesn't work
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-04-28 20:23:29 UTC (rev 8064)
+++ trunk/build/root.pom.xml 2008-04-28 20:34:28 UTC (rev 8065)
@@ -267,7 +267,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.3.1.GA</version>
+ <version>3.3.0.ga</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
16 years
Seam SVN: r8064 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-28 16:23:29 -0400 (Mon, 28 Apr 2008)
New Revision: 8064
Modified:
trunk/build/ci.build.xml
trunk/build/ci.settings.xml
Log:
minor
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-04-28 19:56:55 UTC (rev 8063)
+++ trunk/build/ci.build.xml 2008-04-28 20:23:29 UTC (rev 8064)
@@ -96,6 +96,7 @@
<property name="qualifier" value="-SNAPSHOT" />
<property name="quietclean" value="true" />
<property name="testng.jvmargs" value="@{testngjvmargs}" />
+ <property name="maven.settings.xml" value="${maven.settings.xml}" />
<properties />
</ant>
</sequential>
Modified: trunk/build/ci.settings.xml
===================================================================
--- trunk/build/ci.settings.xml 2008-04-28 19:56:55 UTC (rev 8063)
+++ trunk/build/ci.settings.xml 2008-04-28 20:23:29 UTC (rev 8064)
@@ -49,7 +49,7 @@
<localRepository>/path/to/local/repo</localRepository>
-->
- <localRepository>${env.WORKSPACE}/.m2/repository</localRepository>
+ <localRepository>${env.WORKSPACE}/m2/repository</localRepository>
<!-- interactiveMode
| This will determine whether maven prompts you when it needs input. If set to false,
16 years
Seam SVN: r8063 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-28 15:56:55 -0400 (Mon, 28 Apr 2008)
New Revision: 8063
Modified:
trunk/build/ci.settings.xml
Log:
minor
Modified: trunk/build/ci.settings.xml
===================================================================
--- trunk/build/ci.settings.xml 2008-04-28 19:09:29 UTC (rev 8062)
+++ trunk/build/ci.settings.xml 2008-04-28 19:56:55 UTC (rev 8063)
@@ -49,7 +49,7 @@
<localRepository>/path/to/local/repo</localRepository>
-->
- <localRepository>${env.REPOSITORY}/.m2/repository</localRepository>
+ <localRepository>${env.WORKSPACE}/.m2/repository</localRepository>
<!-- interactiveMode
| This will determine whether maven prompts you when it needs input. If set to false,
16 years
Seam SVN: r8062 - branches/Seam_2_0/examples/icefaces.
by seam-commits＠lists.jboss.org
Author: jguglielmin
Date: 2008-04-28 15:09:29 -0400 (Mon, 28 Apr 2008)
New Revision: 8062
Modified:
branches/Seam_2_0/examples/icefaces/build.xml
Log:
JBSEAM-2932
Modified: branches/Seam_2_0/examples/icefaces/build.xml
===================================================================
--- branches/Seam_2_0/examples/icefaces/build.xml 2008-04-28 18:05:46 UTC (rev 8061)
+++ branches/Seam_2_0/examples/icefaces/build.xml 2008-04-28 19:09:29 UTC (rev 8062)
@@ -26,13 +26,13 @@
<target name="copyextradependencies">
<artifact:dependencies filesetId="icefaces.fileset" versionsId="icefaces.versions">
- <dependency groupId="org.icefaces" artifactId="icefaces" version="1.6.1">
+ <dependency groupId="org.icefaces" artifactId="icefaces" version="1.7.0">
<exclusion groupId="javax.el" artifactId="el-api" />
</dependency>
- <dependency groupId="org.icefaces" artifactId="icefaces-comps" version="1.6.1">
+ <dependency groupId="org.icefaces" artifactId="icefaces-comps" version="1.7.0">
<exclusion groupId="javax.el" artifactId="el-api" />
</dependency>
- <dependency groupId="org.icefaces" artifactId="icefaces-facelets" version="1.6.1">
+ <dependency groupId="org.icefaces" artifactId="icefaces-facelets" version="1.7.0">
<exclusion groupId="javax.el" artifactId="el-api" />
</dependency>
<remoteRepository refId="repository.jboss.org" />
16 years
Seam SVN: r8061 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-28 14:05:46 -0400 (Mon, 28 Apr 2008)
New Revision: 8061
Modified:
trunk/build/ci.build.xml
Log:
minor
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-04-28 18:04:54 UTC (rev 8060)
+++ trunk/build/ci.build.xml 2008-04-28 18:05:46 UTC (rev 8061)
@@ -34,6 +34,7 @@
</target>
<target name="tests">
+ <echo>${maven.settings.xml}</echo>
<build target="cleanall" />
<build target="coverageall" testngjvmargs="-Dfoo"/>
<build target="copytestoutput" />
16 years
Seam SVN: r8060 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-28 14:04:54 -0400 (Mon, 28 Apr 2008)
New Revision: 8060
Modified:
trunk/build/common.build.xml
Log:
oops
Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml 2008-04-28 17:37:53 UTC (rev 8059)
+++ trunk/build/common.build.xml 2008-04-28 18:04:54 UTC (rev 8060)
@@ -162,10 +162,10 @@
</target>
<target name="getemma">
- <inlineDependency id="emma" scope="runtime">
+ <inlineDependencies id="emma" scope="runtime">
<dependency groupId="emma" artifactId="emma" version="2.0.5312" />
<dependency groupId="emma" artifactId="emma_ant" version="2.0.5312" />
- </inlineDependency>
+ </inlineDependencies>
</target>
<macrodef name="deploySeam">
16 years
Seam SVN: r8059 - trunk.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-28 13:37:53 -0400 (Mon, 28 Apr 2008)
New Revision: 8059
Modified:
trunk/build.xml
Log:
Remove mail dir from dist target
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-04-28 17:16:56 UTC (rev 8058)
+++ trunk/build.xml 2008-04-28 17:37:53 UTC (rev 8059)
@@ -44,7 +44,6 @@
<property name="src.unit.test.dir" value="${src.test.dir}/unit" />
<!-- Library directories -->
- <property name="mail.dir" value="${basedir}/mail" />
<property name="eejb.conf.dir" value="${basedir}/bootstrap" />
<!-- Documentation -->
@@ -78,7 +77,6 @@
<property name="dist.eejb.conf.dir" value="${dist.dir}/bootstrap" />
<property name="dist.drools.dir" value="${dist.dir}/drools" />
<property name="dist.hibernate.dir" value="${dist.dir}/hibernate" />
- <property name="dist.mail.dir" value="${dist.dir}/mail" />
<property name="dist.build.dir" value="${dist.dir}/build" />
<property name="dist.seamgen.dir" value="${dist.dir}/seam-gen" />
<property name="dist.ui.api.dir" value="${dist.dir}/doc/ui" />
@@ -484,12 +482,6 @@
</fileset>
</copy>
- <copy todir="${dist.mail.dir}">
- <fileset dir="${mail.dir}">
- <include name="**/*.*" />
- </fileset>
- </copy>
-
<copy todir="${dist.lib.dir}">
<fileset dir="${lib.dir}">
<include name="**/*.jar" />
16 years