[exo-jcr-commits] exo-jcr SVN: r905 - in kernel/branches/mc-int-branch: exo.kernel.demos/mc-injection/src/main/resources/conf and 1 other directory.

Author: mstruk Date: 2009-11-29 15:16:22 -0500 (Sun, 29 Nov 2009) New Revision: 905 Modified: kernel/branches/mc-int-branch/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationInvoker.java kernel/branches/mc-int-branch/exo.kernel.demos/mc-injection/src/main/resources/conf/mc-int-beans.xml Log: Log warn if mc-int not available + aop conf can't have leading and trailing whitespaces spaces in mc-int-beans.xml Modified: kernel/branches/mc-int-branch/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationInvoker.java =================================================================== --- kernel/branches/mc-int-branch/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationInvoker.java 2009-11-28 21:33:31 UTC (rev 904) +++ kernel/branches/mc-int-branch/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationInvoker.java 2009-11-29 20:16:22 UTC (rev 905) @@ -72,7 +72,7 @@ catch (ClassNotFoundException ignored) { permFailure = true; - log.info("MC integration not available in this environment (missing class: " + log.warn("MC integration not available in this environment (missing class: " + ignored.getMessage() + ")"); return null; Modified: kernel/branches/mc-int-branch/exo.kernel.demos/mc-injection/src/main/resources/conf/mc-int-beans.xml =================================================================== --- kernel/branches/mc-int-branch/exo.kernel.demos/mc-injection/src/main/resources/conf/mc-int-beans.xml 2009-11-28 21:33:31 UTC (rev 904) +++ kernel/branches/mc-int-branch/exo.kernel.demos/mc-injection/src/main/resources/conf/mc-int-beans.xml 2009-11-29 20:16:22 UTC (rev 905) @@ -5,14 +5,10 @@ <annotation&gt;(a)org.exoplatform.container.mc.impl.InterceptMC(enableAOP=true)&lt;/annotation&gt; </bean> <bean name="InjectingBean2"> - <annotation> - @org.exoplatform.container.mc.impl.InterceptMC(injectionMode=org.exoplatform.container.mc.impl.MCInjectionMode.STANDARD) - </annotation> + <annotation&gt;(a)org.exoplatform.container.mc.impl.InterceptMC(injectionMode=org.exoplatform.container.mc.impl.MCInjectionMode.STANDARD)&lt;/annotation&gt; </bean> <bean name="InjectingBean3"> - <annotation> - @org.exoplatform.container.mc.impl.InterceptMC(enableAOP=true,injectionMode=org.exoplatform.container.mc.impl.MCInjectionMode.ALL) - </annotation> + <annotation&gt;(a)org.exoplatform.container.mc.impl.InterceptMC(enableAOP=true,injectionMode=org.exoplatform.container.mc.impl.MCInjectionMode.ALL)&lt;/annotation&gt; </bean> <bean name="InjectingBean4"> <annotation&gt;(a)org.exoplatform.container.mc.impl.InterceptMC(enableAOP=true)&lt;/annotation&gt;