Menu
▾
▴
openutils-svn — developer list with svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
| 2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
| 2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
| 2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
| 2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
| 2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
| 2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
| 2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <luc...@us...> - 2009-03-16 16:16:18
|
Revision: 1102
http://openutils.svn.sourceforge.net/openutils/?rev=1102&view=rev
Author: lucaboati
Date: 2009-03-16 16:15:54 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
dependency version changed into 4.0/* (was 4)
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2009-03-15 15:39:07 UTC (rev 1101)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2009-03-16 16:15:54 UTC (rev 1102)
@@ -10,11 +10,11 @@
<dependencies>
<dependency>
<name>adminInterface</name>
- <version>4</version>
+ <version>4.0/*</version>
</dependency>
<dependency>
<name>cache</name>
- <version>4</version>
+ <version>4.0/*</version>
</dependency>
</dependencies>
<repositories>
Modified: trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml 2009-03-15 15:39:07 UTC (rev 1101)
+++ trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml 2009-03-16 16:15:54 UTC (rev 1102)
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
<name>adminInterface</name>
- <version>4</version>
+ <version>4.0/*</version>
</dependency>
</dependencies>
<repositories>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-15 15:39:09
|
Revision: 1101
http://openutils.svn.sourceforge.net/openutils/?rev=1101&view=rev
Author: fgiust
Date: 2009-03-15 15:39:07 +0000 (Sun, 15 Mar 2009)
Log Message:
-----------
empty dirs
Removed Paths:
-------------
trunk/openutils-deployment/src/main/java/com/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-15 15:38:23
|
Revision: 1099
http://openutils.svn.sourceforge.net/openutils/?rev=1099&view=rev
Author: fgiust
Date: 2009-03-15 15:38:10 +0000 (Sun, 15 Mar 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-deployment-2.1
Added Paths:
-----------
tags/openutils-deployment-2.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-15 15:38:20
|
Revision: 1100
http://openutils.svn.sourceforge.net/openutils/?rev=1100&view=rev
Author: fgiust
Date: 2009-03-15 15:38:18 +0000 (Sun, 15 Mar 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-deployment/pom.xml
Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2009-03-15 15:38:10 UTC (rev 1099)
+++ trunk/openutils-deployment/pom.xml 2009-03-15 15:38:18 UTC (rev 1100)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-deployment</artifactId>
<name>openutils deployment tools</name>
- <version>2.1</version>
+ <version>2.1.1-SNAPSHOT</version>
<description />
<dependencies>
<dependency>
@@ -83,10 +83,4 @@
<properties>
<spring.version>2.5.6</spring.version>
</properties>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-2.1</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-2.1</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-2.1</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-15 15:37:50
|
Revision: 1098
http://openutils.svn.sourceforge.net/openutils/?rev=1098&view=rev
Author: fgiust
Date: 2009-03-15 15:37:41 +0000 (Sun, 15 Mar 2009)
Log Message:
-----------
removed dummy test
Removed Paths:
-------------
trunk/openutils-deployment/src/test/java/it/openutils/log4j/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-15 15:37:01
|
Revision: 1097
http://openutils.svn.sourceforge.net/openutils/?rev=1097&view=rev
Author: fgiust
Date: 2009-03-15 15:36:46 +0000 (Sun, 15 Mar 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-deployment-2.1
Modified Paths:
--------------
trunk/openutils-deployment/pom.xml
Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2009-03-15 15:35:47 UTC (rev 1096)
+++ trunk/openutils-deployment/pom.xml 2009-03-15 15:36:46 UTC (rev 1097)
@@ -1,5 +1,4 @@
-<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">
+<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>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -9,7 +8,7 @@
</parent>
<artifactId>openutils-deployment</artifactId>
<name>openutils deployment tools</name>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.1</version>
<description />
<dependencies>
<dependency>
@@ -84,4 +83,10 @@
<properties>
<spring.version>2.5.6</spring.version>
</properties>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-2.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-2.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-2.1</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-15 15:35:54
|
Revision: 1096
http://openutils.svn.sourceforge.net/openutils/?rev=1096&view=rev
Author: fgiust
Date: 2009-03-15 15:35:47 +0000 (Sun, 15 Mar 2009)
Log Message:
-----------
renamed to avoid conflict with the standard pattern for surefire tests
Modified Paths:
--------------
trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/PropertyInjectBeanPostProcessorTest.java
Added Paths:
-----------
trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/SampleBean.java
Removed Paths:
-------------
trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/TestBean.java
Modified: trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/PropertyInjectBeanPostProcessorTest.java
===================================================================
--- trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/PropertyInjectBeanPostProcessorTest.java 2009-03-15 15:34:35 UTC (rev 1095)
+++ trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/PropertyInjectBeanPostProcessorTest.java 2009-03-15 15:35:47 UTC (rev 1096)
@@ -32,7 +32,7 @@
{
@Autowired(required = true)
- private TestBean testBean;
+ private SampleBean testBean;
@Test
public void testIntProperty()
Copied: trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/SampleBean.java (from rev 1095, trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/TestBean.java)
===================================================================
--- trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/SampleBean.java (rev 0)
+++ trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/SampleBean.java 2009-03-15 15:35:47 UTC (rev 1096)
@@ -0,0 +1,52 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed 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.
+ */
+package it.openutils.deployment.spring;
+
+import org.springframework.stereotype.Component;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+@Component
+public class SampleBean
+{
+
+ @Property("intProperty")
+ private Integer intProperty;
+
+ @Property("stringProperty")
+ private String stringProperty;
+
+ /**
+ * Returns the intProperty.
+ * @return the intProperty
+ */
+ public Integer getIntProperty()
+ {
+ return intProperty;
+ }
+
+ /**
+ * Returns the stringProperty.
+ * @return the stringProperty
+ */
+ public String getStringProperty()
+ {
+ return stringProperty;
+ }
+}
Property changes on: trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/SampleBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:mergeinfo
+
Added: svn:eol-style
+ native
Deleted: trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/TestBean.java
===================================================================
--- trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/TestBean.java 2009-03-15 15:34:35 UTC (rev 1095)
+++ trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/TestBean.java 2009-03-15 15:35:47 UTC (rev 1096)
@@ -1,52 +0,0 @@
-/*
- * Copyright Openmind http://www.openmindonline.it
- *
- * Licensed 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.
- */
-package it.openutils.deployment.spring;
-
-import org.springframework.stereotype.Component;
-
-
-/**
- * @author fgiust
- * @version $Id$
- */
-@Component
-public class TestBean
-{
-
- @Property("intProperty")
- private Integer intProperty;
-
- @Property("stringProperty")
- private String stringProperty;
-
- /**
- * Returns the intProperty.
- * @return the intProperty
- */
- public Integer getIntProperty()
- {
- return intProperty;
- }
-
- /**
- * Returns the stringProperty.
- * @return the stringProperty
- */
- public String getStringProperty()
- {
- return stringProperty;
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-15 15:34:45
|
Revision: 1095
http://openutils.svn.sourceforge.net/openutils/?rev=1095&view=rev
Author: fgiust
Date: 2009-03-15 15:34:35 +0000 (Sun, 15 Mar 2009)
Log Message:
-----------
added processing of annotations
Modified Paths:
--------------
trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java
trunk/openutils-deployment/src/site/changes/changes.xml
Added Paths:
-----------
trunk/openutils-deployment/src/main/java/com/
trunk/openutils-deployment/src/main/java/com/sinapsi/
trunk/openutils-deployment/src/main/java/com/sinapsi/spikes/
trunk/openutils-deployment/src/main/java/com/sinapsi/spikes/ecom/
trunk/openutils-deployment/src/main/java/com/sinapsi/spikes/ecom/utils/
trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/Property.java
trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/PropertyAnnotationsUtils.java
trunk/openutils-deployment/src/test/java/it/openutils/deployment/
trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/
trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/PropertyInjectBeanPostProcessorTest.java
trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/TestBean.java
trunk/openutils-deployment/src/test/resources/
trunk/openutils-deployment/src/test/resources/environment.properties
trunk/openutils-deployment/src/test/resources/log4j.dtd
trunk/openutils-deployment/src/test/resources/log4j.xml
trunk/openutils-deployment/src/test/resources/spring-tests.xml
Modified: trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java
===================================================================
--- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2009-03-15 15:30:30 UTC (rev 1094)
+++ trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2009-03-15 15:34:35 UTC (rev 1095)
@@ -15,8 +15,10 @@
*/
package it.openutils.deployment.spring;
+import java.beans.PropertyDescriptor;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Constructor;
import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.URL;
@@ -30,8 +32,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
+import org.springframework.beans.PropertyValues;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
+import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.core.io.Resource;
@@ -44,7 +48,10 @@
* @author fgiust
* @version $Id: $
*/
-public class EnvironmentPropertyConfigurer extends PropertyPlaceholderConfigurer implements ApplicationContextAware
+public class EnvironmentPropertyConfigurer extends PropertyPlaceholderConfigurer
+ implements
+ ApplicationContextAware,
+ SmartInstantiationAwareBeanPostProcessor
{
/**
@@ -336,4 +343,47 @@
// ignore, we are not in a web project or spring web is not available
}
}
+
+ public boolean postProcessAfterInstantiation(Object bean, String beanName) throws BeansException
+ {
+ PropertyAnnotationsUtils.autowireProperties(bean, properties);
+ return true;
+ }
+
+ public Class predictBeanType(Class beanClass, String beanName)
+ {
+ return null;
+ }
+
+ public Constructor[] determineCandidateConstructors(Class beanClass, String beanName) throws BeansException
+ {
+ return null;
+ }
+
+ public Object getEarlyBeanReference(Object bean, String beanName) throws BeansException
+ {
+ return bean;
+ }
+
+ public Object postProcessBeforeInstantiation(Class beanClass, String beanName) throws BeansException
+ {
+ return null;
+ }
+
+ public PropertyValues postProcessPropertyValues(PropertyValues pvs, PropertyDescriptor[] pds, Object bean,
+ String beanName) throws BeansException
+ {
+
+ return pvs;
+ }
+
+ public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException
+ {
+ return bean;
+ }
+
+ public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException
+ {
+ return bean;
+ }
}
Added: trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/Property.java
===================================================================
--- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/Property.java (rev 0)
+++ trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/Property.java 2009-03-15 15:34:35 UTC (rev 1095)
@@ -0,0 +1,38 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed 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.
+ */
+package it.openutils.deployment.spring;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+/**
+ * Autowire a property value in a field.
+ * @author fgiust
+ * @version $Id$
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface Property {
+
+ /**
+ * The property key
+ * @return The property key
+ */
+ String value();
+}
\ No newline at end of file
Property changes on: trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/Property.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/PropertyAnnotationsUtils.java
===================================================================
--- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/PropertyAnnotationsUtils.java (rev 0)
+++ trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/PropertyAnnotationsUtils.java 2009-03-15 15:34:35 UTC (rev 1095)
@@ -0,0 +1,69 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed 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.
+ */
+package it.openutils.deployment.spring;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.Properties;
+
+import org.springframework.beans.SimpleTypeConverter;
+import org.springframework.util.ReflectionUtils;
+
+
+/**
+ * Utility class for doing property replacement in fields.
+ * @author fgiust
+ * @version $Id$
+ */
+public final class PropertyAnnotationsUtils
+{
+
+ private static SimpleTypeConverter typeConverter = new SimpleTypeConverter();
+
+ private PropertyAnnotationsUtils()
+ {
+ // don't instantiate
+ }
+
+ public static void autowireProperties(final Object bean, final Properties properties)
+ {
+ ReflectionUtils.doWithFields(bean.getClass(), new ReflectionUtils.FieldCallback()
+ {
+
+ public void doWith(Field field) throws IllegalArgumentException, IllegalAccessException
+ {
+ Property annotation = field.getAnnotation(Property.class);
+ if (annotation != null)
+ {
+ if (Modifier.isStatic(field.getModifiers()))
+ {
+ throw new IllegalStateException(
+ "PropertyAutowired annotation is not supported on static fields");
+ }
+
+ Object strValue = properties.get(annotation.value());
+
+ if (strValue != null)
+ {
+ Object value = typeConverter.convertIfNecessary(strValue, field.getType());
+ ReflectionUtils.makeAccessible(field);
+ field.set(bean, value);
+ }
+ }
+ }
+ });
+ }
+}
Property changes on: trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/PropertyAnnotationsUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-deployment/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-deployment/src/site/changes/changes.xml 2009-03-15 15:30:30 UTC (rev 1094)
+++ trunk/openutils-deployment/src/site/changes/changes.xml 2009-03-15 15:34:35 UTC (rev 1095)
@@ -8,6 +8,10 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
+ <release version="2.1" date="2009-03-15" description="">
+ <action type="add" dev="fgiust">EnvironmentPropertyConfigurer now also inject properties in fields annotated with
+ the @Property annotation.</action>
+ </release>
<release version="2.0.2" date="2008-09-18" description="">
<action type="fix" dev="fgiust"> Added debug logs to DeploymentResolver, and solved resolution of webapp root when
the root real path returned by the container ends with "/".</action>
Added: trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/PropertyInjectBeanPostProcessorTest.java
===================================================================
--- trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/PropertyInjectBeanPostProcessorTest.java (rev 0)
+++ trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/PropertyInjectBeanPostProcessorTest.java 2009-03-15 15:34:35 UTC (rev 1095)
@@ -0,0 +1,48 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed 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.
+ */
+package it.openutils.deployment.spring;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+@ContextConfiguration(locations = {"/spring-tests.xml" })
+public class PropertyInjectBeanPostProcessorTest extends AbstractJUnit4SpringContextTests
+{
+
+ @Autowired(required = true)
+ private TestBean testBean;
+
+ @Test
+ public void testIntProperty()
+ {
+ Assert.assertEquals(new Integer(2), testBean.getIntProperty());
+ }
+
+ @Test
+ public void testStringProperty()
+ {
+ Assert.assertEquals("property", testBean.getStringProperty());
+ }
+}
Property changes on: trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/PropertyInjectBeanPostProcessorTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/TestBean.java
===================================================================
--- trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/TestBean.java (rev 0)
+++ trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/TestBean.java 2009-03-15 15:34:35 UTC (rev 1095)
@@ -0,0 +1,52 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed 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.
+ */
+package it.openutils.deployment.spring;
+
+import org.springframework.stereotype.Component;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+@Component
+public class TestBean
+{
+
+ @Property("intProperty")
+ private Integer intProperty;
+
+ @Property("stringProperty")
+ private String stringProperty;
+
+ /**
+ * Returns the intProperty.
+ * @return the intProperty
+ */
+ public Integer getIntProperty()
+ {
+ return intProperty;
+ }
+
+ /**
+ * Returns the stringProperty.
+ * @return the stringProperty
+ */
+ public String getStringProperty()
+ {
+ return stringProperty;
+ }
+}
Property changes on: trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/TestBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-deployment/src/test/resources/environment.properties
===================================================================
--- trunk/openutils-deployment/src/test/resources/environment.properties (rev 0)
+++ trunk/openutils-deployment/src/test/resources/environment.properties 2009-03-15 15:34:35 UTC (rev 1095)
@@ -0,0 +1,2 @@
+intProperty=2
+stringProperty=property
Property changes on: trunk/openutils-deployment/src/test/resources/environment.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-deployment/src/test/resources/log4j.dtd
===================================================================
--- trunk/openutils-deployment/src/test/resources/log4j.dtd (rev 0)
+++ trunk/openutils-deployment/src/test/resources/log4j.dtd 2009-03-15 15:34:35 UTC (rev 1095)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- Authors: Chris Taylor, Ceki Gulcu. -->
+
+<!-- Version: 1.2 -->
+
+<!-- A configuration element consists of optional renderer
+elements,appender elements, categories and an optional root
+element. -->
+
+<!ELEMENT log4j:configuration (renderer*, appender*,(category|logger)*,root?,
+ categoryFactory?)>
+
+<!-- The "threshold" attribute takes a level value such that all -->
+<!-- logging statements with a level equal or below this value are -->
+<!-- disabled. -->
+
+<!-- Setting the "debug" enable the printing of internal log4j logging -->
+<!-- statements. -->
+
+<!-- By default, debug attribute is "null", meaning that we not do touch -->
+<!-- internal log4j logging settings. The "null" value for the threshold -->
+<!-- attribute can be misleading. The threshold field of a repository -->
+<!-- cannot be set to null. The "null" value for the threshold attribute -->
+<!-- simply means don't touch the threshold field, the threshold field -->
+<!-- keeps its old value. -->
+
+<!ATTLIST log4j:configuration
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"
+ threshold (all|debug|info|warn|error|fatal|off|null) "null"
+ debug (true|false|null) "null"
+>
+
+<!-- renderer elements allow the user to customize the conversion of -->
+<!-- message objects to String. -->
+
+<!ELEMENT renderer EMPTY>
+<!ATTLIST renderer
+ renderedClass CDATA #REQUIRED
+ renderingClass CDATA #REQUIRED
+>
+
+<!-- Appenders must have a name and a class. -->
+<!-- Appenders may contain an error handler, a layout, optional parameters -->
+<!-- and filters. They may also reference (or include) other appenders. -->
+<!ELEMENT appender (errorHandler?, param*, layout?, filter*, appender-ref*)>
+<!ATTLIST appender
+ name ID #REQUIRED
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT layout (param*)>
+<!ATTLIST layout
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT filter (param*)>
+<!ATTLIST filter
+ class CDATA #REQUIRED
+>
+
+<!-- ErrorHandlers can be of any class. They can admit any number of -->
+<!-- parameters. -->
+
+<!ELEMENT errorHandler (param*, root-ref?, logger-ref*, appender-ref?)>
+<!ATTLIST errorHandler
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT root-ref EMPTY>
+
+<!ELEMENT logger-ref EMPTY>
+<!ATTLIST logger-ref
+ ref IDREF #REQUIRED
+>
+
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+ name CDATA #REQUIRED
+ value CDATA #REQUIRED
+>
+
+
+<!-- The priority class is org.apache.log4j.Level by default -->
+<!ELEMENT priority (param*)>
+<!ATTLIST priority
+ class CDATA #IMPLIED
+ value CDATA #REQUIRED
+>
+
+<!-- The level class is org.apache.log4j.Level by default -->
+<!ELEMENT level (param*)>
+<!ATTLIST level
+ class CDATA #IMPLIED
+ value CDATA #REQUIRED
+>
+
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named category. -->
+<!ELEMENT category (param*,(priority|level)?,appender-ref*)>
+<!ATTLIST category
+ class CDATA #IMPLIED
+ name CDATA #REQUIRED
+ additivity (true|false) "true"
+>
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named logger. -->
+<!ELEMENT logger (level?,appender-ref*)>
+<!ATTLIST logger
+ name ID #REQUIRED
+ additivity (true|false) "true"
+>
+
+
+<!ELEMENT categoryFactory (param*)>
+<!ATTLIST categoryFactory
+ class CDATA #REQUIRED>
+
+<!ELEMENT appender-ref EMPTY>
+<!ATTLIST appender-ref
+ ref IDREF #REQUIRED
+>
+
+<!-- If no priority element is specified, then the configurator MUST not -->
+<!-- touch the priority of root. -->
+<!-- The root category always exists and cannot be subclassed. -->
+<!ELEMENT root (param*, (priority|level)?, appender-ref*)>
+
+
+<!-- ==================================================================== -->
+<!-- A logging event -->
+<!-- ==================================================================== -->
+<!ELEMENT log4j:eventSet (log4j:event*)>
+<!ATTLIST log4j:eventSet
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"
+ version (1.1|1.2) "1.2"
+ includesLocationInfo (true|false) "true"
+>
+
+
+
+<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?,
+ log4j:locationInfo?) >
+
+<!-- The timestamp format is application dependent. -->
+<!ATTLIST log4j:event
+ logger CDATA #REQUIRED
+ level CDATA #REQUIRED
+ thread CDATA #REQUIRED
+ timestamp CDATA #REQUIRED
+>
+
+<!ELEMENT log4j:message (#PCDATA)>
+<!ELEMENT log4j:NDC (#PCDATA)>
+
+<!ELEMENT log4j:throwable (#PCDATA)>
+
+<!ELEMENT log4j:locationInfo EMPTY>
+<!ATTLIST log4j:locationInfo
+ class CDATA #REQUIRED
+ method CDATA #REQUIRED
+ file CDATA #REQUIRED
+ line CDATA #REQUIRED
+>
Property changes on: trunk/openutils-deployment/src/test/resources/log4j.dtd
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:eol-style
+ native
Added: trunk/openutils-deployment/src/test/resources/log4j.xml
===================================================================
--- trunk/openutils-deployment/src/test/resources/log4j.xml (rev 0)
+++ trunk/openutils-deployment/src/test/resources/log4j.xml 2009-03-15 15:34:35 UTC (rev 1095)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration>
+ <!-- log4j test configuration -->
+ <appender name="test-appender" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-5p %c.%M(%C{1}.java:%L) %m%n" />
+ </layout>
+ </appender>
+ <category name="org">
+ <priority value="WARN" />
+ </category>
+ <category name="com">
+ <priority value="WARN" />
+ </category>
+ <category name="net">
+ <priority value="WARN" />
+ </category>
+ <category name="info">
+ <priority value="WARN" />
+ </category>
+ <category name="it">
+ <priority value="WARN" />
+ </category>
+ <root>
+ <priority value="debug" />
+ <appender-ref ref="test-appender" />
+ </root>
+</log4j:configuration>
\ No newline at end of file
Property changes on: trunk/openutils-deployment/src/test/resources/log4j.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-deployment/src/test/resources/spring-tests.xml
===================================================================
--- trunk/openutils-deployment/src/test/resources/spring-tests.xml (rev 0)
+++ trunk/openutils-deployment/src/test/resources/spring-tests.xml 2009-03-15 15:34:35 UTC (rev 1095)
@@ -0,0 +1,13 @@
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+ <bean id="environmentProperties" class="it.openutils.deployment.spring.EnvironmentPropertyConfigurer">
+ <property name="fileLocation" value="classpath:environment.properties" />
+ <property name="ignoreUnresolvablePlaceholders" value="true" />
+ </bean>
+ <context:annotation-config />
+ <context:component-scan base-package="it.openutils.deployment.spring" />
+</beans>
\ No newline at end of file
Property changes on: trunk/openutils-deployment/src/test/resources/spring-tests.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-15 15:31:12
|
Revision: 1094
http://openutils.svn.sourceforge.net/openutils/?rev=1094&view=rev
Author: fgiust
Date: 2009-03-15 15:30:30 +0000 (Sun, 15 Mar 2009)
Log Message:
-----------
junit version aligned to 4.4
Modified Paths:
--------------
trunk/openutils-backup/pom.xml
trunk/openutils-deployment/pom.xml
trunk/openutils-log4j/pom.xml
trunk/openutils-spring/pom.xml
trunk/openutils-tags-spring/pom.xml
trunk/openutils-web/pom.xml
Modified: trunk/openutils-backup/pom.xml
===================================================================
--- trunk/openutils-backup/pom.xml 2009-03-14 17:58:38 UTC (rev 1093)
+++ trunk/openutils-backup/pom.xml 2009-03-15 15:30:30 UTC (rev 1094)
@@ -25,7 +25,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.0</version>
+ <version>4.4</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2009-03-14 17:58:38 UTC (rev 1093)
+++ trunk/openutils-deployment/pom.xml 2009-03-15 15:30:30 UTC (rev 1094)
@@ -1,4 +1,5 @@
-<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">
+<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>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -58,9 +59,25 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.0</version>
+ <version>4.4</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml 2009-03-14 17:58:38 UTC (rev 1093)
+++ trunk/openutils-log4j/pom.xml 2009-03-15 15:30:30 UTC (rev 1094)
@@ -68,7 +68,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.0</version>
+ <version>4.4<version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2009-03-14 17:58:38 UTC (rev 1093)
+++ trunk/openutils-spring/pom.xml 2009-03-15 15:30:30 UTC (rev 1094)
@@ -131,7 +131,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.4</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: trunk/openutils-tags-spring/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml 2009-03-14 17:58:38 UTC (rev 1093)
+++ trunk/openutils-tags-spring/pom.xml 2009-03-15 15:30:30 UTC (rev 1094)
@@ -87,7 +87,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.0</version>
+ <version>4.4</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: trunk/openutils-web/pom.xml
===================================================================
--- trunk/openutils-web/pom.xml 2009-03-14 17:58:38 UTC (rev 1093)
+++ trunk/openutils-web/pom.xml 2009-03-15 15:30:30 UTC (rev 1094)
@@ -37,7 +37,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.0</version>
+ <version>4.4</version>
<scope>test</scope>
</dependency>
</dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2009-03-14 17:58:44
|
Revision: 1093
http://openutils.svn.sourceforge.net/openutils/?rev=1093&view=rev
Author: lucaboati
Date: 2009-03-14 17:58:38 +0000 (Sat, 14 Mar 2009)
Log Message:
-----------
fixed to support magnolia 4.0
Modified Paths:
--------------
trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapAtomicFilter.java
trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/AbstractBootstrapSyncListener.java
trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/BootstrapSyncListener.java
Modified: trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapAtomicFilter.java
===================================================================
--- trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapAtomicFilter.java 2009-03-12 12:38:45 UTC (rev 1092)
+++ trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapAtomicFilter.java 2009-03-14 17:58:38 UTC (rev 1093)
@@ -1,7 +1,8 @@
package it.openutils.mgnlbootstrapsync;
-import info.magnolia.cms.core.ie.filters.VersionFilter;
+import info.magnolia.importexport.filters.VersionFilter;
+
import org.apache.commons.lang.ArrayUtils;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
Modified: trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/AbstractBootstrapSyncListener.java
===================================================================
--- trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/AbstractBootstrapSyncListener.java 2009-03-12 12:38:45 UTC (rev 1092)
+++ trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/AbstractBootstrapSyncListener.java 2009-03-14 17:58:38 UTC (rev 1093)
@@ -4,10 +4,10 @@
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.core.ie.DataTransporter;
-import info.magnolia.cms.core.ie.filters.VersionFilter;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.importexport.filters.VersionFilter;
import it.openutils.mgnlbootstrapsync.BootstrapAtomicFilter;
import it.openutils.mgnlbootstrapsync.watch.BootstrapSyncRepositoryWatch;
@@ -17,7 +17,6 @@
import java.io.IOException;
import java.io.OutputStream;
import java.util.Collection;
-import java.util.Iterator;
import java.util.zip.DeflaterOutputStream;
import javax.jcr.PathNotFoundException;
Modified: trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/BootstrapSyncListener.java
===================================================================
--- trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/BootstrapSyncListener.java 2009-03-12 12:38:45 UTC (rev 1092)
+++ trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/BootstrapSyncListener.java 2009-03-14 17:58:38 UTC (rev 1093)
@@ -1,6 +1,8 @@
package it.openutils.mgnlbootstrapsync.listener;
import info.magnolia.cms.beans.config.ConfigLoader;
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.security.AccessDeniedException;
import it.openutils.mgnlbootstrapsync.watch.BootstrapSyncRepositoryWatch;
import java.util.ArrayList;
@@ -63,11 +65,29 @@
@Override
public void onEvent(EventIterator events)
{
- if (!ConfigLoader.isConfigured() || ConfigLoader.isBootstrapping())
+
+ //@todo Do we need it yet?
+ try
{
+ if (!ContentRepository.checkIfInitialized())
+ {
+ return;
+ }
+ }
+ catch (AccessDeniedException e)
+ {
return;
}
-
+ catch (RepositoryException e)
+ {
+ return;
+ }
+
+ // if (!ConfigLoader.isConfigured() || ConfigLoader.isBootstrapping())
+ // {
+ // return;
+ // }
+
List<JcrOperation> operations = new ArrayList<JcrOperation>();
while (events.hasNext())
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 1092
http://openutils.svn.sourceforge.net/openutils/?rev=1092&view=rev
Author: fgrilli
Date: 2009-03-12 12:38:45 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
ok, forgot to pass HierarchyManager to new DefaultContent constructor
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java 2009-03-12 12:35:33 UTC (rev 1091)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java 2009-03-12 12:38:45 UTC (rev 1092)
@@ -195,12 +195,15 @@
private javax.jcr.query.QueryResult result;
private AccessManager accessManager;
+
+ private HierarchyManager hm;
private Map<String, String> dirtyHandles = new Hashtable<String, String>();
protected QueryResultImpl(javax.jcr.query.QueryResult result, HierarchyManager hm)
{
this.result = result;
+ this.hm = hm;
this.accessManager = hm.getAccessManager();
}
@@ -259,7 +262,7 @@
Permission.READ);
if (isAllowed)
{
- collection.add(new DefaultContent(node, null));
+ collection.add(new DefaultContent(node, this.hm));
this.dirtyHandles.put(node.getPath(), StringUtils.EMPTY);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 1091
http://openutils.svn.sourceforge.net/openutils/?rev=1091&view=rev
Author: fgrilli
Date: 2009-03-12 12:35:33 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
fixed compilation problem after updating to magnolia 4.0. Now gets AccessManager through HieararchyManager.
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java 2009-03-12 12:03:03 UTC (rev 1090)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java 2009-03-12 12:35:33 UTC (rev 1091)
@@ -2,6 +2,7 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.DefaultContent;
+import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.core.search.Query;
@@ -40,7 +41,7 @@
public class MagnoliaCriteriaWithLimitImpl extends AbstractMagnoliaCriteriaImpl
{
- private static final String ACCESS_MANAGER = "accessManager";
+ private static final String HIERARCHY_MANAGER = "hm";
private static final String QUERY_MANAGER = "queryManager";
@@ -109,15 +110,13 @@
log.debug("Query executed in {} milliseconds", stop - start);
Collection retVal = new ArrayList();
- field = managerClass.getDeclaredField(ACCESS_MANAGER);
+ field = managerClass.getDeclaredField(HIERARCHY_MANAGER);
field.setAccessible(true);
- info.magnolia.cms.security.AccessManager accessManager = (info.magnolia.cms.security.AccessManager) field
- .get(queryManager);
+ HierarchyManager hm = (HierarchyManager) field.get(queryManager);
log.debug("getting content...");
start = System.currentTimeMillis();
-
- QueryResultImpl filteredResult = new QueryResultImpl(result, accessManager);
+ QueryResultImpl filteredResult = new QueryResultImpl(result, hm);
retVal = filteredResult.getContent(itemType);
stop = System.currentTimeMillis();
@@ -199,10 +198,10 @@
private Map<String, String> dirtyHandles = new Hashtable<String, String>();
- protected QueryResultImpl(javax.jcr.query.QueryResult result, AccessManager accessManager)
+ protected QueryResultImpl(javax.jcr.query.QueryResult result, HierarchyManager hm)
{
this.result = result;
- this.accessManager = accessManager;
+ this.accessManager = hm.getAccessManager();
}
public AccessManager getAccessManager()
@@ -260,7 +259,7 @@
Permission.READ);
if (isAllowed)
{
- collection.add(new DefaultContent(node, this.accessManager));
+ collection.add(new DefaultContent(node, null));
this.dirtyHandles.put(node.getPath(), StringUtils.EMPTY);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-12 12:03:20
|
Revision: 1090
http://openutils.svn.sourceforge.net/openutils/?rev=1090&view=rev
Author: fgiust
Date: 2009-03-12 12:03:03 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnltasks/pom.xml
Modified: trunk/openutils-mgnltasks/pom.xml
===================================================================
--- trunk/openutils-mgnltasks/pom.xml 2009-03-12 12:02:56 UTC (rev 1089)
+++ trunk/openutils-mgnltasks/pom.xml 2009-03-12 12:03:03 UTC (rev 1090)
@@ -10,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnltasks</artifactId>
<name>openutils-mgnltasks</name>
- <version>4.0</version>
+ <version>4.0.1-SNAPSHOT</version>
<description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
<licenses>
<license>
@@ -98,10 +98,4 @@
</snapshots>
</repository>
</repositories>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.0</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.0</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnltasks-4.0</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-12 12:03:16
|
Revision: 1088
http://openutils.svn.sourceforge.net/openutils/?rev=1088&view=rev
Author: fgiust
Date: 2009-03-12 12:02:40 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnltasks-4.0
Modified Paths:
--------------
trunk/openutils-mgnltasks/pom.xml
Modified: trunk/openutils-mgnltasks/pom.xml
===================================================================
--- trunk/openutils-mgnltasks/pom.xml 2009-03-12 12:00:53 UTC (rev 1087)
+++ trunk/openutils-mgnltasks/pom.xml 2009-03-12 12:02:40 UTC (rev 1088)
@@ -1,6 +1,5 @@
<?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">
+<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">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
@@ -11,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnltasks</artifactId>
<name>openutils-mgnltasks</name>
- <version>3.5.6-SNAPSHOT</version>
+ <version>4.0</version>
<description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
<licenses>
<license>
@@ -99,4 +98,10 @@
</snapshots>
</repository>
</repositories>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.0</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.0</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnltasks-4.0</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-12 12:03:04
|
Revision: 1089
http://openutils.svn.sourceforge.net/openutils/?rev=1089&view=rev
Author: fgiust
Date: 2009-03-12 12:02:56 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnltasks-4.0
Added Paths:
-----------
tags/openutils-mgnltasks-4.0/
tags/openutils-mgnltasks-4.0/pom.xml
Removed Paths:
-------------
tags/openutils-mgnltasks-4.0/pom.xml
Deleted: tags/openutils-mgnltasks-4.0/pom.xml
===================================================================
--- trunk/openutils-mgnltasks/pom.xml 2009-03-12 12:00:53 UTC (rev 1087)
+++ tags/openutils-mgnltasks-4.0/pom.xml 2009-03-12 12:02:56 UTC (rev 1089)
@@ -1,102 +0,0 @@
-<?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">
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>11</version>
- <relativePath>..</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
- <artifactId>openutils-mgnltasks</artifactId>
- <name>openutils-mgnltasks</name>
- <version>3.5.6-SNAPSHOT</version>
- <description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
- <licenses>
- <license>
- <name>GPLv3</name>
- <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
- </license>
- </licenses>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>META-INF/magnolia/*</include>
- </includes>
- </resource>
- </resources>
- </build>
- <dependencies>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-core</artifactId>
- <version>4.0</version>
- <exclusions>
- <exclusion>
- <groupId>servlets.com</groupId>
- <artifactId>cos</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0</version>
- <exclusions>
- <exclusion>
- <groupId>servlets.com</groupId>
- <artifactId>cos</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.7</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <repositories>
- <repository>
- <id>repository.magnolia-cms.com</id>
- <name>magnolia repository</name>
- <url>http://repository.magnolia-cms.com/m2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-</project>
\ No newline at end of file
Copied: tags/openutils-mgnltasks-4.0/pom.xml (from rev 1088, trunk/openutils-mgnltasks/pom.xml)
===================================================================
--- tags/openutils-mgnltasks-4.0/pom.xml (rev 0)
+++ tags/openutils-mgnltasks-4.0/pom.xml 2009-03-12 12:02:56 UTC (rev 1089)
@@ -0,0 +1,107 @@
+<?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">
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>11</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
+ <artifactId>openutils-mgnltasks</artifactId>
+ <name>openutils-mgnltasks</name>
+ <version>4.0</version>
+ <description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
+ </license>
+ </licenses>
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>META-INF/magnolia/*</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-core</artifactId>
+ <version>4.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>servlets.com</groupId>
+ <artifactId>cos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-admininterface</artifactId>
+ <version>4.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>servlets.com</groupId>
+ <artifactId>cos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <version>5.7</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>repository.magnolia-cms.com</id>
+ <name>magnolia repository</name>
+ <url>http://repository.magnolia-cms.com/m2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.0</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.0</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnltasks-4.0</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-12 12:01:13
|
Revision: 1087
http://openutils.svn.sourceforge.net/openutils/?rev=1087&view=rev
Author: fgiust
Date: 2009-03-12 12:00:53 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
ready for a release
Modified Paths:
--------------
trunk/openutils-mgnltasks/pom.xml
trunk/openutils-mgnltasks/src/site/apt/index.apt
trunk/openutils-mgnltasks/src/site/changes/changes.xml
Modified: trunk/openutils-mgnltasks/pom.xml
===================================================================
--- trunk/openutils-mgnltasks/pom.xml 2009-03-12 11:55:29 UTC (rev 1086)
+++ trunk/openutils-mgnltasks/pom.xml 2009-03-12 12:00:53 UTC (rev 1087)
@@ -1,5 +1,6 @@
<?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">
+<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">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
@@ -87,9 +88,9 @@
</dependencies>
<repositories>
<repository>
- <id>repository.magnolia.info</id>
+ <id>repository.magnolia-cms.com</id>
<name>magnolia repository</name>
- <url>http://repo.magnolia.info/m2</url>
+ <url>http://repository.magnolia-cms.com/m2</url>
<releases>
<enabled>true</enabled>
</releases>
Modified: trunk/openutils-mgnltasks/src/site/apt/index.apt
===================================================================
--- trunk/openutils-mgnltasks/src/site/apt/index.apt 2009-03-12 11:55:29 UTC (rev 1086)
+++ trunk/openutils-mgnltasks/src/site/apt/index.apt 2009-03-12 12:00:53 UTC (rev 1087)
@@ -19,3 +19,4 @@
{{{http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-mgnltasks}http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-mgnltasks}}
+ 3.5.x versions are compatible with magnolia 3.5.x and 3.6.x. 4.x versions requires magnolia 4.0.
\ No newline at end of file
Modified: trunk/openutils-mgnltasks/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnltasks/src/site/changes/changes.xml 2009-03-12 11:55:29 UTC (rev 1086)
+++ trunk/openutils-mgnltasks/src/site/changes/changes.xml 2009-03-12 12:00:53 UTC (rev 1087)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!--
+ <!--
"type" attribute can be: add, remove, update or fix.
-->
<document>
@@ -8,21 +8,29 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
+ <release version="4.0" date="2009-03-12" description="">
+ <action type="update" dev="fgiust">Updated to magnolia 4.0. This release will not work correctly with previous
+ versions. Please note that previous 3.x releases don't fully work with magnolia 4.0 either.</action>
+ <action type="add" dev="fgiust">new tasks: ConditionalTask, ExistenceConditionalBootstrapTask</action>
+ </release>
<release version="3.5.5" date="2008-07-27" description="">
<action type="add" dev="fgiust">new tasks: AddPermissionTask, CreateDefaultRepositoryAclForAllUsersTask</action>
</release>
+ <release version="3.5.5" date="2008-07-27" description="">
+ <action type="add" dev="fgiust">new tasks: AddPermissionTask, CreateDefaultRepositoryAclForAllUsersTask</action>
+ </release>
<release version="3.5.4" date="2008-07-24" description="">
<action type="add" dev="fgiust">new tasks: CheckMissingTemplatesTask, CheckMissingParagraphsTask,
ReplaceTemplateTask</action>
</release>
<release version="3.5.3" date="2008-06-24" description="">
<action type="add" dev="fgiust">new CheckAndCreateRoleTask and CheckAndCreateGroupTask</action>
- <action type="update" dev="fgiust">AnonymousUserSetupTask now also takes care of changing
- permissions on URIs</action>
+ <action type="update" dev="fgiust">AnonymousUserSetupTask now also takes care of changing permissions on URIs
+ </action>
</release>
<release version="3.5.2" date="2008-06-08" description="">
- <action type="add" dev="fgiust">Added [modulename].update.disabled property in SimpleModuleVersionHandler that
- can be set to true in order to disable module configuration updates</action>
+ <action type="add" dev="fgiust">Added [modulename].update.disabled property in SimpleModuleVersionHandler that can
+ be set to true in order to disable module configuration updates</action>
<action type="add" dev="fgiust">Added it.openutils.mgnltasks.DisableSubscribersTask</action>
</release>
<release version="3.5.1" date="2008-04-28" description="3.5.1">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-12 11:55:37
|
Revision: 1086
http://openutils.svn.sourceforge.net/openutils/?rev=1086&view=rev
Author: fgiust
Date: 2009-03-12 11:55:29 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
javadocs
Modified Paths:
--------------
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java 2009-03-12 11:45:54 UTC (rev 1085)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java 2009-03-12 11:55:29 UTC (rev 1086)
@@ -30,19 +30,30 @@
/**
+ * Base abstract task that executes a list of other tasks only if a specific node/nodedata doesn't already exists in the
+ * repository. Subclasses must implement the <code>verifyCondition</code> method.
* @author molaschi
* @version $Id$
*/
public abstract class ConditionalTask extends AbstractTask
{
+ /**
+ * Workspace to check.
+ */
protected String workspace;
- protected List<Task> tasks;
-
+ /**
+ * Handle to check.
+ */
protected String handle;
/**
+ * Subtasks that will be executed if the node doesn't exists.
+ */
+ protected List<Task> tasks;
+
+ /**
* @param taskName
* @param taskDescription
*/
@@ -76,22 +87,51 @@
}
}
+ /**
+ * Check if a node exists.
+ * @param hm HieararchyManager
+ * @param handle node handle
+ * @return <code>true</code> if node exists
+ */
public boolean existsNode(HierarchyManager hm, String handle)
{
return hm.isExist(handle);
}
+ /**
+ * Check if a nodedata exists.
+ * @param hm HieararchyManager
+ * @param handle node handle
+ * @param nodedata nodedata name
+ * @return <code>true</code> if nodedata exists
+ * @throws RepositoryException exceptions while checking content
+ */
public boolean existsNodedata(HierarchyManager hm, String handle, String nodedata) throws RepositoryException
{
return hm.getContent(handle).hasNodeData(nodedata);
}
+ /**
+ * Check if a nodedata exists with a specific value.
+ * @param hm HieararchyManager
+ * @param handle node handle
+ * @param nodedata nodedata name
+ * @param value expected value for nodeData
+ * @return <code>true</code> if nodedata has the same value
+ * @throws RepositoryException exceptions while checking content
+ */
public boolean nodeDataEquals(HierarchyManager hm, String handle, String nodedata, Object value)
throws RepositoryException
{
return value.equals(NodeDataUtil.getValueObject(hm.getContent(handle).getNodeData(nodedata)));
}
+ /**
+ * @param hm HieararchyManager
+ * @param handle node handle
+ * @return <code>true</code> if the task must be executed
+ * @throws RepositoryException exceptions while checking content
+ */
public abstract boolean verifyCondition(HierarchyManager hm, String handle) throws RepositoryException;
}
Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java 2009-03-12 11:45:54 UTC (rev 1085)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java 2009-03-12 11:55:29 UTC (rev 1086)
@@ -58,6 +58,9 @@
this.permissions = permissions;
}
+ /**
+ * {@inheritDoc}
+ */
@SuppressWarnings("unchecked")
@Override
protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
@@ -73,6 +76,12 @@
}
}
+ /**
+ * @param node Node
+ * @param ctx Context
+ * @throws RepositoryException
+ * @throws TaskExecutionException
+ */
protected void operateOnChildNode(Content node, InstallContext ctx) throws RepositoryException,
TaskExecutionException
{
Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java 2009-03-12 11:45:54 UTC (rev 1085)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java 2009-03-12 11:55:29 UTC (rev 1086)
@@ -25,6 +25,7 @@
/**
+ * Bootstraps a file only if a specific node doesn't already exists in the repository.
* @author molaschi
* @version $Id$
*/
Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2009-03-12 11:45:54 UTC (rev 1085)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2009-03-12 11:55:29 UTC (rev 1086)
@@ -68,6 +68,9 @@
this.excludeRepositories.addAll(excludeRepositories);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected boolean acceptResource(InstallContext ctx, String name)
{
@@ -86,6 +89,9 @@
return accept;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void execute(final InstallContext installContext) throws TaskExecutionException
{
@@ -114,6 +120,13 @@
}
}
+ /**
+ * Deletes a node
+ * @param installContext install context
+ * @param nodePath node path
+ * @throws RepositoryException
+ * @throws TaskExecutionException
+ */
protected void deleteNode(InstallContext installContext, String nodePath) throws RepositoryException,
TaskExecutionException
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-12 11:46:05
|
Revision: 1085
http://openutils.svn.sourceforge.net/openutils/?rev=1085&view=rev
Author: fgiust
Date: 2009-03-12 11:45:54 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
update API to magnolia 4.0
Modified Paths:
--------------
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2009-03-12 11:42:26 UTC (rev 1084)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2009-03-12 11:45:54 UTC (rev 1085)
@@ -18,6 +18,7 @@
package it.openutils.mgnltasks;
import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.importexport.BootstrapUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.BootstrapResourcesTask;
import info.magnolia.module.delta.TaskExecutionException;
@@ -26,6 +27,7 @@
import java.util.ArrayList;
import java.util.List;
+import javax.jcr.ImportUUIDBehavior;
import javax.jcr.RepositoryException;
import org.slf4j.Logger;
@@ -97,21 +99,15 @@
deleteNode(installContext, "/modules/" + modulename + "/dialogs");
deleteNode(installContext, "/modules/" + modulename + "/templates");
deleteNode(installContext, "/modules/" + modulename + "/paragraphs");
+ deleteNode(installContext, "/modules/" + modulename + "/virtualURIMapping");
- // no, don't delete VUMs!
- // deleteNode(installContext, "/modules/" + modulename + "/virtualURIMapping");
-
- ModuleUtil.bootstrap(resourcesToBootstrap, false);
+ BootstrapUtil.bootstrap(resourcesToBootstrap, ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING);
log.info("{} bootstrap done in {} seconds", modulename, (System.currentTimeMillis() - millis) / 1000);
}
catch (IOException e)
{
throw new TaskExecutionException("Could not bootstrap: " + e.getMessage());
}
- catch (RegisterException e)
- {
- throw new TaskExecutionException("Could not bootstrap: " + e.getMessage());
- }
catch (RepositoryException e)
{
throw new TaskExecutionException("Could not bootstrap: " + e.getMessage());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-12 11:42:31
|
Revision: 1084
http://openutils.svn.sourceforge.net/openutils/?rev=1084&view=rev
Author: fgiust
Date: 2009-03-12 11:42:26 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
new/updated tasks
Modified Paths:
--------------
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java
Added Paths:
-----------
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java
Added: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java (rev 0)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java 2009-03-12 11:42:26 UTC (rev 1084)
@@ -0,0 +1,97 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package it.openutils.mgnltasks;
+
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractTask;
+import info.magnolia.module.delta.Task;
+import info.magnolia.module.delta.TaskExecutionException;
+
+import java.util.List;
+
+import javax.jcr.RepositoryException;
+
+
+/**
+ * @author molaschi
+ * @version $Id$
+ */
+public abstract class ConditionalTask extends AbstractTask
+{
+
+ protected String workspace;
+
+ protected List<Task> tasks;
+
+ protected String handle;
+
+ /**
+ * @param taskName
+ * @param taskDescription
+ */
+ public ConditionalTask(String workspace, String handle, List<Task> tasks)
+ {
+ super("Conditional task", "Execute task if exists " + handle + " in " + workspace);
+ this.tasks = tasks;
+ this.handle = handle;
+ this.workspace = workspace;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void execute(InstallContext installContext) throws TaskExecutionException
+ {
+ HierarchyManager hm = installContext.getHierarchyManager(workspace);
+ try
+ {
+ if (verifyCondition(hm, handle))
+ {
+ for (Task t : tasks)
+ {
+ t.execute(installContext);
+ }
+ }
+ }
+ catch (RepositoryException e)
+ {
+ throw new TaskExecutionException(e.getMessage(), e);
+ }
+ }
+
+ public boolean existsNode(HierarchyManager hm, String handle)
+ {
+ return hm.isExist(handle);
+ }
+
+ public boolean existsNodedata(HierarchyManager hm, String handle, String nodedata) throws RepositoryException
+ {
+ return hm.getContent(handle).hasNodeData(nodedata);
+ }
+
+ public boolean nodeDataEquals(HierarchyManager hm, String handle, String nodedata, Object value)
+ throws RepositoryException
+ {
+ return value.equals(NodeDataUtil.getValueObject(hm.getContent(handle).getNodeData(nodedata)));
+ }
+
+ public abstract boolean verifyCondition(HierarchyManager hm, String handle) throws RepositoryException;
+
+}
Property changes on: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java (rev 0)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java 2009-03-12 11:42:26 UTC (rev 1084)
@@ -0,0 +1,97 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package it.openutils.mgnltasks;
+
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.BootstrapResourcesTask;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author molaschi
+ * @version $Id$
+ */
+public class ExistenceConditionalBootstrapTask extends BootstrapResourcesTask
+{
+
+ private String workspace;
+
+ private String folderName;
+
+ /**
+ * @param name
+ * @param description
+ * @param importUUIDBehavior
+ */
+ public ExistenceConditionalBootstrapTask(String workspace, String folderName, int importUUIDBehavior)
+ {
+ super("ExistenceConditionalBootstrap", "ExistenceConditionalBootstrap", importUUIDBehavior);
+
+ this.workspace = workspace;
+ this.folderName = folderName;
+ }
+
+ /**
+ * @param name
+ * @param description
+ */
+ public ExistenceConditionalBootstrapTask(String workspace, String folderName)
+ {
+ super("ExistenceConditionalBootstrap", "ExistenceConditionalBootstrap");
+
+ this.workspace = workspace;
+ this.folderName = folderName;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected boolean acceptResource(InstallContext installContext, String name)
+ {
+ boolean accept = name.startsWith("/mgnl-bootstrap/" + folderName + "/" + workspace) && name.endsWith(".xml");
+
+ if (accept)
+ {
+ String handle = StringUtils.substringAfter(name, "/mgnl-bootstrap/" + folderName + "/" + workspace + ".");
+ handle = StringUtils.substringBeforeLast(handle, ".xml");
+ handle = "/" + StringUtils.replace(handle, ".", "/");
+ HierarchyManager hm = installContext.getHierarchyManager(workspace);
+ boolean alreadyExisting = hm.isExist(handle);
+
+ if (!alreadyExisting)
+ {
+ log.info("Loading {} since no content at {}:{} has been found", new Object[]{name, workspace, handle });
+ }
+ return !alreadyExisting;
+ }
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected String[] getResourcesToBootstrap(InstallContext installContext)
+ {
+ return super.getResourcesToBootstrap(installContext);
+ }
+
+}
Property changes on: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2009-03-12 11:23:07 UTC (rev 1083)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2009-03-12 11:42:26 UTC (rev 1084)
@@ -18,13 +18,13 @@
package it.openutils.mgnltasks;
import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.module.ModuleUtil;
-import info.magnolia.cms.module.RegisterException;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.BootstrapResourcesTask;
import info.magnolia.module.delta.TaskExecutionException;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
import javax.jcr.RepositoryException;
@@ -35,6 +35,8 @@
/**
* A task to bootstrap a module. Can be used to fully re-bootstrap a custom module after an update (useful to reload
* templates, dialogs, etc). This task will always ignore bootstrap files for the <code>website</code> repository.
+ * <strong> Please note that during an update this task will always delete the following nodes inside the affected
+ * module configuration: "dialogs", "templates", "paragraphs", "virtualURIMapping" </strong>
* @author fgiust
* @version $Id$
*/
@@ -48,20 +50,33 @@
private String modulename;
+ private List<String> excludeRepositories = new ArrayList<String>();
+
public ModuleConfigBootstrapTask(String modulename)
{
super("Bootstrap", "Bootstraps module configuration for " + modulename + " (will not overwrite website!).");
this.modulename = modulename;
+ excludeRepositories.add("website");
}
+ public ModuleConfigBootstrapTask(String modulename, List<String> excludeRepositories)
+ {
+ super("Bootstrap", "Bootstraps module configuration for " + modulename + " (will not overwrite website!).");
+ this.modulename = modulename;
+ this.excludeRepositories.addAll(excludeRepositories);
+ }
+
@Override
protected boolean acceptResource(InstallContext ctx, String name)
{
- boolean accept = name.startsWith("/mgnl-bootstrap/" + modulename + "/")
- && !name.startsWith("/mgnl-bootstrap/" + modulename + "/website")
- && name.endsWith(".xml");
+ boolean accept = name.startsWith("/mgnl-bootstrap/" + modulename + "/") && name.endsWith(".xml");
+ for (String repository : excludeRepositories)
+ {
+ accept = accept && !name.startsWith("/mgnl-bootstrap/" + modulename + "/" + repository);
+ }
+
if (accept)
{
log.debug("Importing file {}", name);
@@ -82,8 +97,10 @@
deleteNode(installContext, "/modules/" + modulename + "/dialogs");
deleteNode(installContext, "/modules/" + modulename + "/templates");
deleteNode(installContext, "/modules/" + modulename + "/paragraphs");
- deleteNode(installContext, "/modules/" + modulename + "/virtualURIMapping");
+ // no, don't delete VUMs!
+ // deleteNode(installContext, "/modules/" + modulename + "/virtualURIMapping");
+
ModuleUtil.bootstrap(resourcesToBootstrap, false);
log.info("{} bootstrap done in {} seconds", modulename, (System.currentTimeMillis() - millis) / 1000);
}
@@ -109,6 +126,7 @@
if (hm.isExist(nodePath))
{
+ log.warn("Deleting node {}", nodePath);
hm.delete(nodePath);
}
}
Added: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java (rev 0)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java 2009-03-12 11:42:26 UTC (rev 1084)
@@ -0,0 +1,93 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package it.openutils.mgnltasks;
+
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.search.Query;
+import info.magnolia.cms.core.search.QueryManager;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractRepositoryTask;
+import info.magnolia.module.delta.TaskExecutionException;
+
+import java.util.Collection;
+
+import javax.jcr.RepositoryException;
+
+
+/**
+ * A task that replace any occurrence of a given paragraph with another at startup (handy for renamed paragraphs).
+ * @author fgiust
+ * @version $Id$
+ */
+public class ReplaceParagraphTask extends AbstractRepositoryTask
+{
+
+ private final String actualTemplate;
+
+ private final String newTemplate;
+
+ /**
+ * @param actualTemplate template to be replaced
+ * @param newTemplate new template
+ */
+ public ReplaceParagraphTask(String actualTemplate, String newTemplate)
+ {
+ super("Replacing template " + actualTemplate + " with " + newTemplate, "Replacing template "
+ + actualTemplate
+ + " with "
+ + newTemplate);
+ this.actualTemplate = actualTemplate;
+ this.newTemplate = newTemplate;
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
+ {
+
+ HierarchyManager hm = installContext.getHierarchyManager(ContentRepository.WEBSITE);
+
+ QueryManager qm = hm.getQueryManager();
+
+ StringBuilder query = new StringBuilder("//*[MetaData/mgnl:template ='");
+ query.append(actualTemplate);
+ query.append("']");
+
+ String queryAAsString = query.toString();
+
+ log.debug("Running query: {}", queryAAsString);
+
+ Collection<Content> nodes = qm.createQuery(queryAAsString, Query.XPATH).execute().getContent(
+ ItemType.CONTENTNODE.getSystemName());
+
+ for (Content page : nodes)
+ {
+ log.warn("Replacing template " + page.getMetaData().getTemplate() + " with {} in {}", newTemplate, page
+ .getHandle());
+ page.getMetaData().setTemplate(newTemplate);
+ }
+ }
+
+}
Property changes on: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java (rev 0)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java 2009-03-12 11:42:26 UTC (rev 1084)
@@ -0,0 +1,111 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package it.openutils.mgnltasks;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractRepositoryTask;
+import info.magnolia.module.delta.TaskExecutionException;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import javax.jcr.RepositoryException;
+
+
+/**
+ * @author molaschi
+ * @version $Id$
+ */
+public class SetNodeOrderTask extends AbstractRepositoryTask
+{
+
+ private String repository;
+
+ private String parentNode;
+
+ private String[] nodesOrder;
+
+ /**
+ * @param repository repository
+ * @param parentNode parent node handle
+ * @param nodesOrder ordered node names
+ */
+ public SetNodeOrderTask(String repository, String parentNode, String[] nodesOrder)
+ {
+ super("Set order in node " + parentNode, "Set order in node " + parentNode);
+ this.repository = repository;
+ this.parentNode = parentNode;
+ this.nodesOrder = nodesOrder;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
+ {
+ Content parent = installContext.getHierarchyManager(repository).getContent(parentNode);
+
+ List<Content> children = (List<Content>) ContentUtil.getAllChildren(parent);
+
+ if (children.isEmpty())
+ {
+ children = (List<Content>) parent.getChildren(ItemType.CONTENTNODE);
+ }
+
+ final List<String> orderedList = Arrays.asList(nodesOrder);
+
+ Collections.sort(children, new Comparator<Content>()
+ {
+
+ public int compare(Content o1, Content o2)
+ {
+ Integer index1 = orderedList.indexOf(o1.getName());
+ Integer index2 = orderedList.indexOf(o2.getName());
+ if (index1 < 0)
+ {
+ index1 = Integer.MAX_VALUE;
+ }
+ if (index2 < 0)
+ {
+ index2 = Integer.MAX_VALUE;
+ }
+
+ return index2.compareTo(index1);
+ }
+ });
+
+ Content previous = null;
+
+ for (Content content : children)
+ {
+ if (previous != null)
+ {
+ parent.orderBefore(content.getName(), previous.getName());
+ }
+ previous = content;
+ }
+ }
+
+}
Property changes on: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java 2009-03-12 11:23:07 UTC (rev 1083)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java 2009-03-12 11:42:26 UTC (rev 1084)
@@ -34,7 +34,7 @@
/**
* A base module version handler that re-bootstrap its configuration each time the version number changes. Can be used
- * as is or subclassed (usually overriding getStartupTasks() for configuration tweacks).
+ * as is or subclassed (usually overriding getStartupTasks() for configuration tweaks).
* @author fgiust
* @version $Id$
*/
@@ -47,6 +47,38 @@
protected Logger log = LoggerFactory.getLogger(getClass());
/**
+ * Repositories to exclude from bootstrap
+ */
+ protected List<String> excludedRepositoriesFromBootstrap = new ArrayList<String>();
+
+ /**
+ *
+ */
+ public SimpleModuleVersionHandler()
+ {
+ super();
+ excludedRepositoriesFromBootstrap.add("website");
+ }
+
+ /**
+ * Add a repository to bootstrap exclusion list
+ * @param repository repository to exclude from bootstrap
+ */
+ public void addExcludeRepositoryFromBootstrap(String repository)
+ {
+ excludedRepositoriesFromBootstrap.add(repository);
+ }
+
+ /**
+ * Remove a repository from bootstrap exclusion list
+ * @param repository repository to enable for bootstrap
+ */
+ public void removeExcludeRepositoryFromBootstrap(String repository)
+ {
+ excludedRepositoriesFromBootstrap.remove(repository);
+ }
+
+ /**
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
@@ -61,7 +93,7 @@
String modulename = ctx.getCurrentModuleDefinition().getName();
- Version to = ctx.getCurrentModuleDefinition().getVersionDefinition();
+ Version to = ctx.getCurrentModuleDefinition().getVersion();
List<Delta> deltas = new ArrayList<Delta>();
@@ -77,7 +109,7 @@
log.info("Updating from version {}", from);
Delta delta = DeltaBuilder.update(to, "Update to current version");
- delta.getTasks().add(new ModuleConfigBootstrapTask(modulename));
+ delta.getTasks().add(new ModuleConfigBootstrapTask(modulename, excludedRepositoriesFromBootstrap));
delta.getTasks().add(new UpdateModuleVersionTask());
deltas.add(delta);
@@ -89,5 +121,4 @@
return deltas;
}
-
}
Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java 2009-03-12 11:23:07 UTC (rev 1083)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java 2009-03-12 11:42:26 UTC (rev 1084)
@@ -1,3 +1,4 @@
+
/**
* Copyright Openmind http://www.openmindonline.it
*
@@ -57,7 +58,7 @@
final Content moduleNode = ctx.getOrCreateCurrentModuleNode();
final NodeData nodeData = NodeDataUtil.getOrCreate(moduleNode, "version");
- nodeData.setValue(ctx.getCurrentModuleDefinition().getVersionDefinition().toString());
+ nodeData.setValue(ctx.getCurrentModuleDefinition().getVersion().toString());
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-12 11:23:20
|
Revision: 1083
http://openutils.svn.sourceforge.net/openutils/?rev=1083&view=rev
Author: fgiust
Date: 2009-03-12 11:23:07 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
missing @Override
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java 2009-03-12 11:17:41 UTC (rev 1082)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java 2009-03-12 11:23:07 UTC (rev 1083)
@@ -24,6 +24,7 @@
this.name = name;
}
+ @Override
public String toString()
{
return name;
@@ -35,6 +36,7 @@
public static final MatchMode START = new MatchMode("START")
{
+ @Override
public String toMatchString(String pattern)
{
return pattern + '%';
@@ -47,6 +49,7 @@
public static final MatchMode END = new MatchMode("END")
{
+ @Override
public String toMatchString(String pattern)
{
return '%' + pattern;
@@ -59,6 +62,7 @@
public static final MatchMode ANYWHERE = new MatchMode("ANYWHERE")
{
+ @Override
public String toMatchString(String pattern)
{
return '%' + pattern + '%';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-12 11:18:04
|
Revision: 1082
http://openutils.svn.sourceforge.net/openutils/?rev=1082&view=rev
Author: fgiust
Date: 2009-03-12 11:17:41 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
java 1.5
Modified Paths:
--------------
trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java
Modified: trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java
===================================================================
--- trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java 2009-03-12 11:12:04 UTC (rev 1081)
+++ trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java 2009-03-12 11:17:41 UTC (rev 1082)
@@ -294,7 +294,6 @@
/**
* {@inheritDoc}
*/
- @Override
public User getUser()
{
return user;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-12 11:12:31
|
Revision: 1081
http://openutils.svn.sourceforge.net/openutils/?rev=1081&view=rev
Author: fgiust
Date: 2009-03-12 11:12:04 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
massive update of dependencies: magnolia, slf4j, spring, hibernate
Modified Paths:
--------------
trunk/openutils-backup/pom.xml
trunk/openutils-bshd5/pom.xml
trunk/openutils-configuration-dataobjects/pom.xml
trunk/openutils-configuration-services/pom.xml
trunk/openutils-dbmigration/pom.xml
trunk/openutils-deployment/pom.xml
trunk/openutils-elfunctions/pom.xml
trunk/openutils-hibernate-security/pom.xml
trunk/openutils-log4j/pom.xml
trunk/openutils-maven-skin/pom.xml
trunk/openutils-mgnlbootstrapsync/pom.xml
trunk/openutils-mgnlcas/pom.xml
trunk/openutils-mgnlcontrols/pom.xml
trunk/openutils-mgnlcriteria/pom.xml
trunk/openutils-mgnlext/pom.xml
trunk/openutils-mgnlgroovy/pom.xml
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmessages/pom.xml
trunk/openutils-mgnlspring/pom.xml
trunk/openutils-mgnlstripes/pom.xml
trunk/openutils-mgnlstruts11/pom.xml
trunk/openutils-mgnltasks/pom.xml
trunk/openutils-spring/pom.xml
trunk/openutils-spring-remote-callback/pom.xml
trunk/openutils-spring-rmibernate/pom.xml
trunk/openutils-tags-spring/pom.xml
trunk/openutils-testing/pom.xml
trunk/openutils-testing-junit/pom.xml
trunk/openutils-testing-testng/pom.xml
trunk/openutils-testing4dwr/pom.xml
trunk/openutils-testing4dwr-junit/pom.xml
trunk/openutils-testing4dwr-testng/pom.xml
trunk/openutils-testing4web/pom.xml
trunk/openutils-usermanagement/pom.xml
trunk/openutils-usermanagement-dataobjects/pom.xml
trunk/openutils-web/pom.xml
trunk/pom.xml
Modified: trunk/openutils-backup/pom.xml
===================================================================
--- trunk/openutils-backup/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-backup/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-backup</artifactId>
@@ -15,20 +15,14 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.0</version>
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-bshd5/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<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">
+<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>
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-bshd5</artifactId>
@@ -14,12 +15,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.0</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.5.0</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -67,16 +68,20 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.1.ga</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.1.GA</version>
<exclusions>
<exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -103,6 +108,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.3</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-configuration-dataobjects/pom.xml
===================================================================
--- trunk/openutils-configuration-dataobjects/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-configuration-dataobjects/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<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">
+<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>
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -16,19 +17,19 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
+ <version>3.4.0.GA</version>
<exclusions>
<exclusion>
<!-- not needed here, just load annotations -->
<groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
+ <artifactId>hibernate-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: trunk/openutils-configuration-services/pom.xml
===================================================================
--- trunk/openutils-configuration-services/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-configuration-services/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -29,6 +29,12 @@
<artifactId>openutils-spring</artifactId>
<version>2.0</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -38,43 +44,40 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-bshd5</artifactId>
- <version>2.0.3</version>
+ <version>2.0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing-testng</artifactId>
<version>2.1</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.3</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
+ <version>3.4.0.GA</version>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <!-- not needed here, just load annotations -->
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -96,7 +99,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-dbmigration/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<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">
+<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>
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-dbmigration</artifactId>
@@ -14,7 +15,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -57,12 +58,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.4.1</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.1</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
@@ -74,6 +75,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -91,6 +96,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-deployment/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-deployment</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -43,12 +43,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.3</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.3</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -65,6 +65,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-elfunctions/pom.xml
===================================================================
--- trunk/openutils-elfunctions/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-elfunctions/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,7 +2,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/openutils-hibernate-security/pom.xml
===================================================================
--- trunk/openutils-hibernate-security/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-hibernate-security/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,8 +1,9 @@
-<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">
+<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">
<parent>
<artifactId>openutils</artifactId>
<groupId>net.sourceforge.openutils</groupId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -11,10 +12,6 @@
<name>openutils hibernate security</name>
<version>0.0.8-SNAPSHOT</version>
<description>Hibernate Security classes</description>
- <properties>
- <spring.version>2.5.1</spring.version>
- <aspectj.version>1.5.3</aspectj.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
@@ -99,6 +96,12 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-usermanagement</artifactId>
<version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -108,53 +111,54 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-bshd5</artifactId>
- <version>2.0.2</version>
+ <version>2.0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing-junit</artifactId>
<version>2.0.2</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-testing</artifactId>
- <version>2.0.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.1</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.5.ga</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.1.GA</version>
<exclusions>
<exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
+ <version>3.4.0.GA</version>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <!-- not needed here, just load annotations -->
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -176,28 +180,28 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</dependency>
<dependency>
- <groupId>org.acegisecurity</groupId>
- <artifactId>acegi-security</artifactId>
- <version>1.0.6</version>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>2.0.3</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-remoting</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-jdbc</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.springframework</groupId>
<artifactId>spring-support</artifactId>
- <groupId>org.springframework</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -220,4 +224,8 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <properties>
+ <spring.version>2.5.6</spring.version>
+ <aspectj.version>1.5.3</aspectj.version>
+ </properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-log4j/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-log4j</artifactId>
Modified: trunk/openutils-maven-skin/pom.xml
===================================================================
--- trunk/openutils-maven-skin/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-maven-skin/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-maven-skin</artifactId>
Modified: trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- trunk/openutils-mgnlbootstrapsync/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlbootstrapsync/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -39,12 +39,12 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>3.5-rc2</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>3.5.2</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
Modified: trunk/openutils-mgnlcas/pom.xml
===================================================================
--- trunk/openutils-mgnlcas/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlcas/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,13 +2,13 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
- <artifactId>openutils-cas</artifactId>
- <name>openutils-cas</name>
+ <artifactId>openutils-mgnlcas</artifactId>
+ <name>openutils-mgnlcas</name>
<version>1.1-SNAPSHOT</version>
<licenses>
<license>
@@ -38,7 +38,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-jaas</artifactId>
- <version>3.6.3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>org.jasig.cas</groupId>
Modified: trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- trunk/openutils-mgnlcontrols/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlcontrols/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,7 +2,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -38,7 +38,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>3.5.8</version>
+ <version>4.0</version>
<exclusions>
<exclusion>
<groupId>servlets.com</groupId>
@@ -49,7 +49,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>3.5.8</version>
+ <version>4.0</version>
<exclusions>
<exclusion>
<groupId>servlets.com</groupId>
Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlcriteria/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
@@ -14,17 +14,17 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>3.6.3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.0</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.5.0</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: trunk/openutils-mgnlext/pom.xml
===================================================================
--- trunk/openutils-mgnlext/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlext/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,7 +2,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- trunk/openutils-mgnlgroovy/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlgroovy/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,7 +2,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -49,12 +49,12 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>3.6.3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>3.6.3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -39,12 +39,12 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>4.0-rc3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0-rc3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlmessages/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,7 +2,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -38,12 +38,12 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>4.0-rc3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0-rc3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-mgnlspring/pom.xml
===================================================================
--- trunk/openutils-mgnlspring/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlspring/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -21,12 +21,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.0</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.5.0</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -64,7 +64,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>3.5.4</version>
+ <version>4.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -75,7 +75,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-jaas</artifactId>
- <version>3.5.4</version>
+ <version>4.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -146,6 +146,6 @@
</repository>
</repositories>
<properties>
- <spring.version>2.5.3</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlstripes/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -50,12 +50,12 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>4.0-rc1</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0-rc1</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- trunk/openutils-mgnlstruts11/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlstruts11/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-mgnlstruts11</artifactId>
@@ -38,12 +38,12 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>4.0-rc3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0-rc3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: trunk/openutils-mgnltasks/pom.xml
===================================================================
--- trunk/openutils-mgnltasks/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnltasks/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>3.5.8</version>
+ <version>4.0</version>
<exclusions>
<exclusion>
<groupId>servlets.com</groupId>
@@ -51,7 +51,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>3.5.8</version>
+ <version>4.0</version>
<exclusions>
<exclusion>
<groupId>servlets.com</groupId>
Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-spring/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<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">
+<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>
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-spring</artifactId>
@@ -63,7 +64,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -79,27 +80,24 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.3</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
+ <version>3.4.0.GA</version>
<optional>true</optional>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <!-- not needed here, just load annotations -->
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -131,12 +129,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
@@ -144,6 +136,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-spring-remote-callback/pom.xml
===================================================================
--- trunk/openutils-spring-remote-callback/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-spring-remote-callback/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<artifactId>openutils</artifactId>
<groupId>net.sourceforge.openutils</groupId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -13,18 +13,12 @@
<version>0.0.1-SNAPSHOT</version>
<description>Openutils Spring Remote Callback classes</description>
<properties>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.6</spring.version>
<aspectj.version>1.5.3</aspectj.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>${spring.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<exclusions>
@@ -60,10 +54,29 @@
<groupId>org.logicblaze.lingo</groupId>
<artifactId>lingo</artifactId>
<version>1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activeio-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
+ <version>5.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
<version>4.1.1</version>
</dependency>
<dependency>
@@ -105,24 +118,24 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.1</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing-junit</artifactId>
<version>2.0.2</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-testing</artifactId>
- <version>2.0.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -135,16 +148,12 @@
<artifactId>xbean-spring-v2c</artifactId>
<version>2.8</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>http://repository.codehaus.org</id>
- <name>codehaus repository</name>
- <url>http://repository.codehaus.org</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
</project>
\ No newline at end of file
Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-spring-rmibernate/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-spring-rmibernate</artifactId>
@@ -15,13 +15,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.1</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<!-- replaces commons-logging -->
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.1</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -47,24 +47,20 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.5.ga</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.1.GA</version>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</exclusion>
<exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -82,7 +78,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -103,22 +99,19 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-bshd5</artifactId>
- <version>2.0.2</version>
+ <version>2.0.5-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
+ <version>3.4.0.GA</version>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <!-- not needed here, just load annotations -->
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
</exclusions>
<scope>test</scope>
</dependency>
@@ -133,14 +126,14 @@
<artifactId>openutils-testing-junit</artifactId>
<version>2.0.2</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-testing</artifactId>
- <version>2.0.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
@@ -170,6 +163,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-tags-spring/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-tags-spring/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-tags-spring</artifactId>
@@ -32,7 +32,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -77,20 +77,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.3</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.0</version>
@@ -98,6 +92,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing</artifactId>
@@ -14,12 +14,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.0</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.5.0</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -112,6 +112,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.3</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing-junit/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<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">
+<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>
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-junit</artifactId>
@@ -14,7 +15,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.1.1</version>
+ <version>2.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -50,7 +51,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>2.5.3</version>
+ <version>2.5.6</version>
<scope>test</scope>
<exclusions>
<exclusion>
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing-testng/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<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">
+<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>
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-testng</artifactId>
@@ -14,7 +15,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.1.1</version>
+ <version>2.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
@@ -57,7 +58,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>2.5.3</version>
+ <version>2.5.6</version>
<scope>test</scope>
<exclusions>
<exclusion>
Modified: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing4dwr/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing4dwr</artifactId>
@@ -30,12 +30,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.3</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -77,26 +77,56 @@
<groupId>tomcat</groupId>
<artifactId>jasper-compiler-jdt</artifactId>
<version>5.5.12</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>naming-resources</artifactId>
<version>5.5.15</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
<version>5.5.12</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
<version>5.5.12</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>naming-factory</artifactId>
<version>5.5.15</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -127,6 +157,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.3</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-testing4dwr-junit/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-junit/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing4dwr-junit/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing4dwr-junit</artifactId>
Modified: trunk/openutils-testing4dwr-testng/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-testng/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing4dwr-testng/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing4dwr-testng</artifactId>
Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing4web/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing4web</artifactId>
@@ -47,6 +47,12 @@
<groupId>tomcat</groupId>
<artifactId>jasper-compiler-jdt</artifactId>
<version>5.5.12</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>tomcat</groupId>
@@ -63,16 +69,34 @@
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
<version>5.5.12</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
<version>5.5.12</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>naming-factory</artifactId>
<version>5.5.15</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-usermanagement/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<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">
+<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>
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -12,9 +13,6 @@
<name>openutils-usermanagement</name>
<version>2.0.2-SNAPSHOT</version>
<description>Usermanagement classes</description>
- <properties>
- <spring.version>2.5.1</spring.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
@@ -39,12 +37,18 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-bshd5</artifactId>
- <version>2.0.2</version>
+ <version>2.0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing-junit</artifactId>
<version>2.0.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
<scope>test</scope>
</dependency>
<dependency>
@@ -72,16 +76,13 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
+ <version>3.4.0.GA</version>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <!-- not needed here, just load annotations -->
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -108,22 +109,22 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.3</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
- <groupId>org.acegisecurity</groupId>
-...
[truncated message content] |
|
From: <fg...@us...> - 2009-03-06 21:57:04
|
Revision: 1080
http://openutils.svn.sourceforge.net/openutils/?rev=1080&view=rev
Author: fgrilli
Date: 2009-03-06 21:56:58 +0000 (Fri, 06 Mar 2009)
Log Message:
-----------
moved checks on ItemType in AbstractMagnoliaCriteriaImpl
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractMagnoliaCriteriaImpl.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaImpl.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractMagnoliaCriteriaImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractMagnoliaCriteriaImpl.java 2009-03-06 21:49:34 UTC (rev 1079)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractMagnoliaCriteriaImpl.java 2009-03-06 21:56:58 UTC (rev 1080)
@@ -1,7 +1,10 @@
package net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.impl;
+import org.apache.commons.lang.StringUtils;
+
import net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.utils.XPathTextUtils;
import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.search.QueryManager;
@@ -24,7 +27,10 @@
protected AbstractMagnoliaCriteriaImpl(String path, QueryManager queryManager, String itemType, Class< ? > classType)
{
super();
- this.itemType = itemType;
+ if (StringUtils.isBlank(this.itemType))
+ this.itemType = ItemType.CONTENT.getSystemName();
+ else
+ this.itemType = itemType;
this.path = XPathTextUtils.encodeDigitsInPath(path);
this.queryManager = queryManager;
// defaults to info.magnolia.cms.core.Content
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaImpl.java 2009-03-06 21:49:34 UTC (rev 1079)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaImpl.java 2009-03-06 21:56:58 UTC (rev 1080)
@@ -1,7 +1,6 @@
package net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.impl;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.search.Query;
import info.magnolia.cms.core.search.QueryManager;
import info.magnolia.cms.core.search.QueryResult;
@@ -20,9 +19,7 @@
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRQueryException;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.XPathSelect;
-import org.apache.commons.lang.StringUtils;
-
/**
* Magnolia XPATH implementation of the <tt>Criteria</tt> interface
* @author Federico Grilli
@@ -36,21 +33,11 @@
public MagnoliaCriteriaImpl(String path, QueryManager queryManager, String itemType)
{
super(path, queryManager, itemType, null);
-
- if (StringUtils.isBlank(this.itemType))
- this.itemType = ItemType.CONTENT.getSystemName();
- else
- this.itemType = itemType;
}
public MagnoliaCriteriaImpl(String path, QueryManager queryManager, String itemType, Class< ? > classType)
{
super(path, queryManager, itemType, classType);
-
- if (StringUtils.isBlank(this.itemType))
- this.itemType = ItemType.CONTENT.getSystemName();
- else
- this.itemType = itemType;
}
@SuppressWarnings("unchecked")
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java 2009-03-06 21:49:34 UTC (rev 1079)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java 2009-03-06 21:56:58 UTC (rev 1080)
@@ -47,21 +47,11 @@
public MagnoliaCriteriaWithLimitImpl(String path, QueryManager queryManager, String itemType)
{
super(path, queryManager, itemType, null);
-
- if (StringUtils.isBlank(this.itemType))
- this.itemType = ItemType.CONTENT.getSystemName();
- else
- this.itemType = itemType;
}
public MagnoliaCriteriaWithLimitImpl(String path, QueryManager queryManager, String itemType, Class< ? > classType)
{
super(path, queryManager, itemType, classType);
-
- if (StringUtils.isBlank(this.itemType))
- this.itemType = ItemType.CONTENT.getSystemName();
- else
- this.itemType = itemType;
}
@SuppressWarnings("unchecked")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-06 21:49:45
|
Revision: 1079
http://openutils.svn.sourceforge.net/openutils/?rev=1079&view=rev
Author: fgrilli
Date: 2009-03-06 21:49:34 +0000 (Fri, 06 Mar 2009)
Log Message:
-----------
added isEmpty method to check if there are expressions in this Criterion
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Junction.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Junction.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Junction.java 2009-03-06 16:40:30 UTC (rev 1078)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Junction.java 2009-03-06 21:49:34 UTC (rev 1079)
@@ -1,6 +1,5 @@
package net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -69,4 +68,12 @@
{
return '(' + StringUtils.join(criteria.iterator(), ' ' + op + ' ') + ')';
}
+
+ /**
+ * @return true if this Criterion contains at least one expression, false otherwise
+ */
+ public boolean isEmpty()
+ {
+ return criteria.isEmpty();
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-06 16:40:50
|
Revision: 1078
http://openutils.svn.sourceforge.net/openutils/?rev=1078&view=rev
Author: fgrilli
Date: 2009-03-06 16:40:30 +0000 (Fri, 06 Mar 2009)
Log Message:
-----------
left-aligned run button with textarea
Modified Paths:
--------------
trunk/openutils-mgnlgroovy/src/main/resources/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellPage.html
Modified: trunk/openutils-mgnlgroovy/src/main/resources/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellPage.html
===================================================================
--- trunk/openutils-mgnlgroovy/src/main/resources/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellPage.html 2009-03-05 14:48:26 UTC (rev 1077)
+++ trunk/openutils-mgnlgroovy/src/main/resources/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellPage.html 2009-03-06 16:40:30 UTC (rev 1078)
@@ -31,7 +31,7 @@
</div>
<br/>
<input type="hidden" id="command" name="command" value="executeGroovyScript" />
- <input type="submit" id="runBtn" value="Run" onclick="warnBeforeSubmit(); return false" class="mgnlControlButton" />
+ <input type="submit" id="runBtn" value="Run" onclick="warnBeforeSubmit(); return false" class="mgnlControlButton" style="margin-left:200px"/>
</div>
</form>
[#if message?exists]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
