Author: ate
Date: Thu Sep 28 14:56:58 2006
New Revision: 451034
URL: http://svn.apache.org/viewvc?view=rev&rev=451034
Log:
PB-50: Support using Springframework 2.0 with the frameworks bridge
See: http://issues.apache.org/jira/browse/PB-50
Modified:
portals/bridges/trunk/.classpath
portals/bridges/trunk/frameworks/project.xml
portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/spring/PortletApplicationModelImpl.java
portals/bridges/trunk/project.properties
Modified: portals/bridges/trunk/.classpath
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/.classpath?view=diff&rev=451034&r1=451033&r2=451034
==============================================================================
--- portals/bridges/trunk/.classpath (original)
+++ portals/bridges/trunk/.classpath Thu Sep 28 14:56:58 2006
@@ -26,9 +26,10 @@
<classpathentry kind="var"
path="MAVEN_REPO/commons-validator/jars/commons-validator-1.1.3.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/velocity/jars/velocity-1.4.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/velocity-tools/jars/velocity-tools-1.1.jar"/>
- <classpathentry kind="var"
path="MAVEN_REPO/springframework/jars/spring-1.1.5.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/ibatis/jars/ibatis-common-2.0.8.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/ibatis/jars/ibatis-dao-2.0.8.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/ibatis/jars/ibatis-sqlmap-2.0.8.jar"/>
+ <classpathentry kind="var"
path="MAVEN_REPO/org.springframework/jars/spring-beans-2.0-m4.jar"/>
+ <classpathentry kind="var"
path="MAVEN_REPO/org.springframework/jars/spring-core-2.0-m4.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: portals/bridges/trunk/frameworks/project.xml
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/project.xml?view=diff&rev=451034&r1=451033&r2=451034
==============================================================================
--- portals/bridges/trunk/frameworks/project.xml (original)
+++ portals/bridges/trunk/frameworks/project.xml Thu Sep 28 14:56:58 2006
@@ -52,7 +52,14 @@
</dependency>
<dependency>
- <id>springframework:spring</id>
+ <id>org.springframework:spring-core</id>
+ <version>${spring.version}</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>org.springframework:spring-beans</id>
<version>${spring.version}</version>
<properties>
<war.bundle>true</war.bundle>
Modified:
portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/spring/PortletApplicationModelImpl.java
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/spring/PortletApplicationModelImpl.java?view=diff&rev=451034&r1=451033&r2=451034
==============================================================================
---
portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/spring/PortletApplicationModelImpl.java
(original)
+++
portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/spring/PortletApplicationModelImpl.java
Thu Sep 28 14:56:58 2006
@@ -27,6 +27,7 @@
import org.springframework.beans.PropertyValue;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.core.io.FileSystemResource;
import org.apache.commons.validator.Validator;
import org.apache.commons.validator.ValidatorException;
@@ -127,9 +128,7 @@
{
if (null == springFactory)
{
- InputStream is =
config.getPortletContext().getResourceAsStream(springConfig);
- springFactory = new XmlBeanFactory(is);
- is.close();
+ springFactory = new XmlBeanFactory(new
FileSystemResource(config.getPortletContext().getRealPath(springConfig)));
}
}
}
Modified: portals/bridges/trunk/project.properties
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/project.properties?view=diff&rev=451034&r1=451033&r2=451034
==============================================================================
--- portals/bridges/trunk/project.properties (original)
+++ portals/bridges/trunk/project.properties Thu Sep 28 14:56:58 2006
@@ -86,7 +86,7 @@
# bridges versions
portals.bridges.version=1.0
portals.bridges.common.version=1.0.1-dev
-portals.bridges.frameworks.version=1.0
+portals.bridges.frameworks.version=1.0.1-dev
portals.bridges.jsf.version=1.0.1-dev
portals.bridges.perl.version=1.0
portals.bridges.php.version=1.0
@@ -101,7 +101,7 @@
servlet.api.version=2.3
myfaces.version=1.1.4
tomahawk.version=1.1.4
-spring.version=1.1.5
+spring.version=2.0-m4
jython.version=2.2a1
jetspeed.rewriter.version=2.0-dev
log4j.version=1.2.8
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
