Seam SVN: r8771 - branches/Seam_2_0_FP.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-08-22 04:06:00 -0400 (Fri, 22 Aug 2008)
New Revision: 8771
Modified:
branches/Seam_2_0_FP/build.xml
Log:
JBPAPP-1105
Modified: branches/Seam_2_0_FP/build.xml
===================================================================
--- branches/Seam_2_0_FP/build.xml 2008-08-22 07:39:01 UTC (rev 8770)
+++ branches/Seam_2_0_FP/build.xml 2008-08-22 08:06:00 UTC (rev 8771)
@@ -48,9 +48,8 @@
<!-- Distribution targets -->
<property name="dist.name" value="${name}-${complete.version}" />
-
- <property name="dist.location" value="${basedir}/../" />
- <property name="dist.dir" location="${dist.location}/${dist.name}" />
+
+ <property name="dist.dir" location="${basedir}/dist" />
<property name="dist.ui.dir" value="${dist.dir}/ui" />
<property name="dist.doc.dir" value="${dist.dir}/doc" />
<property name="dist.api.dir" value="${dist.dir}/doc/api" />
@@ -523,10 +522,10 @@
<target name="dist" depends="cleandist,build,javadoc,copysource,copylib,copybuild,copyexamples,copyseamgen,refdoc,extras" description="Build everything and package">
- <zip zipfile="${dist.location}/${dist.name}.zip">
+ <zip zipfile="${basedir}/${dist.name}.zip">
<zipfileset prefix="${dist.name}" dir="${dist.dir}" />
</zip>
- <tar tarfile="${dist.location}/${dist.name}.tar.gz" compression="gzip">
+ <tar tarfile="${basedir}/${dist.name}.tar.gz" compression="gzip">
<tarfileset prefix="${dist.name}" dir="${dist.dir}" />
</tar>
</target>
15 years, 8 months
Seam SVN: r8770 - branches/Seam_2_0_FP.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-08-22 03:39:01 -0400 (Fri, 22 Aug 2008)
New Revision: 8770
Modified:
branches/Seam_2_0_FP/build.xml
Log:
JBPAPP-1107
Modified: branches/Seam_2_0_FP/build.xml
===================================================================
--- branches/Seam_2_0_FP/build.xml 2008-08-22 01:52:26 UTC (rev 8769)
+++ branches/Seam_2_0_FP/build.xml 2008-08-22 07:39:01 UTC (rev 8770)
@@ -501,6 +501,8 @@
<copy file="lgpl.txt" todir="${dist.dir}" />
<copy file="changelog.txt" todir="${dist.dir}" />
<propertyfile file="${dist.dir}/build.properties" comment="See build/sample.build.properties for properties you might want to set">
+ <entry key="tomcat.home" value="/var/lib/tomcat5" />
+ <entry key="jboss.home" value="/var/lib/jbossas" />
<entry key="mavenized" value="false" />
<entry key="qualifier" value="${qualifier}" />
</propertyfile>
15 years, 8 months
Seam SVN: r8769 - in trunk/src/main/org/jboss/seam: init and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-08-21 21:52:26 -0400 (Thu, 21 Aug 2008)
New Revision: 8769
Modified:
trunk/src/main/org/jboss/seam/cache/JbossCacheProvider.java
trunk/src/main/org/jboss/seam/init/DependencyManager.java
Log:
fix NoClassDefFoundError, improved logging
Modified: trunk/src/main/org/jboss/seam/cache/JbossCacheProvider.java
===================================================================
--- trunk/src/main/org/jboss/seam/cache/JbossCacheProvider.java 2008-08-21 20:15:43 UTC (rev 8768)
+++ trunk/src/main/org/jboss/seam/cache/JbossCacheProvider.java 2008-08-22 01:52:26 UTC (rev 8769)
@@ -27,7 +27,7 @@
@Name("org.jboss.seam.cache.cacheProvider")
@Scope(APPLICATION)
@BypassInterceptors
-@Install(precedence = FRAMEWORK, classDependencies="org.jboss.cache.TreeCache")
+@Install(precedence = FRAMEWORK, classDependencies="org.jboss.cache.TreeCache,org.jgroups.MembershipListener")
@AutoCreate
public class JbossCacheProvider extends AbstractJBossCacheProvider<TreeCache>
{
Modified: trunk/src/main/org/jboss/seam/init/DependencyManager.java
===================================================================
--- trunk/src/main/org/jboss/seam/init/DependencyManager.java 2008-08-21 20:15:43 UTC (rev 8768)
+++ trunk/src/main/org/jboss/seam/init/DependencyManager.java 2008-08-22 01:52:26 UTC (rev 8769)
@@ -7,6 +7,9 @@
import java.util.Set;
import java.util.TreeSet;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
+
/**
* Evaluates component dependencies to determine which
* components are installed.
@@ -19,6 +22,8 @@
private Map<String, Set<ComponentDescriptor>> componentDescriptors;
private Set<ComponentDescriptor> currentTestSet;
private Set<ComponentDescriptor> installedSet;
+
+ private final LogProvider log = Logging.getLogProvider(DependencyManager.class);
public DependencyManager(Map<String, Set<ComponentDescriptor>> componentDescriptors)
{
@@ -141,6 +146,12 @@
{
return false;
}
+ catch (NoClassDefFoundError e)
+ {
+ log.error("Error while checking dependencies for component class " +
+ descriptor.getComponentClass().getName(), e);
+ throw e;
+ }
}
return true;
15 years, 8 months
Seam SVN: r8768 - branches/Seam_2_0_FP/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-08-21 16:15:43 -0400 (Thu, 21 Aug 2008)
New Revision: 8768
Modified:
branches/Seam_2_0_FP/build/root.pom.xml
Log:
JBPAPP-1095 - next step
Modified: branches/Seam_2_0_FP/build/root.pom.xml
===================================================================
--- branches/Seam_2_0_FP/build/root.pom.xml 2008-08-21 17:41:52 UTC (rev 8767)
+++ branches/Seam_2_0_FP/build/root.pom.xml 2008-08-21 20:15:43 UTC (rev 8768)
@@ -133,6 +133,12 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
15 years, 8 months
Seam SVN: r8767 - branches/Seam_2_0/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-08-21 13:41:52 -0400 (Thu, 21 Aug 2008)
New Revision: 8767
Modified:
branches/Seam_2_0/build/root.pom.xml
Log:
Fix the build on the branch
Modified: branches/Seam_2_0/build/root.pom.xml
===================================================================
--- branches/Seam_2_0/build/root.pom.xml 2008-08-21 14:46:34 UTC (rev 8766)
+++ branches/Seam_2_0/build/root.pom.xml 2008-08-21 17:41:52 UTC (rev 8767)
@@ -128,6 +128,12 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
15 years, 8 months
Seam SVN: r8766 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-08-21 10:46:34 -0400 (Thu, 21 Aug 2008)
New Revision: 8766
Modified:
trunk/build/root.pom.xml
Log:
try to fix the build
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-08-21 14:15:46 UTC (rev 8765)
+++ trunk/build/root.pom.xml 2008-08-21 14:46:34 UTC (rev 8766)
@@ -142,6 +142,12 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
15 years, 8 months
Seam SVN: r8765 - branches/Seam_2_0_FP/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-08-21 10:15:46 -0400 (Thu, 21 Aug 2008)
New Revision: 8765
Modified:
branches/Seam_2_0_FP/build/gen.pom.xml
branches/Seam_2_0_FP/build/root.pom.xml
Log:
JBPAPP-1095
Modified: branches/Seam_2_0_FP/build/gen.pom.xml
===================================================================
--- branches/Seam_2_0_FP/build/gen.pom.xml 2008-08-21 13:57:52 UTC (rev 8764)
+++ branches/Seam_2_0_FP/build/gen.pom.xml 2008-08-21 14:15:46 UTC (rev 8765)
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>compile</scope>
</dependency>
Modified: branches/Seam_2_0_FP/build/root.pom.xml
===================================================================
--- branches/Seam_2_0_FP/build/root.pom.xml 2008-08-21 13:57:52 UTC (rev 8764)
+++ branches/Seam_2_0_FP/build/root.pom.xml 2008-08-21 14:15:46 UTC (rev 8765)
@@ -130,9 +130,9 @@
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
15 years, 8 months
Seam SVN: r8764 - branches/Seam_2_0/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-08-21 09:57:52 -0400 (Thu, 21 Aug 2008)
New Revision: 8764
Modified:
branches/Seam_2_0/build/gen.pom.xml
branches/Seam_2_0/build/root.pom.xml
Log:
JBSEAM-3289
Modified: branches/Seam_2_0/build/gen.pom.xml
===================================================================
--- branches/Seam_2_0/build/gen.pom.xml 2008-08-21 13:51:55 UTC (rev 8763)
+++ branches/Seam_2_0/build/gen.pom.xml 2008-08-21 13:57:52 UTC (rev 8764)
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>compile</scope>
</dependency>
Modified: branches/Seam_2_0/build/root.pom.xml
===================================================================
--- branches/Seam_2_0/build/root.pom.xml 2008-08-21 13:51:55 UTC (rev 8763)
+++ branches/Seam_2_0/build/root.pom.xml 2008-08-21 13:57:52 UTC (rev 8764)
@@ -125,9 +125,9 @@
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
15 years, 8 months
Seam SVN: r8763 - in trunk/src/main: org/jboss/seam/cache and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-08-21 09:51:55 -0400 (Thu, 21 Aug 2008)
New Revision: 8763
Modified:
trunk/src/main/META-INF/components.xml
trunk/src/main/org/jboss/seam/cache/EhCacheProvider.java
trunk/src/main/org/jboss/seam/cache/JbossCache2Provider.java
trunk/src/main/org/jboss/seam/cache/JbossCacheProvider.java
trunk/src/main/org/jboss/seam/cache/JbossPojoCacheProvider.java
Log:
Import for cache namespace, and make cache components @AutoCreate
Modified: trunk/src/main/META-INF/components.xml
===================================================================
--- trunk/src/main/META-INF/components.xml 2008-08-21 13:51:08 UTC (rev 8762)
+++ trunk/src/main/META-INF/components.xml 2008-08-21 13:51:55 UTC (rev 8763)
@@ -4,6 +4,7 @@
xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd">
<import>org.jboss.seam.core</import>
+ <import>org.jboss.seam.cache</import>
<import>org.jboss.seam.transaction</import>
<import>org.jboss.seam.framework</import>
<import>org.jboss.seam.web</import>
Modified: trunk/src/main/org/jboss/seam/cache/EhCacheProvider.java
===================================================================
--- trunk/src/main/org/jboss/seam/cache/EhCacheProvider.java 2008-08-21 13:51:08 UTC (rev 8762)
+++ trunk/src/main/org/jboss/seam/cache/EhCacheProvider.java 2008-08-21 13:51:55 UTC (rev 8763)
@@ -6,6 +6,7 @@
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Element;
+import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.Install;
@@ -26,6 +27,7 @@
@Scope(STATELESS)
@BypassInterceptors
@Install(value = false, precedence = BUILT_IN, classDependencies="net.sf.ehcache.Cache")
+@AutoCreate
public class EhCacheProvider extends CacheProvider<CacheManager>
{
Modified: trunk/src/main/org/jboss/seam/cache/JbossCache2Provider.java
===================================================================
--- trunk/src/main/org/jboss/seam/cache/JbossCache2Provider.java 2008-08-21 13:51:08 UTC (rev 8762)
+++ trunk/src/main/org/jboss/seam/cache/JbossCache2Provider.java 2008-08-21 13:51:55 UTC (rev 8763)
@@ -6,6 +6,7 @@
import org.jboss.cache.Cache;
import org.jboss.cache.CacheFactory;
import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.Install;
@@ -27,6 +28,7 @@
@Scope(APPLICATION)
@BypassInterceptors
@Install(precedence = BUILT_IN, classDependencies="org.jboss.cache.Cache")
+@AutoCreate
public class JbossCache2Provider extends AbstractJBossCacheProvider<Cache>
{
Modified: trunk/src/main/org/jboss/seam/cache/JbossCacheProvider.java
===================================================================
--- trunk/src/main/org/jboss/seam/cache/JbossCacheProvider.java 2008-08-21 13:51:08 UTC (rev 8762)
+++ trunk/src/main/org/jboss/seam/cache/JbossCacheProvider.java 2008-08-21 13:51:55 UTC (rev 8763)
@@ -7,6 +7,7 @@
import org.jboss.cache.Node;
import org.jboss.cache.PropertyConfigurator;
import org.jboss.cache.TreeCache;
+import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.Install;
@@ -27,6 +28,7 @@
@Scope(APPLICATION)
@BypassInterceptors
@Install(precedence = FRAMEWORK, classDependencies="org.jboss.cache.TreeCache")
+@AutoCreate
public class JbossCacheProvider extends AbstractJBossCacheProvider<TreeCache>
{
Modified: trunk/src/main/org/jboss/seam/cache/JbossPojoCacheProvider.java
===================================================================
--- trunk/src/main/org/jboss/seam/cache/JbossPojoCacheProvider.java 2008-08-21 13:51:08 UTC (rev 8762)
+++ trunk/src/main/org/jboss/seam/cache/JbossPojoCacheProvider.java 2008-08-21 13:51:55 UTC (rev 8763)
@@ -5,6 +5,7 @@
import org.jboss.cache.CacheException;
import org.jboss.cache.aop.PojoCache;
+import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.Install;
@@ -25,6 +26,7 @@
@Scope(APPLICATION)
@BypassInterceptors
@Install(value = false, precedence = BUILT_IN, classDependencies="org.jboss.cache.aop.PojoCache")
+@AutoCreate
public class JbossPojoCacheProvider extends AbstractJBossCacheProvider<PojoCache>
{
15 years, 8 months
Seam SVN: r8762 - in trunk/examples/blog: src/actions and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-08-21 09:51:08 -0400 (Thu, 21 Aug 2008)
New Revision: 8762
Modified:
trunk/examples/blog/resources/WEB-INF/components.xml
trunk/examples/blog/src/actions/PostAction.java
Log:
Changes to example as a result of CacheProvider changes
Modified: trunk/examples/blog/resources/WEB-INF/components.xml
===================================================================
--- trunk/examples/blog/resources/WEB-INF/components.xml 2008-08-21 13:50:33 UTC (rev 8761)
+++ trunk/examples/blog/resources/WEB-INF/components.xml 2008-08-21 13:51:08 UTC (rev 8762)
@@ -4,12 +4,14 @@
xmlns:persistence="http://jboss.com/products/seam/persistence"
xmlns:security="http://jboss.com/products/seam/security"
xmlns:theme="http://jboss.com/products/seam/theme"
+ xmlns:cache="http://jboss.com/products/seam/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd
http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd
http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd
http://jboss.com/products/seam/theme http://jboss.com/products/seam/theme-2.1.xsd
+ http://jboss.com/products/seam/cache http://jboss.com/products/seam/cache-2.1.xsd
http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd">
<core:init debug="true"/>
Modified: trunk/examples/blog/src/actions/PostAction.java
===================================================================
--- trunk/examples/blog/src/actions/PostAction.java 2008-08-21 13:50:33 UTC (rev 8761)
+++ trunk/examples/blog/src/actions/PostAction.java 2008-08-21 13:51:08 UTC (rev 8762)
@@ -5,12 +5,11 @@
import javax.persistence.EntityManager;
-import org.jboss.cache.CacheException;
-import org.jboss.cache.aop.PojoCache;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.cache.CacheProvider;
import org.jboss.seam.faces.FacesMessages;
import domain.Blog;
@@ -31,14 +30,14 @@
@In(required=false) BlogEntry blogEntry;
- @In PojoCache pojoCache;
+ @In CacheProvider cacheProvider;
- public void post() throws IOException, CacheException
+ public void post() throws IOException
{
blogEntry.setDate( new Date() );
blog.getBlogEntries().add(blogEntry);
entityManager.persist(blogEntry);
- pojoCache.remove("pageFragments", "index");
+ cacheProvider.remove("pageFragments", "index");
}
public void invalid()
15 years, 8 months