Seam SVN: r8078 - trunk/examples/icefaces.
by seam-commits＠lists.jboss.org
Author: jguglielmin
Date: 2008-04-29 18:20:02 -0400 (Tue, 29 Apr 2008)
New Revision: 8078
Modified:
trunk/examples/icefaces/build.xml
Log:
JBSEAM-2932
Modified: trunk/examples/icefaces/build.xml
===================================================================
--- trunk/examples/icefaces/build.xml 2008-04-29 22:18:43 UTC (rev 8077)
+++ trunk/examples/icefaces/build.xml 2008-04-29 22:20:02 UTC (rev 8078)
@@ -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, 6 months
- 1
- 0
Seam SVN: r8077 - trunk/examples/icefaces/resources/WEB-INF.
by seam-commits＠lists.jboss.org
Author: jguglielmin
Date: 2008-04-29 18:18:43 -0400 (Tue, 29 Apr 2008)
New Revision: 8077
Modified:
trunk/examples/icefaces/resources/WEB-INF/web.xml
Log:
JBPAPP-477 just required concurrentDOMViews set to true in web.xml (tested with ICEfaces-v1.6.1 and v1.7.0)
Modified: trunk/examples/icefaces/resources/WEB-INF/web.xml
===================================================================
--- trunk/examples/icefaces/resources/WEB-INF/web.xml 2008-04-29 20:06:04 UTC (rev 8076)
+++ trunk/examples/icefaces/resources/WEB-INF/web.xml 2008-04-29 22:18:43 UTC (rev 8077)
@@ -74,7 +74,10 @@
<param-name>com.icesoft.faces.standardRequestScope</param-name>
<param-value>true</param-value>
</context-param>
-
+ <context-param>
+ <param-name>com.icesoft.faces.concurrentDOMViews</param-name>
+ <param-value>true</param-value>
+ </context-param>
<!-- servlets -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
16 years, 6 months
- 1
- 0
Seam SVN: r8076 - trunk/seam-gen/src and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-29 16:06:04 -0400 (Tue, 29 Apr 2008)
New Revision: 8076
Modified:
branches/Seam_2_0/seam-gen/src/EntityHome.java.ftl
trunk/seam-gen/src/EntityHome.java.ftl
Log:
JBSEAM-2836
Modified: branches/Seam_2_0/seam-gen/src/EntityHome.java.ftl
===================================================================
--- branches/Seam_2_0/seam-gen/src/EntityHome.java.ftl 2008-04-29 18:58:45 UTC (rev 8075)
+++ branches/Seam_2_0/seam-gen/src/EntityHome.java.ftl 2008-04-29 20:06:04 UTC (rev 8076)
@@ -67,6 +67,7 @@
public void wire()
{
+ getInstance();
<#foreach property in pojo.allPropertiesIterator>
<#if c2h.isManyToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
Modified: trunk/seam-gen/src/EntityHome.java.ftl
===================================================================
--- trunk/seam-gen/src/EntityHome.java.ftl 2008-04-29 18:58:45 UTC (rev 8075)
+++ trunk/seam-gen/src/EntityHome.java.ftl 2008-04-29 20:06:04 UTC (rev 8076)
@@ -67,6 +67,7 @@
public void wire()
{
+ getInstance()
<#foreach property in pojo.allPropertiesIterator>
<#if c2h.isManyToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
16 years, 6 months
- 1
- 0
Seam SVN: r8075 - branches/Seam_2_0/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-29 14:58:45 -0400 (Tue, 29 Apr 2008)
New Revision: 8075
Modified:
branches/Seam_2_0/build/docs.pom.xml
Log:
minor
Modified: branches/Seam_2_0/build/docs.pom.xml
===================================================================
--- branches/Seam_2_0/build/docs.pom.xml 2008-04-29 12:09:51 UTC (rev 8074)
+++ branches/Seam_2_0/build/docs.pom.xml 2008-04-29 18:58:45 UTC (rev 8075)
@@ -37,6 +37,16 @@
<groupId>org.jboss.seam</groupId>
<artifactId>seam-docbook-xslt</artifactId>
<version>1.1.0.BETA2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.wst.css</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.wst.sse</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
@@ -110,9 +120,8 @@
</plugins>
</pluginManagement>
</build>
+
-
-
<properties>
<translation>en-US</translation>
</properties>
16 years, 6 months
- 1
- 0
Seam SVN: r8074 - in branches/Seam_2_0: build and 14 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-29 08:09:51 -0400 (Tue, 29 Apr 2008)
New Revision: 8074
Added:
branches/Seam_2_0/build/ci.settings.xml
branches/Seam_2_0/build/settings.xml
branches/Seam_2_0/examples/remoting/gwt/build.xml
branches/Seam_2_0/extras/mail-ra.rar
Removed:
branches/Seam_2_0/build/maven/conf/
branches/Seam_2_0/build/settings.xml
branches/Seam_2_0/examples/dvdstore/lib/
branches/Seam_2_0/examples/jpa/lib/
branches/Seam_2_0/examples/remoting/gwt/build.xml
branches/Seam_2_0/examples/remoting/gwt/lib/
branches/Seam_2_0/examples/seamdiscs/resources/WEB-INF/lib/
branches/Seam_2_0/examples/seamdiscs/resources/ear-lib/
branches/Seam_2_0/extras/emma/
branches/Seam_2_0/mail/
branches/Seam_2_0/seam-gen/lib/
Modified:
branches/Seam_2_0/build.xml
branches/Seam_2_0/build/ci.build.xml
branches/Seam_2_0/build/common.build.xml
branches/Seam_2_0/build/gen.pom.xml
branches/Seam_2_0/build/root.pom.xml
branches/Seam_2_0/build/utilities.build.xml
branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Mail.xml
branches/Seam_2_0/examples/build.xml
branches/Seam_2_0/examples/hibernate/build-glassfish.xml
branches/Seam_2_0/examples/hibernate/build-jboss405.xml
branches/Seam_2_0/examples/hibernate/build-tomcat55.xml
branches/Seam_2_0/examples/hibernate/build-weblogic92.xml
branches/Seam_2_0/examples/hibernate/build-websphere61.xml
branches/Seam_2_0/examples/jee5/booking/build.xml
branches/Seam_2_0/examples/jpa/build-glassfish.xml
branches/Seam_2_0/examples/jpa/build-jboss405.xml
branches/Seam_2_0/examples/jpa/build-tomcat55.xml
branches/Seam_2_0/examples/jpa/build-tomcat6.xml
branches/Seam_2_0/examples/jpa/build-weblogic10.xml
branches/Seam_2_0/examples/jpa/build-weblogic92.xml
branches/Seam_2_0/examples/jpa/build-websphere61.xml
branches/Seam_2_0/examples/seamdiscs/build.xml
branches/Seam_2_0/examples/wiki/build.xml
branches/Seam_2_0/seam-gen/build.xml
Log:
Backport JBSEAM-2909, JBSEAM-2919 (all fixes from last 5 days)
Modified: branches/Seam_2_0/build/ci.build.xml
===================================================================
--- branches/Seam_2_0/build/ci.build.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/build/ci.build.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -10,6 +10,8 @@
<property name="seam.dir" value="${basedir}/../" />
<property name="dist.location" value="${seam.dir}/dist" />
<property name="doc.ref.dir" value="${seam.dir}/doc/Seam_Reference_Guide" />
+
+ <property name="maven.settings.xml" location="ci.settings.xml" />
<import file="common.build.xml" />
@@ -38,16 +40,12 @@
<target name="tests-java16">
<build target="cleanall" />
- <artifact:dependencies filesetId="endorsed.fileset" versionsId="endorsed.versions">
+ <copyInlineDependencies id="endorsed" scope="compile" todir="${endorsed.dir}">
<dependency groupId="javax.xml.bind" artifactId="jaxb-api" version="2.1">
<exclusion groupId="javax.xml.stream" artifactId="stax-api" />
<exclusion groupId="javax.activation" artifactId="activation" />
</dependency>
- </artifact:dependencies>
- <copy todir="${endorsed.dir}">
- <fileset refid="endorsed.fileset" />
- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${endorsed.versions}" to="flatten" />
- </copy>
+ </copyInlineDependencies>
<build target="testall" testngjvmargs="-Dsun.lang.ClassLoader.allowArraySyntax=true" />
<build target="copytestoutput" />
<build target="testreport" />
@@ -99,6 +97,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>
Added: branches/Seam_2_0/build/ci.settings.xml
===================================================================
--- branches/Seam_2_0/build/ci.settings.xml (rev 0)
+++ branches/Seam_2_0/build/ci.settings.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -0,0 +1,249 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!--
+ | This is the configuration file for Maven. It can be specified at two levels:
+ |
+ | 1. User Level. This settings.xml file provides configuration for a single user,
+ | and is normally provided in $HOME/.m2/settings.xml.
+ |
+ | NOTE: This location can be overridden with the system property:
+ |
+ | -Dorg.apache.maven.user-settings=/path/to/user/settings.xml
+ |
+ | 2. Global Level. This settings.xml file provides configuration for all maven
+ | users on a machine (assuming they're all using the same maven
+ | installation). It's normally provided in
+ | ${maven.home}/conf/settings.xml.
+ |
+ | NOTE: This location can be overridden with the system property:
+ |
+ | -Dorg.apache.maven.global-settings=/path/to/global/settings.xml
+ |
+ | The sections in this sample file are intended to give you a running start at
+ | getting the most out of your Maven installation. Where appropriate, the default
+ | values (values used when the setting is not specified) are provided.
+ |
+ |-->
+<settings>
+ <!-- localRepository
+ | The path to the local repository maven will use to store artifacts.
+ |
+ | Default: ~/.m2/repository
+ <localRepository>/path/to/local/repo</localRepository>
+ -->
+
+ <localRepository>${env.WORKSPACE}/m2/repository</localRepository>
+
+ <!-- interactiveMode
+ | This will determine whether maven prompts you when it needs input. If set to false,
+ | maven will use a sensible default value, perhaps based on some other setting, for
+ | the parameter in question.
+ |
+ | Default: true
+ <interactiveMode>true</interactiveMode>
+ -->
+
+ <!-- offline
+ | Determines whether maven should attempt to connect to the network when executing a build.
+ | This will have an effect on artifact downloads, artifact deployment, and others.
+ |
+ | Default: false
+ <offline>false</offline>
+ -->
+
+ <!-- proxies
+ | This is a list of proxies which can be used on this machine to connect to the network.
+ | Unless otherwise specified (by system property or command-line switch), the first proxy
+ | specification in this list marked as active will be used.
+ |-->
+ <proxies>
+ <!-- proxy
+ | Specification for one proxy, to be used in connecting to the network.
+ |
+ <proxy>
+ <id>optional</id>
+ <active>true</active>
+ <protocol>http</protocol>
+ <username>proxyuser</username>
+ <password>proxypass</password>
+ <host>proxy.host.net</host>
+ <port>80</port>
+ <nonProxyHosts>local.net,some.host.com</nonProxyHosts>
+ </proxy>
+ -->
+ </proxies>
+
+ <!-- servers
+ | This is a list of authentication profiles, keyed by the server-id used within the system.
+ | Authentication profiles can be used whenever maven must make a connection to a remote server.
+ |-->
+ <servers>
+ <!-- server
+ | Specifies the authentication information to use when connecting to a particular server, identified by
+ | a unique name within the system (referred to by the 'id' attribute below).
+ |
+ | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
+ | used together.
+ |
+ <server>
+ <id>deploymentRepo</id>
+ <username>repouser</username>
+ <password>repopwd</password>
+ </server>
+ -->
+
+ <!-- Another sample, using keys to authenticate.
+ <server>
+ <id>siteServer</id>
+ <privateKey>/path/to/private/key</privateKey>
+ <passphrase>optional; leave empty if not used.</passphrase>
+ </server>
+ -->
+ </servers>
+
+ <!-- mirrors
+ | This is a list of mirrors to be used in downloading artifacts from remote repositories.
+ |
+ | It works like this: a POM may declare a repository to use in resolving certain artifacts.
+ | However, this repository may have problems with heavy traffic at times, so people have mirrored
+ | it to several places.
+ |
+ | That repository definition will have a unique id, so we can create a mirror reference for that
+ | repository, to be used as an alternate download site. The mirror site will be the preferred
+ | server for that repository.
+ |-->
+ <mirrors>
+ <!-- mirror
+ | Specifies a repository mirror site to use instead of a given repository. The repository that
+ | this mirror serves has an ID that matches the mirrorOf element of this mirror. IDs are used
+ | for inheritance and direct lookup purposes, and must be unique across the set of mirrors.
+ |
+ <mirror>
+ <id>mirrorId</id>
+ <mirrorOf>repositoryId</mirrorOf>
+ <name>Human Readable Name for this Mirror.</name>
+ <url>http://my.repository.com/repo/path</url>
+ </mirror>
+ -->
+ <mirror>
+ <id>fake.mirror.of.central</id>
+ <mirrorOf>central</mirrorOf>
+ <name>Fake mirror of central - reroutes central to repository.jboss.org</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </mirror>
+ </mirrors>
+
+ <!-- profiles
+ | This is a list of profiles which can be activated in a variety of ways, and which can modify
+ | the build process. Profiles provided in the settings.xml are intended to provide local machine-
+ | specific paths and repository locations which allow the build to work in the local environment.
+ |
+ | For example, if you have an integration testing plugin - like cactus - that needs to know where
+ | your Tomcat instance is installed, you can provide a variable here such that the variable is
+ | dereferenced during the build process to configure the cactus plugin.
+ |
+ | As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
+ | section of this document (settings.xml) - will be discussed later. Another way essentially
+ | relies on the detection of a system property, either matching a particular value for the property,
+ | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
+ | value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
+ | Finally, the list of active profiles can be specified directly from the command line.
+ |
+ | NOTE: For profiles defined in the settings.xml, you are restricted to specifying only artifact
+ | repositories, plugin repositories, and free-form properties to be used as configuration
+ | variables for plugins in the POM.
+ |
+ |-->
+ <profiles>
+ <!-- profile
+ | Specifies a set of introductions to the build process, to be activated using one or more of the
+ | mechanisms described above. For inheritance purposes, and to activate profiles via <activatedProfiles/>
+ | or the command line, profiles have to have an ID that is unique.
+ |
+ | An encouraged best practice for profile identification is to use a consistent naming convention
+ | for profiles, such as 'env-dev', 'env-test', 'env-production', 'user-jdcasey', 'user-brett', etc.
+ | This will make it more intuitive to understand what the set of introduced profiles is attempting
+ | to accomplish, particularly when you only have a list of profile id's for debug.
+ |
+ | This profile example uses the JDK version to trigger activation, and provides a JDK-specific repo.
+ <profile>
+ <id>jdk-1.4</id>
+
+ <activation>
+ <jdk>1.4</jdk>
+ </activation>
+
+ <repositories>
+ <repository>
+ <id>jdk14</id>
+ <name>Repository for JDK 1.4 builds</name>
+ <url>http://www.myhost.com/maven/jdk14</url>
+ <layout>default</layout>
+ <snapshotPolicy>always</snapshotPolicy>
+ </repository>
+ </repositories>
+ </profile>
+ -->
+
+ <!--
+ | Here is another profile, activated by the system property 'target-env' with a value of 'dev',
+ | which provides a specific path to the Tomcat instance. To use this, your plugin configuration
+ | might hypothetically look like:
+ |
+ | ...
+ | <plugin>
+ | <groupId>org.myco.myplugins</groupId>
+ | <artifactId>myplugin</artifactId>
+ |
+ | <configuration>
+ | <tomcatLocation>${tomcatPath}</tomcatLocation>
+ | </configuration>
+ | </plugin>
+ | ...
+ |
+ | NOTE: If you just wanted to inject this configuration whenever someone set 'target-env' to
+ | anything, you could just leave off the <value/> inside the activation-property.
+ |
+ <profile>
+ <id>env-dev</id>
+
+ <activation>
+ <property>
+ <name>target-env</name>
+ <value>dev</value>
+ </property>
+ </activation>
+
+ <properties>
+ <tomcatPath>/path/to/tomcat/instance</tomcatPath>
+ </properties>
+ </profile>
+ -->
+ </profiles>
+
+ <!-- activeProfiles
+ | List of profiles that are active for all builds.
+ |
+ <activeProfiles>
+ <activeProfile>alwaysActiveProfile</activeProfile>
+ <activeProfile>anotherAlwaysActiveProfile</activeProfile>
+ </activeProfiles>
+ -->
+</settings>
Property changes on: branches/Seam_2_0/build/ci.settings.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: branches/Seam_2_0/build/common.build.xml
===================================================================
--- branches/Seam_2_0/build/common.build.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/build/common.build.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -20,6 +20,8 @@
<property name="tmp.dir" value="${seam.dir}/classes" />
<property name="lib.dir" value="${seam.dir}/lib" />
<property name="endorsed.dir" value="${tmp.dir}/endorsed" />
+
+ <property name="maven.settings.xml" location="${build.dir}/settings.xml" />
<property name="embedded.version" value="beta3" />
@@ -127,7 +129,7 @@
</target>
<target name="copyseam" if="mavenized.property" unless="copyseamdone" depends="initcopy, initpoms">
- <artifact:dependencies filesetId="seam.fileset" versionsId="seam.versions">
+ <copyInlineDependencies id="seam" scope="compile" todir="${lib.dir}">
<dependency groupId="org.jboss.seam" artifactId="jboss-seam" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-debug" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-ioc" version="${complete.version}" />
@@ -135,16 +137,12 @@
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-pdf" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-ui" version="${complete.version}" />
- </artifact:dependencies>
- <copy todir="${lib.dir}">
- <fileset refid="seam.fileset" />
- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${seam.versions}" to="flatten" />
- </copy>
+ </copyInlineDependencies>
<property name="copyseamdone" value="true" />
</target>
<target name="copyjbossembedded" if="mavenized.property" unless="copyjbossembeddeddone" depends="initpoms, initcopy">
- <artifact:dependencies filesetId="embeddedjboss.fileset" versionsId="embeddedjboss.versions">
+ <copyInlineDependencies id="embeddedjboss" scope="compile" todir="${lib.dir}/test">
<dependency groupId="org.jboss.seam.embedded" artifactId="jboss-embedded-all" version="${embedded.version}">
<!-- Exclude the embedded api, its a dep of Seam core -->
<exclusion groupId="org.jboss.seam.embedded" artifactId="jboss-embedded-api" />
@@ -154,13 +152,16 @@
<remoteRepository refId="repository.jboss.org" />
<remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2" />
- </artifact:dependencies>
- <copy todir="${lib.dir}/test">
- <fileset refid="embeddedjboss.fileset" />
- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${embeddedjboss.versions}" to="flatten" />
- </copy>
+ </copyInlineDependencies>
<property name="copyjbossembeddeddone" value="true" />
</target>
+
+ <target name="getemma">
+ <inlineDependencies id="emma" scope="runtime">
+ <dependency groupId="emma" artifactId="emma" version="2.0.5312" />
+ <dependency groupId="emma" artifactId="emma_ant" version="2.0.5312" />
+ </inlineDependencies>
+ </target>
<macrodef name="deploySeam">
<attribute name="repositoryId" />
Modified: branches/Seam_2_0/build/gen.pom.xml
===================================================================
--- branches/Seam_2_0/build/gen.pom.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/build/gen.pom.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -1,26 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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-gen</artifactId>
- <parent>
- <groupId>org.jboss.seam</groupId>
- <artifactId>parent</artifactId>
- <version>@seam.version@</version>
- </parent>
-
- <!-- See parent pom for notes on how to declare dependencies -->
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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-gen</artifactId>
+ <parent>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>parent</artifactId>
+ <version>@seam.version@</version>
+ </parent>
- <dependencies>
-
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
-
- </dependencies>
+ <!-- See parent pom for notes on how to declare dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-tools</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ </dependencies>
+
+
</project>
\ No newline at end of file
Modified: branches/Seam_2_0/build/root.pom.xml
===================================================================
--- branches/Seam_2_0/build/root.pom.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/build/root.pom.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -549,6 +549,10 @@
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -815,7 +819,79 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-tools</artifactId>
+ <version>3.2.0.ga</version>
+ </dependency>
+ <dependency>
+ <groupId>freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
+ <version>3.2.0-v20060603</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ <version>3.2.0-v20060603</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>jobs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>registry</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>preferences</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>contenttype</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ <version>3.2.0-v20060605-1400</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>commands</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -895,6 +971,13 @@
<version>2.2.1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+
+
</plugins>
</pluginManagement>
</build>
Deleted: branches/Seam_2_0/build/settings.xml
===================================================================
--- branches/Seam_2_0/build/settings.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/build/settings.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -1,24 +0,0 @@
-<settings xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/xsd/settings-1.0.0.xsd">
- <profiles>
- <profile>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>temporary</id>
- <name>Temporary Local Repository</name>
- <url>file://@tmp.dir@/tmp-repository</url>
- </repository>
- <repository>
- <id>development</id>
- <name>Development Repository</name>
- <url>file://@build.dir@/repository</url>
- </repository>
- </repositories>
- </profile>
- </profiles>
-</settings>
\ No newline at end of file
Added: branches/Seam_2_0/build/settings.xml
===================================================================
--- branches/Seam_2_0/build/settings.xml (rev 0)
+++ branches/Seam_2_0/build/settings.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -0,0 +1,247 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!--
+ | This is the configuration file for Maven. It can be specified at two levels:
+ |
+ | 1. User Level. This settings.xml file provides configuration for a single user,
+ | and is normally provided in $HOME/.m2/settings.xml.
+ |
+ | NOTE: This location can be overridden with the system property:
+ |
+ | -Dorg.apache.maven.user-settings=/path/to/user/settings.xml
+ |
+ | 2. Global Level. This settings.xml file provides configuration for all maven
+ | users on a machine (assuming they're all using the same maven
+ | installation). It's normally provided in
+ | ${maven.home}/conf/settings.xml.
+ |
+ | NOTE: This location can be overridden with the system property:
+ |
+ | -Dorg.apache.maven.global-settings=/path/to/global/settings.xml
+ |
+ | The sections in this sample file are intended to give you a running start at
+ | getting the most out of your Maven installation. Where appropriate, the default
+ | values (values used when the setting is not specified) are provided.
+ |
+ |-->
+<settings>
+ <!-- localRepository
+ | The path to the local repository maven will use to store artifacts.
+ |
+ | Default: ~/.m2/repository
+ <localRepository>/path/to/local/repo</localRepository>
+ -->
+
+ <!-- interactiveMode
+ | This will determine whether maven prompts you when it needs input. If set to false,
+ | maven will use a sensible default value, perhaps based on some other setting, for
+ | the parameter in question.
+ |
+ | Default: true
+ <interactiveMode>true</interactiveMode>
+ -->
+
+ <!-- offline
+ | Determines whether maven should attempt to connect to the network when executing a build.
+ | This will have an effect on artifact downloads, artifact deployment, and others.
+ |
+ | Default: false
+ <offline>false</offline>
+ -->
+
+ <!-- proxies
+ | This is a list of proxies which can be used on this machine to connect to the network.
+ | Unless otherwise specified (by system property or command-line switch), the first proxy
+ | specification in this list marked as active will be used.
+ |-->
+ <proxies>
+ <!-- proxy
+ | Specification for one proxy, to be used in connecting to the network.
+ |
+ <proxy>
+ <id>optional</id>
+ <active>true</active>
+ <protocol>http</protocol>
+ <username>proxyuser</username>
+ <password>proxypass</password>
+ <host>proxy.host.net</host>
+ <port>80</port>
+ <nonProxyHosts>local.net,some.host.com</nonProxyHosts>
+ </proxy>
+ -->
+ </proxies>
+
+ <!-- servers
+ | This is a list of authentication profiles, keyed by the server-id used within the system.
+ | Authentication profiles can be used whenever maven must make a connection to a remote server.
+ |-->
+ <servers>
+ <!-- server
+ | Specifies the authentication information to use when connecting to a particular server, identified by
+ | a unique name within the system (referred to by the 'id' attribute below).
+ |
+ | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
+ | used together.
+ |
+ <server>
+ <id>deploymentRepo</id>
+ <username>repouser</username>
+ <password>repopwd</password>
+ </server>
+ -->
+
+ <!-- Another sample, using keys to authenticate.
+ <server>
+ <id>siteServer</id>
+ <privateKey>/path/to/private/key</privateKey>
+ <passphrase>optional; leave empty if not used.</passphrase>
+ </server>
+ -->
+ </servers>
+
+ <!-- mirrors
+ | This is a list of mirrors to be used in downloading artifacts from remote repositories.
+ |
+ | It works like this: a POM may declare a repository to use in resolving certain artifacts.
+ | However, this repository may have problems with heavy traffic at times, so people have mirrored
+ | it to several places.
+ |
+ | That repository definition will have a unique id, so we can create a mirror reference for that
+ | repository, to be used as an alternate download site. The mirror site will be the preferred
+ | server for that repository.
+ |-->
+ <mirrors>
+ <!-- mirror
+ | Specifies a repository mirror site to use instead of a given repository. The repository that
+ | this mirror serves has an ID that matches the mirrorOf element of this mirror. IDs are used
+ | for inheritance and direct lookup purposes, and must be unique across the set of mirrors.
+ |
+ <mirror>
+ <id>mirrorId</id>
+ <mirrorOf>repositoryId</mirrorOf>
+ <name>Human Readable Name for this Mirror.</name>
+ <url>http://my.repository.com/repo/path</url>
+ </mirror>
+ -->
+ <mirror>
+ <id>fake.mirror.of.central</id>
+ <mirrorOf>central</mirrorOf>
+ <name>Fake mirror of central - reroutes central to repository.jboss.org</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </mirror>
+ </mirrors>
+
+ <!-- profiles
+ | This is a list of profiles which can be activated in a variety of ways, and which can modify
+ | the build process. Profiles provided in the settings.xml are intended to provide local machine-
+ | specific paths and repository locations which allow the build to work in the local environment.
+ |
+ | For example, if you have an integration testing plugin - like cactus - that needs to know where
+ | your Tomcat instance is installed, you can provide a variable here such that the variable is
+ | dereferenced during the build process to configure the cactus plugin.
+ |
+ | As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
+ | section of this document (settings.xml) - will be discussed later. Another way essentially
+ | relies on the detection of a system property, either matching a particular value for the property,
+ | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
+ | value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
+ | Finally, the list of active profiles can be specified directly from the command line.
+ |
+ | NOTE: For profiles defined in the settings.xml, you are restricted to specifying only artifact
+ | repositories, plugin repositories, and free-form properties to be used as configuration
+ | variables for plugins in the POM.
+ |
+ |-->
+ <profiles>
+ <!-- profile
+ | Specifies a set of introductions to the build process, to be activated using one or more of the
+ | mechanisms described above. For inheritance purposes, and to activate profiles via <activatedProfiles/>
+ | or the command line, profiles have to have an ID that is unique.
+ |
+ | An encouraged best practice for profile identification is to use a consistent naming convention
+ | for profiles, such as 'env-dev', 'env-test', 'env-production', 'user-jdcasey', 'user-brett', etc.
+ | This will make it more intuitive to understand what the set of introduced profiles is attempting
+ | to accomplish, particularly when you only have a list of profile id's for debug.
+ |
+ | This profile example uses the JDK version to trigger activation, and provides a JDK-specific repo.
+ <profile>
+ <id>jdk-1.4</id>
+
+ <activation>
+ <jdk>1.4</jdk>
+ </activation>
+
+ <repositories>
+ <repository>
+ <id>jdk14</id>
+ <name>Repository for JDK 1.4 builds</name>
+ <url>http://www.myhost.com/maven/jdk14</url>
+ <layout>default</layout>
+ <snapshotPolicy>always</snapshotPolicy>
+ </repository>
+ </repositories>
+ </profile>
+ -->
+
+ <!--
+ | Here is another profile, activated by the system property 'target-env' with a value of 'dev',
+ | which provides a specific path to the Tomcat instance. To use this, your plugin configuration
+ | might hypothetically look like:
+ |
+ | ...
+ | <plugin>
+ | <groupId>org.myco.myplugins</groupId>
+ | <artifactId>myplugin</artifactId>
+ |
+ | <configuration>
+ | <tomcatLocation>${tomcatPath}</tomcatLocation>
+ | </configuration>
+ | </plugin>
+ | ...
+ |
+ | NOTE: If you just wanted to inject this configuration whenever someone set 'target-env' to
+ | anything, you could just leave off the <value/> inside the activation-property.
+ |
+ <profile>
+ <id>env-dev</id>
+
+ <activation>
+ <property>
+ <name>target-env</name>
+ <value>dev</value>
+ </property>
+ </activation>
+
+ <properties>
+ <tomcatPath>/path/to/tomcat/instance</tomcatPath>
+ </properties>
+ </profile>
+ -->
+ </profiles>
+
+ <!-- activeProfiles
+ | List of profiles that are active for all builds.
+ |
+ <activeProfiles>
+ <activeProfile>alwaysActiveProfile</activeProfile>
+ <activeProfile>anotherAlwaysActiveProfile</activeProfile>
+ </activeProfiles>
+ -->
+</settings>
Property changes on: branches/Seam_2_0/build/settings.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: branches/Seam_2_0/build/utilities.build.xml
===================================================================
--- branches/Seam_2_0/build/utilities.build.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/build/utilities.build.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -31,18 +31,29 @@
<attribute name="scope" />
<attribute name="pom" />
<sequential>
- <artifact:dependencies pathId="@{scope}.(a){id}.path" filesetId="@{scope}.(a){id}.fileset" versionsId="@{scope}.(a){id}.versions" useScope="@{scope}">
+ <artifact:dependencies pathId="@{scope}.(a){id}.path" filesetId="@{scope}.(a){id}.fileset" versionsId="@{scope}.(a){id}.versions" useScope="@{scope}" settingsFile="${maven.settings.xml}">
<pom file="@{pom}" />
</artifact:dependencies>
</sequential>
</macrodef>
+
+ <macrodef name="inlineDependencies">
+ <attribute name="id" />
+ <attribute name="scope" />
+ <element name="inline" implicit="true"/>
+ <sequential>
+ <artifact:dependencies pathId="@{scope}.(a){id}.path" filesetId="@{scope}.(a){id}.fileset" versionsId="@{scope}.(a){id}.versions" useScope="@{scope}" settingsFile="${maven.settings.xml}">
+ <inline />
+ </artifact:dependencies>
+ </sequential>
+ </macrodef>
<macrodef name="dependenciesWithSources">
<attribute name="id" />
<attribute name="scope" />
<attribute name="pom" />
<sequential>
- <artifact:dependencies pathId="@{scope}.(a){id}.path" filesetId="@{scope}.(a){id}.fileset" versionsId="@{scope}.(a){id}.versions" useScope="@{scope}" sourcesFilesetId="@{scope}.(a){id}.source.fileset">
+ <artifact:dependencies pathId="@{scope}.(a){id}.path" filesetId="@{scope}.(a){id}.fileset" versionsId="@{scope}.(a){id}.versions" useScope="@{scope}" sourcesFilesetId="@{scope}.(a){id}.source.fileset" settingsFile="${maven.settings.xml}">
<pom file="@{pom}" />
</artifact:dependencies>
</sequential>
@@ -53,7 +64,7 @@
<attribute name="jar" default="" />
<element name="args" implicit="true" optional="true" />
<sequential>
- <artifact:install file="@{jar}">
+ <artifact:install file="@{jar}" settingsFile="${maven.settings.xml}">
<pom file="@{pom}" />
<args />
</artifact:install>
@@ -133,6 +144,31 @@
</copy>
</sequential>
</macrodef>
+
+ <!-- Copy dependencies from a given pom/scope to a directory, flattening
+ the directory structure and version information -->
+ <macrodef name="copyInlineDependencies">
+ <attribute name="id" />
+ <attribute name="scope" />
+ <element name="inline" implicit="true"/>
+ <attribute name="todir" />
+ <sequential>
+ <inlineDependencies id="@{id}" scope="@{scope}">
+ <inline />
+ </inlineDependencies>
+ <copy todir="@{todir}">
+ <fileset refid="@{scope}.(a){id}.fileset" />
+ <chainedmapper>
+ <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${@{scope}.(a){id}.versions}" to="flatten" />
+ <flattenmapper />
+ <compositemapper>
+ <identitymapper />
+ <globmapper from="mvel.jar" to="mvel14.jar"/>
+ </compositemapper>
+ </chainedmapper>
+ </copy>
+ </sequential>
+ </macrodef>
<macrodef name="maven">
<attribute name="target" />
@@ -151,6 +187,7 @@
<sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
<sysproperty key="maven.home" value="${maven.dir}" />
<arg line="-Dseam.version=${complete.version}" />
+ <arg line="--settings ${maven.settings.xml}" />
<!--<arg line="-q" />-->
<args />
<arg line="${maven.opts}" />
Modified: branches/Seam_2_0/build.xml
===================================================================
--- branches/Seam_2_0/build.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/build.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -40,7 +40,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 -->
@@ -72,7 +71,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" />
@@ -100,11 +98,6 @@
<property name="javac.debug" value="true" />
<property name="javac.deprecation" value="false" />
- <path id="classpath.emma">
- <pathelement location="${basedir}/extras/emma/emma.jar" />
- <pathelement location="${basedir}/extras/emma/emma_ant.jar" />
- </path>
-
<fileset id="eejb.conf" dir="${eejb.conf.dir}">
<include name="**/*.*" />
</fileset>
@@ -453,12 +446,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" />
@@ -628,7 +615,7 @@
</target>
- <target name="testcore" depends="inittestcore,compiletest" description="Run the core tests">
+ <target name="testcore" depends="inittestcore,compiletest,getemma" description="Run the core tests">
<taskdef resource="testngtasks" classpathref="test.core.path" />
<testng>
<jvmarg value="-Demma.coverage.out.file=${coverage.ec}" />
@@ -636,7 +623,7 @@
<classpath>
<path path="${classes.test.core.dir}" />
<path path="${classes.test.dir}" />
- <path refid="classpath.emma" />
+ <path refid="runtime.emma.path" />
<path refid="test.core.path" />
<pathelement location="${lib.dir}/jboss-seam-remoting.jar" />
</classpath>
@@ -669,8 +656,8 @@
</copy>
</target>
- <target name="instrumentcore" depends="compilecore">
- <taskdef resource="emma_ant.properties" classpathref="classpath.emma" />
+ <target name="instrumentcore" depends="compilecore,getemma">
+ <taskdef resource="emma_ant.properties" classpathref="runtime.emma.path" />
<mkdir dir="${coverage.dir}/core" />
<emma>
<instr instrpath="${classes.core.dir}" mode="overwrite" metadatafile="${coverage.dir}/coveragecore.em">
@@ -683,8 +670,8 @@
</emma>
</target>
- <target name="instrumentmail" depends="compilemail">
- <taskdef resource="emma_ant.properties" classpathref="classpath.emma" />
+ <target name="instrumentmail" depends="compilemail,getemma">
+ <taskdef resource="emma_ant.properties" classpathref="runtime.emma.path" />
<mkdir dir="${coverage.dir}/mail" />
<emma>
<instr instrpath="${classes.mail.dir}" mode="overwrite" metadatafile="${coverage.dir}/coveragemail.em">
@@ -696,8 +683,8 @@
<!-- Deprecated -->
<target name="coverage" depends="instrumentcore, instrumentmail, testall, coveragereport" />
- <target name="coveragereport" description="Create the coverage report">
- <taskdef resource="emma_ant.properties" classpathref="classpath.emma" />
+ <target name="coveragereport" depends="getemma" description="Create the coverage report">
+ <taskdef resource="emma_ant.properties" classpathref="runtime.emma.path" />
<emma>
<report depth="method">
<sourcepath>
Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Mail.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Mail.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Mail.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -328,7 +328,7 @@
<literal>mail-ra.rar</literal> — but the version distributed with
JBoss AS has a number of limitations (and isn't bundled in some versions)
therefore we recommend using the <literal>mail-ra.rar</literal>
- distributed with Seam is recommended (it's in the <literal>mail</literal>
+ distributed with Seam is recommended (it's in the <literal>extras/</literal>
directory in the Seam bundle). <literal>mail-ra.rar</literal> should
be placed in <literal>$JBOSS_HOME/server/default/deploy</literal>; if the
version of JBoss AS you use already has this file, replace it.
Modified: branches/Seam_2_0/examples/build.xml
===================================================================
--- branches/Seam_2_0/examples/build.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/examples/build.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -37,7 +37,7 @@
<!-- Library directories -->
<property name="lib.dir" value="${seam.dir}/lib" />
<property name="mail.dir" value="${seam.dir}/mail" />
- <property name="meldware.dir" value="${mail.dir}/buni-meldware" />
+ <property name="meldware.dir" value="${lib.dir}/meldware.deployable" />
<!-- Target directories -->
<property name="dist.dir" value="dist" />
@@ -292,6 +292,25 @@
<include name="jboss-embedded-api.jar" if="jboss-embedded-api.lib" />
</fileset>
+ <!-- Dependencies for Trinidad -->
+
+ <fileset id="trinidad-api.jar" dir="${lib.dir}">
+ <include name="trinidad-api.jar" if="trinidad.lib" />
+ </fileset>
+
+ <fileset id="trinidad-impl.jar" dir="${lib.dir}">
+ <include name="trinidad-impl.jar" if="trinidad.lib" />
+ </fileset>
+
+ <!-- Dependencies if el-ri is needed -->
+
+ <fileset id="el-ri.jar" dir="${lib.dir}">
+ <include name="el-ri.jar" if="el-ri.lib" />
+ </fileset>
+
+ <fileset id="jboss-common-core.jar" dir="${lib.dir}">
+ <include name="jboss-common-core.jar" if="jboss-common-core.lib" />
+ </fileset>
<!-- ############################ MELDWARE ############################ -->
<!--
@@ -421,10 +440,6 @@
<path refid="build.classpath.extras" />
</path>
- <path id="emma.classpath">
- <fileset dir="${seam.dir}/extras/emma/*.jar" />
- </path>
-
<path id="test.classpath">
<path path="${test.dir}" />
<fileset dir="${lib.dir}/test">
@@ -438,7 +453,6 @@
<path path="${eejb.conf.dir}" />
<path refid="test.classpath.extras" />
<path refid="build.classpath.extras" />
- <path refid="emma.classpath" />
<path location="${seam.dir}/src/test/resources/log4j.xml" />
</path>
@@ -457,7 +471,46 @@
<mkdir dir="${dist.dir}" />
</target>
- <target name="copyextradependencies" />
+ <target name="copyextradependencies" depends="gettrinidad, getelri, getjbosscommoncore"/>
+
+ <target name="gettrinidad" if="trinidad.lib">
+ <copyInlineDependencies id="trinidad" scope="runtime" todir="${lib.dir}">
+ <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-api" version="1.2.1">
+ <exclusion groupId="org.apache.myfaces.trinidad" artifactId="trinidad-build" />
+ <exclusion groupId="javax.servlet" artifactId="servlet-api" />
+ <exclusion groupId="javax.servlet.jsp" artifactId="jsp-api"/>
+ <exclusion groupId="javax.faces" artifactId="jsf-api"/>
+ </dependency>
+ <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-impl" version="1.2.1">
+ <exclusion groupId="org.apache.myfaces.trinidad" artifactId="trinidad-build" />
+ <exclusion groupId="javax.servlet" artifactId="servlet-api" />
+ <exclusion groupId="javax.servlet.jsp" artifactId="jsp-api"/>
+ <exclusion groupId="portlet-api" artifactId="portlet-api"/>
+ <exclusion groupId="jstl" artifactId="jstl"/>
+ <exclusion groupId="commons-beanutils" artifactId="commons-beanutils"/>
+ <exclusion groupId="javax.faces" artifactId="jsf-api"/>
+ <exclusion groupId="com.sun.facelets" artifactId="jsf-facelets"/>
+ </dependency>
+ </copyInlineDependencies>
+ </target>
+
+ <target name="getelri" if="el-ri.lib">
+ <copyInlineDependencies id="elri" scope="runtime" todir="${lib.dir}">
+ <dependency groupId="javax.el" artifactId="el-ri" version="1.2" />
+ </copyInlineDependencies>
+ </target>
+
+ <target name="getjbosscommoncore" if="jboss-common-core.lib">
+ <copyInlineDependencies id="jbosscommoncore" scope="runtime" todir="${lib.dir}">
+ <dependency groupId="jboss" artifactId="jboss-common-core" version="2.0.2.GA">
+ <exclusion groupId="apache-xerces" artifactId="xml-apis" />
+ <exclusion groupId="apache-httpclient" artifactId="commons-httpclient" />
+ <exclusion groupId="oswego-concurrent" artifactId="concurrent" />
+ <exclusion groupId="apache-slide" artifactId="webdavlib" />
+ <exclusion groupId="jboss" artifactId="jboss-logging-spi" />
+ </dependency>
+ </copyInlineDependencies>
+ </target>
<!-- Use the Eclipse compiler, if it is available -->
<target name="select-compiler">
@@ -503,6 +556,7 @@
<fileset refid="facelets.jar" />
<fileset refid="urlrewrite.jar" />
<fileset refid="richfaces-impl.jar" />
+ <fileset refid="trinidad-impl.jar" />
<fileset refid="war.lib.extras" />
<mapper type="flatten" />
</copy>
@@ -565,6 +619,9 @@
<fileset refid="spring.jar" />
<fileset refid="jcaptcha.jar" />
<fileset refid="antlr.jar" />
+ <fileset refid="el-ri.jar" />
+ <fileset refid="trinidad-api.jar" />
+ <fileset refid="jboss-common-core.jar" />
<mapper type="flatten" />
</copy>
</target>
@@ -590,7 +647,12 @@
</target>
<!-- Deploy meldware to JBoss AS -->
- <target name="meldware">
+ <target name="meldware" if="deploy.meldware.mail">
+ <copyInlineDependencies id="jbosscommoncore" scope="runtime" todir="${meldware.dir}">
+ <dependency groupId="org.buni.meldware" artifactId="mail" type="ear" version="1.0M8" />
+ <dependency groupId="org.buni.meldware" artifactId="meldware" type="store" version="1.0M8" />
+ <dependency groupId="org.buni.meldware" artifactId="meldwarebase" type="sar" version="1.0M8" />
+ </copyInlineDependencies>
<copy todir="${deploy.dir}">
<fileset dir="${meldware.dir}">
<patternset refid="meldware.files" />
@@ -753,6 +815,8 @@
<fileset refid="search.jar" />
<fileset refid="richfaces-api.jar" />
<fileset refid="groovy.jar" />
+ <fileset refid="trinidad-api.jar" />
+ <fileset refid="el-ri.jar" />
<mapper type="flatten" />
</copy>
<copy todir="${war.dir}">
@@ -827,11 +891,6 @@
You can test the example by running the test target.
-->
- <path id="emma.classpath">
- <pathelement location="${seam.dir}/extras/emma/emma.jar" />
- <pathelement location="${seam.dir}/extras/emma/emma_ant.jar" />
- </path>
-
<target name="validateConfiguration" description="Validate XML Configuration files">
<echo message="Validating configuaration files for ${Name}" />
<ant antfile="${build.dir}/validate.xml" target="validateConfiguration">
@@ -867,7 +926,7 @@
</copy>
</target>
- <target name="test" depends="buildtest, copyjbossembedded" description="Run the tests">
+ <target name="test" depends="buildtest, copyjbossembedded,getemma" description="Run the tests">
<taskdef resource="testngtasks" classpathref="build.classpath" />
<testng outputdir="${test-report.dir}">
<jvmarg value="-Xmx800M" />
@@ -875,13 +934,16 @@
<jvmarg value="-Demma.coverage.out.file=${coverage.ec}" />
<jvmarg value="-Djava.endorsed.dirs=${endorsed.dir}" />
<jvmarg value="${testng.jvmargs}" />
- <classpath refid="test.classpath" />
+ <classpath>
+ <path refid="test.classpath" />
+ <path refid="runtime.emma.path" />
+ </classpath>
<xmlfileset dir="${src.test.dir}" includes="**/testng.xml" />
</testng>
<echo>You can increase the logging by editing bootstrap/log4j.xml</echo>
</target>
- <target name="testclass" depends="buildtest, copyjbossembedded" description="Run a specific test">
+ <target name="testclass" depends="buildtest, copyjbossembedded,getemma" description="Run a specific test">
<taskdef resource="testngtasks" classpathref="build.classpath" />
<testng outputdir="${test-report.dir}" testname="${className}" suitename="${className}" >
<jvmarg value="-Xmx800M" />
@@ -889,7 +951,10 @@
<jvmarg value="-Demma.coverage.out.file=${coverage.ec}" />
<jvmarg value="-Djava.endorsed.dirs=${endorsed.dir}" />
<jvmarg value="${testng.jvmargs}" />
- <classpath refid="test.classpath" />
+ <classpath>
+ <path refid="test.classpath" />
+ <path refid="runtime.emma.path" />
+ </classpath>
<classfileset dir="${test.dir}" includes="**/${className}.class"/>
</testng>
<echo>You can increase the logging by editing bootstrap/log4j.xml</echo>
Modified: branches/Seam_2_0/examples/hibernate/build-glassfish.xml
===================================================================
--- branches/Seam_2_0/examples/hibernate/build-glassfish.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/examples/hibernate/build-glassfish.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -16,6 +16,7 @@
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
<property name="richfaces.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml"/>
@@ -30,7 +31,7 @@
<include name="lib/hibernate-annotations.jar"/>
<include name="lib/hibernate-entitymanager.jar"/>
<include name="lib/hibernate-validator.jar"/>
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
+
<include name="lib/asm.jar" />
<include name="lib/jboss-common-core.jar" />
<include name="lib/cglib.jar"/>
Modified: branches/Seam_2_0/examples/hibernate/build-jboss405.xml
===================================================================
--- branches/Seam_2_0/examples/hibernate/build-jboss405.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/examples/hibernate/build-jboss405.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -15,7 +15,8 @@
<property name="seam.ui.lib" value="true"/>
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
- <property name="richfaces.lib" value="true"/>
+ <property name="richfaces.lib" value="true"/>
+ <property name="el-ri.lib" value="true"/>
<import file="../build.xml"/>
@@ -29,7 +30,6 @@
<include name="lib/jsf-impl.jar"/>
<include name="lib/jstl.jar"/>
<include name="lib/el-api.jar"/>
- <include name="examples/jpa/lib/el-ri.jar" />
</fileset>
</project>
Modified: branches/Seam_2_0/examples/hibernate/build-tomcat55.xml
===================================================================
--- branches/Seam_2_0/examples/hibernate/build-tomcat55.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/examples/hibernate/build-tomcat55.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -15,7 +15,8 @@
<property name="seam.ui.lib" value="true"/>
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
- <property name="richfaces.lib" value="true"/>
+ <property name="richfaces.lib" value="true"/>
+ <property name="el-ri.lib" value="true"/>
<import file="../build.xml"/>
@@ -36,7 +37,6 @@
<include name="lib/hibernate-validator.jar"/>
<include name="lib/javassist.jar"/>
<include name="lib/persistence-api.jar" />
- <include name="examples/jpa/lib/el-ri.jar"/>
<include name="lib/el-api.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/jta.jar"/>
Modified: branches/Seam_2_0/examples/hibernate/build-weblogic92.xml
===================================================================
--- branches/Seam_2_0/examples/hibernate/build-weblogic92.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/examples/hibernate/build-weblogic92.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -15,7 +15,9 @@
<property name="seam.ui.lib" value="true"/>
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
- <property name="richfaces.lib" value="true"/>
+ <property name="richfaces.lib" value="true"/>
+ <property name="el-ri.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml"/>
@@ -34,7 +36,6 @@
<include name="lib/jsf-api.jar" />
<include name="lib/jsf-impl.jar" />
<include name="lib/jstl.jar" />
- <include name="examples/jpa/lib/el-ri.jar" />
<include name="lib/el-api.jar" />
<!-- Hibernate and deps -->
@@ -43,7 +44,6 @@
<include name="lib/hibernate-annotations.jar" />
<include name="lib/hibernate-entitymanager.jar" />
<include name="lib/hibernate-validator.jar" />
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/persistence-api.jar" />
<include name="lib/cglib.jar" />
<include name="lib/antlr.jar" />
Modified: branches/Seam_2_0/examples/hibernate/build-websphere61.xml
===================================================================
--- branches/Seam_2_0/examples/hibernate/build-websphere61.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/examples/hibernate/build-websphere61.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -12,10 +12,12 @@
<property name="exploded-archives.dir" value="exploded-archives-websphere61" />
<!-- Libraries to include -->
- <property name="seam.ui.lib" value="true" />
+ <property name="seam.ui.lib" value="true" />
<property name="seam.debug.lib" value="true" />
- <property name="facelets.lib" value="true" />
- <property name="richfaces.lib" value="true" />
+ <property name="facelets.lib" value="true" />
+ <property name="richfaces.lib" value="true" />
+ <property name="el-ri.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml" />
@@ -32,7 +34,6 @@
<include name="lib/jsf-api.jar"/>
<include name="lib/jsf-impl.jar"/>
<include name="lib/jstl.jar"/>
- <include name="examples/jpa/lib/el-ri.jar"/>
<include name="lib/el-api.jar" />
<!-- Hibernate and deps -->
@@ -41,7 +42,6 @@
<include name="lib/hibernate-annotations.jar"/>
<include name="lib/hibernate-entitymanager.jar"/>
<include name="lib/hibernate-validator.jar"/>
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/persistence-api.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/antlr.jar" />
Modified: branches/Seam_2_0/examples/jee5/booking/build.xml
===================================================================
--- branches/Seam_2_0/examples/jee5/booking/build.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/examples/jee5/booking/build.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -16,6 +16,7 @@
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
<property name="richfaces.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<!-- add libs for oc4j (broken classloading) -->
<!--
<property name="jbpm.lib" value="true"/>
@@ -39,7 +40,6 @@
<include name="lib/hibernate-annotations.jar"/>
<include name="lib/hibernate-entitymanager.jar"/>
<include name="lib/hibernate-validator.jar"/>
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/asm.jar"/>
<include name="lib/antlr.jar" />
Modified: branches/Seam_2_0/examples/jpa/build-glassfish.xml
===================================================================
--- branches/Seam_2_0/examples/jpa/build-glassfish.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/examples/jpa/build-glassfish.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -16,6 +16,7 @@
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
<property name="richfaces.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml"/>
@@ -30,7 +31,6 @@
<include name="lib/hibernate-annotations.jar"/>
<include name="lib/hibernate-entitymanager.jar"/>
<include name="lib/hibernate-validator.jar"/>
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/asm.jar" />
<include name="lib/jboss-common-core.jar" />
<include name="lib/cglib.jar"/>
Modified: branches/Seam_2_0/examples/jpa/build-jboss405.xml
===================================================================
--- branches/Seam_2_0/examples/jpa/build-jboss405.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/examples/jpa/build-jboss405.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -15,7 +15,8 @@
<property name="seam.ui.lib" value="true"/>
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
- <property name="richfaces.lib" value="true"/>
+ <property name="richfaces.lib" value="true"/>
+ <property name="el-ri.lib" value="true"/>
<import file="../build.xml"/>
@@ -28,7 +29,6 @@
<include name="lib/jsf-impl.jar"/>
<include name="lib/jsf-api.jar"/>
<include name="lib/jstl.jar"/>
- <include name="examples/jpa/lib/el-ri.jar"/>
<include name="lib/el-api.jar"/>
</fileset>
Modified: branches/Seam_2_0/examples/jpa/build-tomcat55.xml
===================================================================
--- branches/Seam_2_0/examples/jpa/build-tomcat55.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/examples/jpa/build-tomcat55.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -15,7 +15,9 @@
<property name="seam.ui.lib" value="true"/>
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
- <property name="richfaces.lib" value="true"/>
+ <property name="richfaces.lib" value="true"/>
+ <property name="el-ri.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml"/>
@@ -36,7 +38,6 @@
<include name="lib/jsf-api.jar"/>
<include name="lib/jsf-impl.jar"/>
<include name="lib/jstl.jar"/>
- <include name="examples/jpa/lib/el-ri.jar"/>
<include name="lib/el-api.jar" />
<!-- Hibernate and deps -->
@@ -45,7 +46,6 @@
<include name="lib/hibernate-annotations.jar"/>
<include name="lib/hibernate-entitymanager.jar"/>
<include name="lib/hibernate-validator.jar"/>
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/persistence-api.jar" />
<include name="lib/asm.jar" />
<include name="lib/cglib.jar"/>
Modified: branches/Seam_2_0/examples/jpa/build-tomcat6.xml
===================================================================
--- branches/Seam_2_0/examples/jpa/build-tomcat6.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/examples/jpa/build-tomcat6.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -16,6 +16,7 @@
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
<property name="richfaces.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml"/>
@@ -40,7 +41,6 @@
<include name="lib/jta.jar" />
<include name="lib/antlr.jar" />
<include name="lib/asm.jar" />
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
</fileset>
<fileset id="noejb.war.extras" dir="${resources.dir}">
Modified: branches/Seam_2_0/examples/jpa/build-weblogic10.xml
===================================================================
--- branches/Seam_2_0/examples/jpa/build-weblogic10.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/examples/jpa/build-weblogic10.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -13,10 +13,12 @@
value="exploded-archives-weblogic10" />
<!-- Libraries to include -->
- <property name="seam.ui.lib" value="true" />
+ <property name="seam.ui.lib" value="true" />
<property name="seam.debug.lib" value="true" />
- <property name="facelets.lib" value="true" />
- <property name="richfaces.lib" value="true" />
+ <property name="facelets.lib" value="true" />
+ <property name="richfaces.lib" value="true" />
+ <property name="el-ri.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml" />
@@ -33,7 +35,6 @@
<!-- JSF (and related) implementation -->
<include name="lib/jsf-api.jar" />
<include name="lib/jsf-impl.jar" />
- <include name="examples/jpa/lib/el-ri.jar" />
<!-- Hibernate and deps -->
<include name="lib/hibernate.jar" />
@@ -41,7 +42,6 @@
<include name="lib/hibernate-annotations.jar" />
<include name="lib/hibernate-entitymanager.jar" />
<include name="lib/hibernate-validator.jar" />
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/cglib.jar" />
<include name="lib/asm.jar"/>
<include name="lib/antlr.jar" />
Modified: branches/Seam_2_0/examples/jpa/build-weblogic92.xml
===================================================================
--- branches/Seam_2_0/examples/jpa/build-weblogic92.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/examples/jpa/build-weblogic92.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -13,10 +13,12 @@
value="exploded-archives-weblogic92" />
<!-- Libraries to include -->
- <property name="seam.ui.lib" value="true" />
+ <property name="seam.ui.lib" value="true" />
<property name="seam.debug.lib" value="true" />
- <property name="facelets.lib" value="true" />
- <property name="richfaces.lib" value="true" />
+ <property name="facelets.lib" value="true" />
+ <property name="richfaces.lib" value="true" />
+ <property name="el-ri.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml" />
@@ -36,7 +38,6 @@
<include name="lib/jsf-api.jar" />
<include name="lib/jsf-impl.jar" />
<include name="lib/jstl.jar" />
- <include name="examples/jpa/lib/el-ri.jar" />
<include name="lib/el-api.jar" />
<!-- Hibernate and deps -->
@@ -45,7 +46,6 @@
<include name="lib/hibernate-annotations.jar" />
<include name="lib/hibernate-entitymanager.jar" />
<include name="lib/hibernate-validator.jar" />
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/persistence-api.jar" />
<include name="lib/cglib.jar" />
<include name="lib/antlr.jar" />
Modified: branches/Seam_2_0/examples/jpa/build-websphere61.xml
===================================================================
--- branches/Seam_2_0/examples/jpa/build-websphere61.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/examples/jpa/build-websphere61.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -15,7 +15,9 @@
<property name="seam.ui.lib" value="true"/>
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
- <property name="richfaces.lib" value="true"/>
+ <property name="richfaces.lib" value="true"/>
+ <property name="el-ri.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml"/>
@@ -31,7 +33,6 @@
<!-- JSF (and related) implementation -->
<include name="lib/jsf-api.jar"/>
<include name="lib/jsf-impl.jar"/>
- <include name="examples/jpa/lib/el-ri.jar"/>
<include name="lib/el-api.jar" />
<!-- Hibernate and deps -->
@@ -40,7 +41,6 @@
<include name="lib/hibernate-annotations.jar"/>
<include name="lib/hibernate-entitymanager.jar"/>
<include name="lib/hibernate-validator.jar"/>
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/asm.jar"/>
<include name="lib/antlr.jar" />
Deleted: branches/Seam_2_0/examples/remoting/gwt/build.xml
===================================================================
--- branches/Seam_2_0/examples/remoting/gwt/build.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/examples/remoting/gwt/build.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="GWT" default="deploy" basedir="." xmlns:gwt="antlib:de.samaflost.gwttasks">
-
- <!-- Example name -->
- <property name="Name" value="Seam Remoting GWT Example" />
- <property name="example.name" value="jboss-seam-gwt" />
-
- <!-- Overrides -->
- <property name="seam.remoting.lib" value="yes" />
- <property name="gwt.lib" value="yes" />
-
- <import file="../../build.xml" />
-
- <!-- EXTRAS -->
- <taskdef
- uri="antlib:de.samaflost.gwttasks"
- resource="de/samaflost/gwttasks/antlib.xml"
- classpath="./lib/gwttasks.jar" />
-
- <property file="build.properties" />
-
- <!-- the "class bass" name of the gwt module you are including -->
- <property
- name="gwt.module.name"
- value="org.jboss.seam.example.remoting.gwt.HelloWorld" />
-
-
-
- <!-- the following are are handy utilities for doing GWT development.
- To use GWT, you will of course need to download GWT seperately -->
- <target name="gwt-compile">
- <!-- in this case, we are "re homing" the gwt generated stuff, so in
- this case we can only have one GWT module - we are doing this deliberately
- to keep the URL short -->
- <delete>
- <fileset dir="view" />
- </delete>
- <gwt:compile
- outDir="build/gwt"
- gwtHome="${gwt.home}"
- classBase="${gwt.module.name}"
- sourceclasspath="src" />
- <copy todir="view">
- <fileset dir="build/gwt/${gwt.module.name}" />
- </copy>
-
- </target>
-
- <target name="gwt-shell">
- <gwt:shell
- sourceclasspath="src"
- bindir="target/classes"
- outDir="view"
- gwtHome="${gwt.home}"
- startPage="org.jboss.seam.examples.remoting.gwt/HelloWorld.html" />
- </target>
-
-</project>
-
Added: branches/Seam_2_0/examples/remoting/gwt/build.xml
===================================================================
--- branches/Seam_2_0/examples/remoting/gwt/build.xml (rev 0)
+++ branches/Seam_2_0/examples/remoting/gwt/build.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+
+<project name="GWT" default="deploy" basedir="." xmlns:gwt="antlib:de.samaflost.gwttasks">
+
+ <!-- Example name -->
+ <property name="Name" value="Seam Remoting GWT Example" />
+ <property name="example.name" value="jboss-seam-gwt" />
+
+ <!-- Overrides -->
+ <property name="seam.remoting.lib" value="yes" />
+ <property name="gwt.lib" value="yes" />
+
+ <import file="../../build.xml" />
+
+ <inlineDependencies id="gwttasks" scope="runtime">
+ <dependency groupId="de.samaflost" artifactId="gwttasks" version="1" />
+ </inlineDependencies>
+
+ <!-- EXTRAS -->
+ <taskdef
+ uri="antlib:de.samaflost.gwttasks"
+ resource="de/samaflost/gwttasks/antlib.xml"
+ classpathref="runtime.gwttasks.path"
+ />
+
+ <property file="build.properties" />
+
+ <!-- the "class bass" name of the gwt module you are including -->
+ <property
+ name="gwt.module.name"
+ value="org.jboss.seam.example.remoting.gwt.HelloWorld" />
+
+
+
+ <!-- the following are are handy utilities for doing GWT development.
+ To use GWT, you will of course need to download GWT seperately -->
+ <target name="gwt-compile">
+ <!-- in this case, we are "re homing" the gwt generated stuff, so in
+ this case we can only have one GWT module - we are doing this deliberately
+ to keep the URL short -->
+ <delete>
+ <fileset dir="view" />
+ </delete>
+ <gwt:compile
+ outDir="build/gwt"
+ gwtHome="${gwt.home}"
+ classBase="${gwt.module.name}"
+ sourceclasspath="src" />
+ <copy todir="view">
+ <fileset dir="build/gwt/${gwt.module.name}" />
+ </copy>
+
+ </target>
+
+ <target name="gwt-shell">
+ <gwt:shell
+ sourceclasspath="src"
+ bindir="target/classes"
+ outDir="view"
+ gwtHome="${gwt.home}"
+ startPage="org.jboss.seam.examples.remoting.gwt/HelloWorld.html" />
+ </target>
+
+</project>
+
Property changes on: branches/Seam_2_0/examples/remoting/gwt/build.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: branches/Seam_2_0/examples/seamdiscs/build.xml
===================================================================
--- branches/Seam_2_0/examples/seamdiscs/build.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/examples/seamdiscs/build.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="Seamdiscs" default="restart" basedir=".">
+<project name="Seamdiscs" default="restart" basedir="." xmlns:artifact="urn:maven-artifact-ant">
<!-- Example name -->
<property name="Name" value="Seamdiscs"/>
@@ -10,24 +10,11 @@
<property name="seam.ui.lib" value="yes"/>
<property name="seam.debug.lib" value="yes"/>
<property name="facelets.lib" value="yes"/>
- <property name="richfaces.lib" value="yes"/>
+ <property name="richfaces.lib" value="yes"/>
+ <property name="trinidad.lib" value="yes"/>
<import file="../build.xml"/>
- <fileset id="ear.lib.extras" dir="resources/ear-lib">
- <include name="*.jar"/>
- </fileset>
-
- <fileset id="war.extras" dir="resources">
- <include name="WEB-INF/lib/*.jar"/>
- </fileset>
-
- <path id="build.classpath.extras">
- <fileset dir="resources/ear-lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
<patternset id="test.resources.files">
<exclude name="import.sql" />
</patternset>
Modified: branches/Seam_2_0/examples/wiki/build.xml
===================================================================
--- branches/Seam_2_0/examples/wiki/build.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/examples/wiki/build.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -78,9 +78,6 @@
<include name="*.jar" />
</fileset>
- <!-- Add EMMA to the classpath for coverage support -->
- <pathelement location="${seam.dir}/extras/emma/emma.jar" />
- <pathelement location="${seam.dir}/extras/emma/emma_ant.jar" />
</path>
<path id="tools.classpath">
@@ -458,7 +455,7 @@
<!-- ######################## TESTS ################## -->
- <target name="compiletests" depends="clean, compileclasses, copyjbossembedded"
+ <target name="compiletests" depends="clean, compileclasses, copyjbossembedded,getemma"
description="Compile the test Java source code">
<javac classpathref="test.classpath"
@@ -466,7 +463,11 @@
debug="${javac.debug}"
deprecation="${javac.deprecation}"
nowarn="${javac.nowarn}">
- <classpath path="${classes.dir}"/>
+ <classpath>
+ <path refid="test.classpath" />
+ <path refid="runtime.emma.path" />
+ <path path="${classes.dir}"/>
+ </classpath>
<src path="${src.test.dir}" />
</javac>
@@ -526,7 +527,11 @@
description="Run tests defined in *.tng.xml">
<taskdef resource="testngtasks" classpathref="test.classpath"/>
<testng outputdir="${test.output.dir}">
- <classpath refid="test.classpath"/>
+ <classpath>
+ <path refid="test.classpath" />
+ <path refid="runtime.emma.path" />
+ <path path="${classes.dir}"/>
+ </classpath>
<xmlfileset dir="${src.test.dir}" includes="*.tng.xml" />
<jvmarg line="${testng.jvmargs}"/>
<jvmarg value="-Demma.coverage.out.file=${coverage.ec}" />
Copied: branches/Seam_2_0/extras/mail-ra.rar (from rev 8071, branches/Seam_2_0/mail/mail-ra.rar)
===================================================================
(Binary files differ)
Property changes on: branches/Seam_2_0/extras/mail-ra.rar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/Seam_2_0/seam-gen/build.xml
===================================================================
--- branches/Seam_2_0/seam-gen/build.xml 2008-04-29 12:08:00 UTC (rev 8073)
+++ branches/Seam_2_0/seam-gen/build.xml 2008-04-29 12:09:51 UTC (rev 8074)
@@ -8,7 +8,7 @@
<property file="./build.properties" />
<import file="${seam.dir}/build/common.build.xml" />
- <target name="init">
+ <target name="init" depends="initpoms">
<path id="seam-gen.path" path="${seam.dir}/lib/jboss-seam-gen.jar" />
<!-- taskdefs -->
@@ -39,6 +39,8 @@
<taskdef name="pathFixer"
classname="org.jboss.seam.tool.FixPathTask"
classpathref="seam-gen.path"/>
+
+ <copyDependencies pom="${gen.pom}" id="gen" scope="runtime" todir="${lib.dir}/gen" />
</target>
<target name="init-properties" depends="init">
@@ -366,7 +368,7 @@
message="Enter the Hibernate dialect for your database [${hibernate.dialect.default}]"
defaultvalue="${hibernate.dialect.default}"/>
- <property name="old.driver.jar" value="lib/hsqldb.jar"/>
+ <property name="old.driver.jar" value="../lib/gen/hsqldb.jar"/>
<input addproperty="driver.jar.new"
message="Enter the filesystem path to the JDBC driver jar [${old.driver.jar}]"
defaultvalue="${old.driver.jar}"/>
@@ -626,13 +628,13 @@
<target name="copy-icefaces-maven" if="icefaces.property" unless="icefaces.lib.property">
<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" />
@@ -1057,7 +1059,7 @@
<target name="init-generate">
<path id="htools.classpath">
- <fileset dir="lib">
+ <fileset dir="${lib.dir}/gen">
<include name="*.jar"/>
</fileset>
<pathelement path="../lib/dom4j.jar" />
16 years, 7 months
- 1
- 0
Seam SVN: r8073 - branches/Seam_2_0/examples.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-29 08:08:00 -0400 (Tue, 29 Apr 2008)
New Revision: 8073
Removed:
branches/Seam_2_0/examples/takeaway/
Log:
remove takeaway example
16 years, 7 months
- 1
- 0
Seam SVN: r8072 - trunk/src/main/org/jboss/seam/faces and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-29 05:52:09 -0400 (Tue, 29 Apr 2008)
New Revision: 8072
Modified:
branches/Seam_2_0/src/main/org/jboss/seam/faces/FacesManager.java
branches/Seam_2_0/src/main/org/jboss/seam/faces/RedirectException.java
trunk/src/main/org/jboss/seam/faces/FacesManager.java
trunk/src/main/org/jboss/seam/faces/RedirectException.java
Log:
JBSEAM-2930
Modified: branches/Seam_2_0/src/main/org/jboss/seam/faces/FacesManager.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/faces/FacesManager.java 2008-04-29 08:52:03 UTC (rev 8071)
+++ branches/Seam_2_0/src/main/org/jboss/seam/faces/FacesManager.java 2008-04-29 09:52:09 UTC (rev 8072)
@@ -150,6 +150,10 @@
{
throw new IllegalStateException("attempted to redirect during RENDER_RESPONSE phase");
}*/
+ if (viewId == null)
+ {
+ throw new RedirectException("cannot redirect to a null viewId");
+ }
FacesContext context = FacesContext.getCurrentInstance();
String url = context.getApplication().getViewHandler().getActionURL(context, viewId);
if (parameters!=null)
@@ -180,6 +184,10 @@
@Override
public void redirect(String viewId, String conversationId)
{
+ if (viewId == null)
+ {
+ throw new RedirectException("cannot redirect to a null viewId");
+ }
FacesContext context = FacesContext.getCurrentInstance();
String url = context.getApplication().getViewHandler().getActionURL(context, viewId);
url = encodeConversationId(url, viewId, conversationId);
Modified: branches/Seam_2_0/src/main/org/jboss/seam/faces/RedirectException.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/faces/RedirectException.java 2008-04-29 08:52:03 UTC (rev 8071)
+++ branches/Seam_2_0/src/main/org/jboss/seam/faces/RedirectException.java 2008-04-29 09:52:09 UTC (rev 8072)
@@ -10,4 +10,9 @@
super(ioe);
}
+ public RedirectException(String message)
+ {
+ super(message);
+ }
+
}
Modified: trunk/src/main/org/jboss/seam/faces/FacesManager.java
===================================================================
--- trunk/src/main/org/jboss/seam/faces/FacesManager.java 2008-04-29 08:52:03 UTC (rev 8071)
+++ trunk/src/main/org/jboss/seam/faces/FacesManager.java 2008-04-29 09:52:09 UTC (rev 8072)
@@ -158,6 +158,10 @@
{
throw new IllegalStateException("attempted to redirect during RENDER_RESPONSE phase");
}*/
+ if (viewId == null)
+ {
+ throw new RedirectException("cannot redirect to a null viewId");
+ }
FacesContext context = FacesContext.getCurrentInstance();
String url = context.getApplication().getViewHandler().getActionURL(context, viewId);
if (parameters!=null)
@@ -188,6 +192,10 @@
@Override
public void redirect(String viewId, String conversationId)
{
+ if (viewId == null)
+ {
+ throw new RedirectException("cannot redirect to a null viewId");
+ }
FacesContext context = FacesContext.getCurrentInstance();
String url = context.getApplication().getViewHandler().getActionURL(context, viewId);
url = encodeConversationId(url, viewId, conversationId);
Modified: trunk/src/main/org/jboss/seam/faces/RedirectException.java
===================================================================
--- trunk/src/main/org/jboss/seam/faces/RedirectException.java 2008-04-29 08:52:03 UTC (rev 8071)
+++ trunk/src/main/org/jboss/seam/faces/RedirectException.java 2008-04-29 09:52:09 UTC (rev 8072)
@@ -10,4 +10,8 @@
super(ioe);
}
+ public RedirectException(String message)
+ {
+ super(message);
+ }
}
16 years, 7 months
- 1
- 0
Seam SVN: r8071 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-29 04:52:03 -0400 (Tue, 29 Apr 2008)
New Revision: 8071
Modified:
trunk/build/utilities.build.xml
Log:
minor
Modified: trunk/build/utilities.build.xml
===================================================================
--- trunk/build/utilities.build.xml 2008-04-28 22:21:13 UTC (rev 8070)
+++ trunk/build/utilities.build.xml 2008-04-29 08:52:03 UTC (rev 8071)
@@ -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.xml}">
+ <artifact:deploy file="@{jar}" uniqueVersion="@{unique}">
<pom file="@{pom}" />
<remoteRepository refId="@{repositoryId}">
<credentials />
16 years, 7 months
- 1
- 0
Seam SVN: r8070 - trunk/src/pdf/org/jboss/seam/pdf/ui.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-04-28 18:21:13 -0400 (Mon, 28 Apr 2008)
New Revision: 8070
Modified:
trunk/src/pdf/org/jboss/seam/pdf/ui/UICell.java
trunk/src/pdf/org/jboss/seam/pdf/ui/UIHtmlText.java
Log:
JBSEAM-2500
Modified: trunk/src/pdf/org/jboss/seam/pdf/ui/UICell.java
===================================================================
--- trunk/src/pdf/org/jboss/seam/pdf/ui/UICell.java 2008-04-28 21:34:35 UTC (rev 8069)
+++ trunk/src/pdf/org/jboss/seam/pdf/ui/UICell.java 2008-04-28 22:21:13 UTC (rev 8070)
@@ -38,6 +38,7 @@
Float grayFill;
Integer rotation;
+ boolean hasContent = false;
public void setGrayFill(Float grayFill) {
this.grayFill = grayFill;
@@ -278,18 +279,21 @@
}
@Override
- public void handleAdd(Object o) {
- if (o instanceof Phrase) {
- cell.setPhrase((Phrase) o);
- } else if (o instanceof Image) {
- cell.setImage((Image) o);
- } else if (o instanceof Element) {
- // calling addElement negates setPhrase, etc...
+ public void handleAdd(Object o) {
+ if (!hasContent && o instanceof Image) {
+ // added by user request, but it mages the logic here rather ugly.
+ cell.setImage((Image) o);
+
+ } else if (o instanceof Element) {
+ if (cell.getImage() != null) {
+ cell.addElement(cell.getImage());
+ }
cell.addElement((Element) o);
} else {
throw new RuntimeException("Can't add " + o.getClass().getName() +
" to cell");
}
+ hasContent = true;
}
}
Modified: trunk/src/pdf/org/jboss/seam/pdf/ui/UIHtmlText.java
===================================================================
--- trunk/src/pdf/org/jboss/seam/pdf/ui/UIHtmlText.java 2008-04-28 21:34:35 UTC (rev 8069)
+++ trunk/src/pdf/org/jboss/seam/pdf/ui/UIHtmlText.java 2008-04-28 22:21:13 UTC (rev 8070)
@@ -12,7 +12,6 @@
import org.jboss.seam.ui.util.JSF;
-import com.lowagie.text.Paragraph;
import com.lowagie.text.html.simpleparser.HTMLWorker;
import com.lowagie.text.html.simpleparser.StyleSheet;
@@ -23,7 +22,6 @@
private Converter converter;
private Object localValue;
- private Paragraph paragraph;
@Override
public boolean getRendersChildren() {
@@ -42,7 +40,6 @@
JSF.renderChildren(context, this);
context.setResponseWriter(writer);
-
String output = stringWriter.getBuffer().toString();
addFromHtml(output);
}
@@ -55,7 +52,7 @@
if (value!=null) {
addFromHtml(convert(context,value));
}
-
+
super.encodeEnd(context);
}
@@ -63,7 +60,11 @@
private void addFromHtml(String html)
throws IOException
{
- paragraph.addAll(HTMLWorker.parseToList(new StringReader(html), getStyle()));
+ for (Object o: HTMLWorker.parseToList(new StringReader(html), getStyle())) {
+ addToITextParent(o);
+ }
+
+ //paragraph.addAll(HTMLWorker.parseToList(new StringReader(html), getStyle()));
}
/**
@@ -105,23 +106,16 @@
@Override
public void createITextObject(FacesContext context) {
- com.lowagie.text.Font font = getFont();
- if (font == null) {
- paragraph = new Paragraph("");
- } else {
- paragraph = new Paragraph("", getFont());
- }
}
@Override
public Object getITextObject() {
- return paragraph;
+ return null;
}
@Override
public void removeITextObject() {
- paragraph = null;
}
@Override
16 years, 7 months
- 1
- 0
Seam SVN: r8069 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-28 17:34:35 -0400 (Mon, 28 Apr 2008)
New Revision: 8069
Modified:
trunk/build/root.pom.xml
Log:
Specify javadoc plugin version
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-04-28 21:15:01 UTC (rev 8068)
+++ trunk/build/root.pom.xml 2008-04-28 21:34:35 UTC (rev 8069)
@@ -1115,6 +1115,12 @@
<version>2.2.1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+
</plugins>
</pluginManagement>
</build>
16 years, 7 months
- 1
- 0