Author: mstruk
Date: 2009-11-17 08:01:05 -0500 (Tue, 17 Nov 2009)
New Revision: 717
Modified:
kernel/branches/mc-int-branch/exo.kernel.commons/pom.xml
kernel/branches/mc-int-branch/exo.kernel.component.cache/pom.xml
kernel/branches/mc-int-branch/exo.kernel.component.command/pom.xml
kernel/branches/mc-int-branch/exo.kernel.component.common/pom.xml
kernel/branches/mc-int-branch/exo.kernel.component.remote/pom.xml
kernel/branches/mc-int-branch/exo.kernel.container/pom.xml
kernel/branches/mc-int-branch/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationContainer.java
kernel/branches/mc-int-branch/exo.kernel.demos/mc-injection/pom.xml
kernel/branches/mc-int-branch/exo.kernel.demos/pom.xml
kernel/branches/mc-int-branch/org.jboss.mc-kernel-extras/pom.xml
kernel/branches/mc-int-branch/packaging/module/pom.xml
kernel/branches/mc-int-branch/pom.xml
Log:
Merged in trunk changes up to rev. 710
Modified: kernel/branches/mc-int-branch/exo.kernel.commons/pom.xml
===================================================================
--- kernel/branches/mc-int-branch/exo.kernel.commons/pom.xml 2009-11-17 12:41:22 UTC (rev
716)
+++ kernel/branches/mc-int-branch/exo.kernel.commons/pom.xml 2009-11-17 13:01:05 UTC (rev
717)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.0-Beta03-SNAPSHOT</version>
+ <version>2.2.0-Beta04-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.commons</artifactId>
Modified: kernel/branches/mc-int-branch/exo.kernel.component.cache/pom.xml
===================================================================
--- kernel/branches/mc-int-branch/exo.kernel.component.cache/pom.xml 2009-11-17 12:41:22
UTC (rev 716)
+++ kernel/branches/mc-int-branch/exo.kernel.component.cache/pom.xml 2009-11-17 13:01:05
UTC (rev 717)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.0-Beta03-SNAPSHOT</version>
+ <version>2.2.0-Beta04-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.cache</artifactId>
Modified: kernel/branches/mc-int-branch/exo.kernel.component.command/pom.xml
===================================================================
--- kernel/branches/mc-int-branch/exo.kernel.component.command/pom.xml 2009-11-17 12:41:22
UTC (rev 716)
+++ kernel/branches/mc-int-branch/exo.kernel.component.command/pom.xml 2009-11-17 13:01:05
UTC (rev 717)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.0-Beta03-SNAPSHOT</version>
+ <version>2.2.0-Beta04-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.command</artifactId>
Modified: kernel/branches/mc-int-branch/exo.kernel.component.common/pom.xml
===================================================================
--- kernel/branches/mc-int-branch/exo.kernel.component.common/pom.xml 2009-11-17 12:41:22
UTC (rev 716)
+++ kernel/branches/mc-int-branch/exo.kernel.component.common/pom.xml 2009-11-17 13:01:05
UTC (rev 717)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.0-Beta03-SNAPSHOT</version>
+ <version>2.2.0-Beta04-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.common</artifactId>
Modified: kernel/branches/mc-int-branch/exo.kernel.component.remote/pom.xml
===================================================================
--- kernel/branches/mc-int-branch/exo.kernel.component.remote/pom.xml 2009-11-17 12:41:22
UTC (rev 716)
+++ kernel/branches/mc-int-branch/exo.kernel.component.remote/pom.xml 2009-11-17 13:01:05
UTC (rev 717)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.0-Beta03-SNAPSHOT</version>
+ <version>2.2.0-Beta04-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.remote</artifactId>
Modified: kernel/branches/mc-int-branch/exo.kernel.container/pom.xml
===================================================================
--- kernel/branches/mc-int-branch/exo.kernel.container/pom.xml 2009-11-17 12:41:22 UTC
(rev 716)
+++ kernel/branches/mc-int-branch/exo.kernel.container/pom.xml 2009-11-17 13:01:05 UTC
(rev 717)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.0-Beta03-SNAPSHOT</version>
+ <version>2.2.0-Beta04-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.container</artifactId>
Modified:
kernel/branches/mc-int-branch/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationContainer.java
===================================================================
---
kernel/branches/mc-int-branch/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationContainer.java 2009-11-17
12:41:22 UTC (rev 716)
+++
kernel/branches/mc-int-branch/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationContainer.java 2009-11-17
13:01:05 UTC (rev 717)
@@ -76,7 +76,7 @@
}
catch (ClassNotFoundException ignored)
{
- log.warn("@InterceptMC not supported in this environment (component: "
+ componentAdapter.getComponentKey() + ") - necessary classes are missing: ",
ignored);
+ log.warn("@InterceptMC not supported in this environment (component: "
+ componentAdapter.getComponentKey() + ") - necessary classes are missing: " +
ignored);
return false;
}
catch (NoSuchMethodException e)
Modified: kernel/branches/mc-int-branch/exo.kernel.demos/mc-injection/pom.xml
===================================================================
--- kernel/branches/mc-int-branch/exo.kernel.demos/mc-injection/pom.xml 2009-11-17
12:41:22 UTC (rev 716)
+++ kernel/branches/mc-int-branch/exo.kernel.demos/mc-injection/pom.xml 2009-11-17
13:01:05 UTC (rev 717)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel.demos</groupId>
<artifactId>exo.kernel.demos</artifactId>
- <version>2.2.0-Beta03-SNAPSHOT</version>
+ <version>2.2.0-Beta04-SNAPSHOT</version>
</parent>
<artifactId>exo.mc-int.mc-injection</artifactId>
Modified: kernel/branches/mc-int-branch/exo.kernel.demos/pom.xml
===================================================================
--- kernel/branches/mc-int-branch/exo.kernel.demos/pom.xml 2009-11-17 12:41:22 UTC (rev
716)
+++ kernel/branches/mc-int-branch/exo.kernel.demos/pom.xml 2009-11-17 13:01:05 UTC (rev
717)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.0-Beta03-SNAPSHOT</version>
+ <version>2.2.0-Beta04-SNAPSHOT</version>
</parent>
<groupId>org.exoplatform.kernel.demos</groupId>
Modified: kernel/branches/mc-int-branch/org.jboss.mc-kernel-extras/pom.xml
===================================================================
--- kernel/branches/mc-int-branch/org.jboss.mc-kernel-extras/pom.xml 2009-11-17 12:41:22
UTC (rev 716)
+++ kernel/branches/mc-int-branch/org.jboss.mc-kernel-extras/pom.xml 2009-11-17 13:01:05
UTC (rev 717)
@@ -6,11 +6,10 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.0-Beta03-SNAPSHOT</version>
+ <version>2.2.0-Beta04-SNAPSHOT</version>
</parent>
<artifactId>mc-kernel-extras</artifactId>
- <version>2.2.0-Beta03-SNAPSHOT</version>
<name>MC Kernel 2.2.0 Selected Classes</name>
<description>MC integration classes that aren't available in mc-kernel
2.0.6.GA</description>
Modified: kernel/branches/mc-int-branch/packaging/module/pom.xml
===================================================================
--- kernel/branches/mc-int-branch/packaging/module/pom.xml 2009-11-17 12:41:22 UTC (rev
716)
+++ kernel/branches/mc-int-branch/packaging/module/pom.xml 2009-11-17 13:01:05 UTC (rev
717)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.0-Beta03-SNAPSHOT</version>
+ <version>2.2.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: kernel/branches/mc-int-branch/pom.xml
===================================================================
--- kernel/branches/mc-int-branch/pom.xml 2009-11-17 12:41:22 UTC (rev 716)
+++ kernel/branches/mc-int-branch/pom.xml 2009-11-17 13:01:05 UTC (rev 717)
@@ -30,7 +30,7 @@
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.0-Beta03-SNAPSHOT</version>
+ <version>2.2.0-Beta04-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo Kernel</name>