You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2007/05/17 23:34:00 UTC
svn commit: r539124 [1/2] - in /portals/jetspeed-2/trunk: ./
app-servers/security/jboss/src/java/META-INF/jboss-secsvc/
applications/demo/ applications/gems/ applications/j2-admin/
applications/j2-admin/src/webapp/WEB-INF/view/ applications/rss/ applic...
Author: taylor
Date: Thu May 17 14:33:57 2007
New Revision: 539124
URL: http://svn.apache.org/viewvc?view=rev&rev=539124
Log:
(1)
https://issues.apache.org/jira/browse/JS2-709
updating jars to latest versions, completed for Spring, most Commons
still working on Castor, JSF, see PB-63 for JSF work
(2)
https://issues.apache.org/jira/browse/JS2-689
move to Spring 2.0.5, fixing contention issues under heavy load
(3)
fixed broken unit tests, m1 and m2 builds now pass
(4)
update db-page-manager to not create tx on non-db methods
(5)
remove comments from all Velocity macros, not allowed in Velocity 1.5
Modified:
portals/jetspeed-2/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/transaction.xml
portals/jetspeed-2/trunk/applications/demo/pom.xml
portals/jetspeed-2/trunk/applications/demo/project.xml
portals/jetspeed-2/trunk/applications/gems/project.xml
portals/jetspeed-2/trunk/applications/j2-admin/pom.xml
portals/jetspeed-2/trunk/applications/j2-admin/project.xml
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/profiler-admin.jsp
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/profiler-criterion.jsp
portals/jetspeed-2/trunk/applications/rss/project.xml
portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml
portals/jetspeed-2/trunk/components/cm/pom.xml
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/OJBHelper.java
portals/jetspeed-2/trunk/components/page-manager/maven.xml
portals/jetspeed-2/trunk/components/portal/maven.xml
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/FragmentUtil.java
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestLayout.java
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestPortletPlacement.java
portals/jetspeed-2/trunk/components/rdbms/pom.xml
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/dao/InitablePersistenceBrokerDaoSupport.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java
portals/jetspeed-2/trunk/components/serializer/pom.xml
portals/jetspeed-2/trunk/components/sso/pom.xml
portals/jetspeed-2/trunk/components/statistics/pom.xml
portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java
portals/jetspeed-2/trunk/components/webapp-logging/project.xml
portals/jetspeed-2/trunk/core-build.xml
portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml
portals/jetspeed-2/trunk/etc/import/assembly/repository-datasource-spring.xml
portals/jetspeed-2/trunk/jetspeed-components.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/repository-datasource-spring.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
portals/jetspeed-2/trunk/pom.xml
portals/jetspeed-2/trunk/project.properties
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/boot/datasource.xml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/security-managers.xml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/transaction.xml
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/decorator-macros.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/decorator-macros.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator-macros.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm
Modified: portals/jetspeed-2/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/transaction.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/transaction.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/transaction.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/transaction.xml Thu May 17 14:33:57 2007
@@ -23,7 +23,7 @@
<beans>
<!-- Transaction manager for a single OJB PersistenceBroker (alternative to JTA) -->
- <bean id="transactionManager" class="org.springmodules.orm.ojb.PersistenceBrokerTransactionManager">
+ <bean id="transactionManager" class="org.springframework.orm.ojb.PersistenceBrokerTransactionManager">
<property name="jcdAlias"><value>JetspeedSecurityServiceDS</value></property>
</bean>
Modified: portals/jetspeed-2/trunk/applications/demo/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/pom.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/pom.xml Thu May 17 14:33:57 2007
@@ -92,6 +92,16 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<scope>runtime</scope>
@@ -101,6 +111,11 @@
<artifactId>commons-logging</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
Modified: portals/jetspeed-2/trunk/applications/demo/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/project.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/project.xml Thu May 17 14:33:57 2007
@@ -44,7 +44,7 @@
</dependency>
<dependency>
<id>commons-httpclient</id>
- <version>3.0</version>
+ <version>3.0.1</version>
<type>jar</type>
<properties>
<war.bundle>true</war.bundle>
@@ -53,17 +53,26 @@
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>1.5</version>
+ <version>1.8</version>
<type>jar</type>
<url>http://jakarta.apache.org/commons/digester.html</url>
<properties>
<war.bundle>true</war.bundle>
</properties>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ <url>http://jakarta.apache.org/commons/lang.html</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.6.1</version>
+ <version>1.7.0</version>
<type>jar</type>
<url>http://jakarta.apache.org/commons/beanutils.html</url>
<properties>
@@ -72,21 +81,21 @@
</dependency>
<dependency>
<id>commons-collections</id>
- <version>3.0</version>
+ <version>3.2</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>commons-pool</id>
- <version>1.2</version>
+ <version>1.3</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>commons-dbcp</id>
- <version>1.2.1</version>
+ <version>1.2.2</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -165,19 +174,26 @@
</dependency>
<dependency>
<id>velocity</id>
- <version>1.4</version>
+ <version>1.5</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>velocity-tools</id>
- <version>1.2</version>
+ <version>1.3</version>
<url>http://jakarta.apache.org/velocity</url>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
+ <dependency>
+ <id>oro</id>
+ <version>2.0.8</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -214,13 +230,6 @@
<properties>
<war.bundle>true</war.bundle>
</properties>
- </dependency>
- <dependency>
- <id>castor</id>
- <version>0.9.4.3</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
<groupId>org.apache.portals.jetspeed-2</groupId>
Modified: portals/jetspeed-2/trunk/applications/gems/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/gems/project.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/applications/gems/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/gems/project.xml Thu May 17 14:33:57 2007
@@ -43,15 +43,15 @@
</dependency>
<dependency>
<id>commons-pool</id>
- <version>1.2</version>
+ <version>1.3</version>
</dependency>
<dependency>
<id>commons-dbcp</id>
- <version>1.2.1</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<id>commons-lang</id>
- <version>2.0</version>
+ <version>2.1</version>
</dependency>
<dependency>
<id>commons-logging</id>
@@ -63,7 +63,7 @@
</dependency>
<dependency>
<id>commons-collections</id>
- <version>3.0</version>
+ <version>3.2</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -124,13 +124,13 @@
<dependency>
<id>velocity</id>
- <version>1.4</version>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-portlet</artifactId>
- <version>2.0</version>
+ <artifactId>spring-context</artifactId>
+ <version>2.0.5</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -138,8 +138,17 @@
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-portlet</artifactId>
+ <version>2.0.5</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.0</version>
+ <version>2.0.5</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -148,7 +157,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.0</version>
+ <version>2.0.5</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -156,7 +165,7 @@
<dependency>
<id>commons-httpclient</id>
- <version>3.0</version>
+ <version>3.0.1</version>
<type>jar</type>
</dependency>
Modified: portals/jetspeed-2/trunk/applications/j2-admin/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/pom.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/pom.xml Thu May 17 14:33:57 2007
@@ -171,6 +171,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: portals/jetspeed-2/trunk/applications/j2-admin/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/project.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/project.xml Thu May 17 14:33:57 2007
@@ -193,7 +193,7 @@
<!-- Commons -->
<dependency>
<id>commons-validator</id>
- <version>1.1.3</version>
+ <version>1.3.1</version>
<url>http://jakarta.apache.org/commons/validator/</url>
<properties>
<war.bundle>true</war.bundle>
@@ -219,7 +219,7 @@
</dependency>
<dependency>
<id>commons-collections</id>
- <version>3.0</version>
+ <version>3.2</version>
<type>jar</type>
<properties>
<war.bundle>true</war.bundle>
@@ -227,7 +227,7 @@
</dependency>
<dependency>
<id>commons-digester</id>
- <version>1.5</version>
+ <version>1.8</version>
<type>jar</type>
<url>http://jakarta.apache.org/commons/digester.html</url>
<properties>
@@ -236,7 +236,7 @@
</dependency>
<dependency>
<id>commons-beanutils</id>
- <version>1.6.1</version>
+ <version>1.7.0</version>
<type>jar</type>
<url>http://jakarta.apache.org/commons/beanutils.html</url>
<properties>
@@ -245,7 +245,7 @@
</dependency>
<dependency>
<id>commons-codec</id>
- <version>1.2</version>
+ <version>1.3</version>
<type>jar</type>
<url>http://jakarta.apache.org/commons/codec/</url>
<properties>
@@ -255,7 +255,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
<url>http://jakarta.apache.org/commons/fileupload/</url>
<properties>
<war.bundle>true</war.bundle>
@@ -264,12 +264,20 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<url>http://jakarta.apache.org/commons/lang.html</url>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
+ <dependency>
+ <id>oro</id>
+ <version>2.0.8</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
<!-- Logging -->
<dependency>
@@ -307,14 +315,14 @@
<!-- Velocity -->
<dependency>
<id>velocity</id>
- <version>1.4</version>
+ <version>1.5</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>velocity-tools</id>
- <version>1.2</version>
+ <version>1.3</version>
<url>http://jakarta.apache.org/velocity</url>
<properties>
<war.bundle>true</war.bundle>
@@ -385,7 +393,7 @@
<artifactId>spring-mock</artifactId>
<version>${spring.version}</version>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>false</war.bundle>
</properties>
</dependency>
<dependency>
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/profiler-admin.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/profiler-admin.jsp?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/profiler-admin.jsp (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/profiler-admin.jsp Thu May 17 14:33:57 2007
@@ -1,7 +1,7 @@
<%@ page session="true" contentType="text/html;charset=utf-8"%>
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/extensions" prefix="x"%>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="x"%>
<!--
/*
@@ -46,7 +46,7 @@
</h:panelGroup>
<h:panelGroup rendered="#{rule != null && rule.id != '{empty}'}">
- <h:form id="ruleForm" name="ruleForm">
+ <h:form id="ruleForm" >
<h:panelGrid columns="3">
<h:outputLabel for="xid" value="#{MESSAGE['profiler.rule.id']}: "/>
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/profiler-criterion.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/profiler-criterion.jsp?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/profiler-criterion.jsp (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/profiler-criterion.jsp Thu May 17 14:33:57 2007
@@ -1,7 +1,7 @@
<%@ page session="true" contentType="text/html;charset=utf-8"%>
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/extensions" prefix="x"%>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="x"%>
<!--
/*
@@ -32,7 +32,7 @@
<br/>
<br/>
- <h:form id="criterionForm" name="criterionForm">
+ <h:form id="criterionForm">
<h:panelGrid columns="3">
<h:outputLabel for="name" value="#{MESSAGE['criterion.name']}: "/>
Modified: portals/jetspeed-2/trunk/applications/rss/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/project.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/project.xml Thu May 17 14:33:57 2007
@@ -47,7 +47,7 @@
</properties>
</dependency>
<dependency>
- <id>springframework:spring</id>
+ <id>org.springframework:spring</id>
<version>${spring.version}</version>
<properties>
<war.bundle>true</war.bundle>
@@ -62,7 +62,7 @@
</dependency>
<dependency>
<id>commons-collections</id>
- <version>3.0</version>
+ <version>3.2</version>
<type>jar</type>
<properties>
<war.bundle>true</war.bundle>
@@ -70,7 +70,7 @@
</dependency>
<dependency>
<id>commons-digester</id>
- <version>1.5</version>
+ <version>1.8</version>
<type>jar</type>
<url>http://jakarta.apache.org/commons/digester.html</url>
<properties>
@@ -79,13 +79,22 @@
</dependency>
<dependency>
<id>commons-beanutils</id>
- <version>1.6.1</version>
+ <version>1.7.0</version>
<type>jar</type>
<url>http://jakarta.apache.org/commons/beanutils.html</url>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ <url>http://jakarta.apache.org/commons/lang.html</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
<dependency>
<id>commons-logging</id>
<version>${commons.logging.version}</version>
@@ -141,19 +150,26 @@
</dependency>
<dependency>
<id>velocity</id>
- <version>1.4</version>
+ <version>1.5</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>velocity-tools</id>
- <version>1.2</version>
+ <version>1.3</version>
<url>http://jakarta.apache.org/velocity</url>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
+ <dependency>
+ <id>oro</id>
+ <version>2.0.8</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
<dependency>
<id>log4j</id>
<version>${log4j.version}</version>
Modified: portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml Thu May 17 14:33:57 2007
@@ -59,6 +59,21 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>runtime</scope>
Modified: portals/jetspeed-2/trunk/components/cm/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/pom.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/cm/pom.xml Thu May 17 14:33:57 2007
@@ -50,10 +50,30 @@
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
+<!--
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-ojb</artifactId>
+ </dependency>
+<!--
<dependency>
- <groupId>org.springmodules</groupId>
- <artifactId>spring-modules-ojb</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
</dependency>
+ -->
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
@@ -103,7 +123,7 @@
<!-- Runtime Dependencies -->
<dependency>
<groupId>cglib</groupId>
- <artifactId>cglib-full</artifactId>
+ <artifactId>cglib</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/OJBHelper.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/OJBHelper.java?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/OJBHelper.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/OJBHelper.java Thu May 17 14:33:57 2007
@@ -22,8 +22,8 @@
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.transaction.interceptor.TransactionProxyFactoryBean;
-import org.springmodules.orm.ojb.PersistenceBrokerTransactionManager;
-import org.springmodules.orm.ojb.support.LocalOjbConfigurer;
+import org.springframework.orm.ojb.PersistenceBrokerTransactionManager;
+import org.springframework.orm.ojb.support.LocalOjbConfigurer;
public class OJBHelper extends DatasourceHelper
{
Modified: portals/jetspeed-2/trunk/components/page-manager/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/maven.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/maven.xml Thu May 17 14:33:57 2007
@@ -20,9 +20,9 @@
<!-- <property name='testcase' value='org.apache.jetspeed.page.TestSecurePermissionsDatabasePageManager' /> -->
<!-- <property name='testcase' value='org.apache.jetspeed.page.TestSecureDatabasePageManager' /> -->
<!-- <property name='testcase' value='org.apache.jetspeed.page.TestDatabasePageManager' /> -->
-<!-- <property name='testcase' value='org.apache.jetspeed.page.TestCastorXmlPageManager' /> -->
+ <property name='testcase' value='org.apache.jetspeed.page.TestCastorXmlPageManager' />
<!-- <property name='testcase' value='org.apache.jetspeed.page.TestCreateUserHomePagesFromRoles' /> -->
- <property name='testcase' value='org.apache.jetspeed.page.TestTransactions' />
+<!-- <property name='testcase' value='org.apache.jetspeed.page.TestTransactions' /> -->
<preGoal name="test:test">
Modified: portals/jetspeed-2/trunk/components/portal/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/maven.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/maven.xml Thu May 17 14:33:57 2007
@@ -18,6 +18,6 @@
<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define" xmlns:maven="jelly:maven">
<!-- Target of maven test:single test -->
- <property name='testcase' value='org.apache.jetspeed.decoration.TestDecorations' />
+ <property name='testcase' value='org.apache.jetspeed.layout.TestLayout' />
</project>
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java Thu May 17 14:33:57 2007
@@ -495,7 +495,8 @@
public int getNumberColumns() throws PortletPlacementException
{
- return this.columnsList.length;
+ return numberOfColumns;
+ //return this.columnsList.length;
}
public int getNumberRows(int col) throws PortletPlacementException
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java Thu May 17 14:33:57 2007
@@ -136,7 +136,8 @@
page.removeFragmentById(fragment.getId());
if (!batch)
{
- pageManager.updatePage(page);
+ if (pageManager != null)
+ pageManager.updatePage(page);
}
// Build the results for the response
resultMap.put(PORTLETID, portletId);
Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/FragmentUtil.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/FragmentUtil.java?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/FragmentUtil.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/FragmentUtil.java Thu May 17 14:33:57 2007
@@ -46,12 +46,12 @@
// Build some fragments and add them to the request context
// Prepare some fragments
- Fragment a_oFrag1 = buildFragment("frag1", "1", "portlet", 0, 0);
- Fragment a_oFrag2 = buildFragment("frag2", "2", "portlet", 0, 1);
- Fragment a_oFrag3 = buildFragment("frag3", "3", "portlet", 1, 0);
- Fragment a_oFrag4 = buildFragment("frag4", "4", "portlet", 1, 1);
- Fragment a_oFrag5 = buildFragment("frag5", "5", "portlet", 1, 2);
Fragment a_oLayout = buildFragment("layout", "6", "layout", 0, 0);
+ Fragment a_oFrag1 = buildFragment("frag1", "1", "portlet", 1, 0);
+ Fragment a_oFrag2 = buildFragment("frag2", "2", "portlet", 1, 1);
+ Fragment a_oFrag3 = buildFragment("frag3", "3", "portlet", 2, 0);
+ Fragment a_oFrag4 = buildFragment("frag4", "4", "portlet", 2, 1);
+ Fragment a_oFrag5 = buildFragment("frag5", "5", "portlet", 2, 2);
LocalFragmentImpl a_oLocalLayout = (LocalFragmentImpl) a_oLayout;
a_oLocalLayout.addFragment(a_oFrag1);
@@ -117,12 +117,12 @@
public static Page setupPage()
{
// Prepare some fragments
- Fragment a_oFrag1 = buildFragment("frag1", "1", "portlet", 0, 0);
- Fragment a_oFrag2 = buildFragment("frag2", "2", "portlet", 0, 1);
- Fragment a_oFrag3 = buildFragment("frag3", "3", "portlet", 1, 0);
- Fragment a_oFrag4 = buildFragment("frag4", "4", "portlet", 1, 1);
- Fragment a_oFrag5 = buildFragment("frag5", "5", "portlet", 1, 2);
Fragment a_oLayout = buildFragment("layout", "6", "layout", 0, 0);
+ Fragment a_oFrag1 = buildFragment("frag1", "1", "portlet", 1, 0);
+ Fragment a_oFrag2 = buildFragment("frag2", "2", "portlet", 1, 1);
+ Fragment a_oFrag3 = buildFragment("frag3", "3", "portlet", 2, 0);
+ Fragment a_oFrag4 = buildFragment("frag4", "4", "portlet", 2, 1);
+ Fragment a_oFrag5 = buildFragment("frag5", "5", "portlet", 2, 2);
LocalFragmentImpl a_oLocalLayout = (LocalFragmentImpl) a_oLayout;
a_oLocalLayout.addFragment(a_oFrag1);
Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestLayout.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestLayout.java?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestLayout.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestLayout.java Thu May 17 14:33:57 2007
@@ -154,104 +154,104 @@
public void testEasy()
{
- moveSuccess("moveabs", "1", "0", "0", "0", "1", "0", "1"); // Move down
- moveSuccess("moveright", "1", "0", "0", "1", "0", "1", "0"); // Straight across
- //moveSuccess("moveabs", "2", "0", "1", "0", "2", "0", "1");
+ moveSuccess("moveabs", "1", "1", "0", "1", "1", "1", "1"); // Move down
+ moveSuccess("moveright", "1", "1", "0", "2", "0", "2", "0"); // Straight across
}
public void testMoveSuccess()
{
- moveSuccess("moveabs", "1", "0", "0", "0", "0", "0", "0"); // Doesn't
+ moveSuccess("moveabs", "1", "1", "0", "1", "0", "1", "0"); // Doesn't
// really
// move
- moveSuccess("moveabs", "1", "0", "0", "0", "1", "0", "1"); // Move down
- moveSuccess("moveabs", "2", "0", "1", "0", "0", "0", "0"); // Move up
- moveSuccess("moveabs", "1", "0", "0", "1", "0", "1", "0"); // Move
+ moveSuccess("moveabs", "1", "1", "0", "1", "1", "1", "1"); // Move down
+
+ moveSuccess("moveabs", "2", "1", "1", "1", "0", "1", "0"); // Move up
+ moveSuccess("moveabs", "1", "1", "0", "2", "0", "2", "0"); // Move
// right
- moveSuccess("moveabs", "3", "1", "0", "0", "0", "0", "0"); // Move left
- moveSuccess("moveabs", "2", "0", "1", "1", "2", "1", "2"); // Move
+ moveSuccess("moveabs", "3", "2", "0", "1", "0", "1", "0"); // Move left
+ moveSuccess("moveabs", "2", "1", "1", "2", "2", "2", "2"); // Move
// right &
// move down
- moveSuccess("moveabs", "3", "1", "0", "0", "1", "0", "1"); // Move left
+ moveSuccess("moveabs", "3", "2", "0", "1", "1", "1", "1"); // Move left
// & move
// down
- moveSuccess("moveabs", "4", "1", "1", "0", "0", "0", "0"); // Move left
+ moveSuccess("moveabs", "4", "2", "1", "1", "0", "1", "0"); // Move left
// & move up
- moveSuccess("moveabs", "1", "0", "0", "0", "2", "0", "1"); // Move too
+ moveSuccess("moveabs", "1", "1", "0", "1", "2", "1", "1"); // Move too
// far down,
// should be
// at end of
// row
- moveSuccess("moveabs", "2", "0", "1", "0", "2", "0", "1"); // Move too
+ moveSuccess("moveabs", "2", "1", "1", "1", "2", "1", "1"); // Move too
// far down,
// should be
// at end of
// row
- moveSuccess("moveabs", "3", "1", "0", "1", "3", "1", "2"); // Move too
+ moveSuccess("moveabs", "3", "2", "0", "2", "3", "2", "2"); // Move too
// far down,
// should be
// at end of
// row
- moveSuccess("moveabs", "4", "1", "1", "1", "3", "1", "2"); // Move too
+ moveSuccess("moveabs", "4", "2", "1", "2", "3", "2", "2"); // Move too
// far down,
// should be
// at end of
// row
- moveSuccess("moveabs", "5", "1", "2", "1", "3", "1", "2"); // Move too
+ moveSuccess("moveabs", "5", "2", "2", "2", "3", "2", "2"); // Move too
// far down,
// should be
// at end of
// row
- moveSuccess("moveabs", "1", "0", "0", "1", "4", "1", "3"); // Move too
+ moveSuccess("moveabs", "1", "1", "0", "2", "4", "2", "3"); // Move too
// far down,
// should be
// at end of
// row
- moveSuccess("moveabs", "2", "0", "1", "1", "4", "1", "3"); // Move too
+ moveSuccess("moveabs", "2", "1", "1", "2", "4", "2", "3"); // Move too
// far down,
// should be
// at end of
// row
- moveSuccess("moveleft", "1", "0", "0", "0", "0", "0", "0"); // Shouldn't
+ moveSuccess("moveleft", "1", "1", "0", "0", "0", "0", "0"); // Shouldn't
// move
- moveSuccess("moveleft", "2", "0", "1", "0", "1", "0", "1"); // Shouldn't
+ moveSuccess("moveleft", "6", "0", "0", "0", "0", "0", "0"); // Shouldn't
// move
- moveSuccess("moveleft", "3", "1", "0", "0", "0", "0", "0"); // Straight
+ moveSuccess("moveleft", "3", "2", "0", "1", "0", "1", "0"); // Straight
// across
- moveSuccess("moveleft", "4", "1", "1", "0", "1", "0", "1"); // Straight
+ moveSuccess("moveleft", "4", "2", "1", "1", "1", "1", "1"); // Straight
// across
- moveSuccess("moveleft", "5", "1", "2", "0", "2", "0", "2"); // Straight
+ moveSuccess("moveleft", "5", "2", "2", "1", "2", "1", "2"); // Straight
// across
- moveSuccess("moveright", "1", "0", "0", "1", "0", "1", "0"); // Straight
+ moveSuccess("moveright", "1", "1", "0", "2", "0", "2", "0"); // Straight
// across
- moveSuccess("moveright", "2", "0", "1", "1", "1", "1", "1"); // Straight
+ moveSuccess("moveright", "2", "1", "1", "2", "1", "2", "1"); // Straight
// across
- moveSuccess("moveright", "3", "1", "0", "1", "0", "1", "0"); // Shouldn't
- // move
- moveSuccess("moveright", "4", "1", "1", "1", "1", "1", "1"); // Shouldn't
+ moveSuccess("moveright", "3", "2", "0", "3", "0", "3", "0"); // Shouldn't
+// // move
+ moveSuccess("moveright", "4", "2", "1", "3", "0", "3", "0"); // Shouldn't
// move
- moveSuccess("moveright", "5", "1", "2", "1", "2", "1", "2"); // Shouldn't
+ moveSuccess("moveright", "5", "2", "2", "3", "0", "3", "0"); // Shouldn't
// move
- moveSuccess("moveup", "2", "0", "1", "0", "0", "0", "0"); // Straight
+ moveSuccess("moveup", "2", "1", "1", "1", "0", "1", "0"); // Straight
// across
- moveSuccess("moveup", "4", "1", "1", "1", "0", "1", "0"); // Straight
+ moveSuccess("moveup", "4", "2", "1", "2", "0", "2", "0"); // Straight
// across
- moveSuccess("moveup", "5", "1", "2", "1", "1", "1", "1"); // Straight
+ moveSuccess("moveup", "5", "2", "2", "2", "1", "2", "1"); // Straight
// across
- moveSuccess("movedown", "1", "0", "0", "0", "1", "0", "1"); // Straight
+ moveSuccess("movedown", "1", "1", "0", "1", "1", "1", "1"); // Straight
// across
- moveSuccess("movedown", "2", "0", "1", "0", "1", "0", "1"); // Shouldn't
+ moveSuccess("movedown", "2", "1", "1", "1", "1", "1", "1"); // Shouldn't
// move
- moveSuccess("movedown", "3", "1", "0", "1", "1", "1", "1"); // Straight
+ moveSuccess("movedown", "3", "2", "0", "2", "1", "2", "1"); // Straight
// across
- moveSuccess("movedown", "4", "1", "1", "1", "2", "1", "2"); // Straight
+ moveSuccess("movedown", "4", "2", "1", "2", "2", "2", "2"); // Straight
// across
- moveSuccess("movedown", "5", "1", "2", "1", "2", "1", "2"); // Shouldn't
+ moveSuccess("movedown", "5", "2", "2", "2", "2", "2", "2"); // Shouldn't
// move
}
@@ -368,7 +368,7 @@
}
}
- public void xtestRemove()
+ public void testRemove()
{
remove("1");
remove("2");
Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestPortletPlacement.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestPortletPlacement.java?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestPortletPlacement.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestPortletPlacement.java Thu May 17 14:33:57 2007
@@ -41,42 +41,42 @@
{
PortletPlacementContext ppc = new PortletPlacementContextImpl(requestContext);
int a_iNumCols = ppc.getNumberColumns();
- assertEquals(a_iNumCols, 2);
+ assertEquals(a_iNumCols, 3);
- int a_iNumRows = ppc.getNumberRows(0);
+ int a_iNumRows = ppc.getNumberRows(1);
assertEquals(a_iNumRows, 2);
- a_iNumRows = ppc.getNumberRows(1);
+ a_iNumRows = ppc.getNumberRows(2);
assertEquals(a_iNumRows, 3);
// Check the fragments
Fragment a_oFrag = ppc
- .getFragmentAtNewCoordinate(new CoordinateImpl(0, 0, 0, 0));
- assertNotNull("null fragment found at 0,0", a_oFrag);
+ .getFragmentAtNewCoordinate(new CoordinateImpl(1, 0, 1, 0));
+ assertNotNull("null fragment found at 1,0", a_oFrag);
assertEquals(a_oFrag.getId(), "1");
assertEquals(a_oFrag.getName(), "frag1");
- a_oFrag = ppc.getFragmentAtNewCoordinate(new CoordinateImpl(0, 0,
- 0, 1));
- assertNotNull("null fragment found at 0,0", a_oFrag);
+ a_oFrag = ppc.getFragmentAtNewCoordinate(new CoordinateImpl(1, 1,
+ 1, 1));
+ assertNotNull("null fragment found at 1,1", a_oFrag);
assertEquals(a_oFrag.getId(), "2");
assertEquals(a_oFrag.getName(), "frag2");
- a_oFrag = ppc.getFragmentAtNewCoordinate(new CoordinateImpl(0, 0,
- 1, 0));
- assertNotNull("null fragment found at 0,0", a_oFrag);
+ a_oFrag = ppc.getFragmentAtNewCoordinate(new CoordinateImpl(2, 0,
+ 2, 0));
+ assertNotNull("null fragment found at 2,0", a_oFrag);
assertEquals(a_oFrag.getId(), "3");
assertEquals(a_oFrag.getName(), "frag3");
- a_oFrag = ppc.getFragmentAtNewCoordinate(new CoordinateImpl(0, 0,
- 1, 1));
- assertNotNull("null fragment found at 0,0", a_oFrag);
+ a_oFrag = ppc.getFragmentAtNewCoordinate(new CoordinateImpl(2, 1,
+ 2, 1));
+ assertNotNull("null fragment found at 2,1", a_oFrag);
assertEquals(a_oFrag.getId(), "4");
assertEquals(a_oFrag.getName(), "frag4");
- a_oFrag = ppc.getFragmentAtNewCoordinate(new CoordinateImpl(0, 0,
- 1, 2));
- assertNotNull("null fragment found at 0,0", a_oFrag);
+ a_oFrag = ppc.getFragmentAtNewCoordinate(new CoordinateImpl(2, 2,
+ 2, 2));
+ assertNotNull("null fragment found at 2,2", a_oFrag);
assertEquals(a_oFrag.getId(), "5");
assertEquals(a_oFrag.getName(), "frag5");
@@ -136,16 +136,16 @@
PortletPlacementContext ppc = new PortletPlacementContextImpl(requestContext);
Fragment a_oFrag = ppc
- .getFragmentAtNewCoordinate(new CoordinateImpl(0, 0, 0, 0));
+ .getFragmentAtNewCoordinate(new CoordinateImpl(1, 0, 1, 0));
Coordinate a_oCoordinate = ppc.remove(a_oFrag);
- assertEquals(a_oCoordinate.getOldCol(), 0);
+ assertEquals(a_oCoordinate.getOldCol(), 1);
assertEquals(a_oCoordinate.getOldRow(), 0);
// Should be the second fragment now that the first has been deleted
- a_oFrag = ppc.getFragmentAtNewCoordinate(new CoordinateImpl(0, 0,
- 0, 0));
+ a_oFrag = ppc.getFragmentAtNewCoordinate(new CoordinateImpl(1, 0,
+ 1, 0));
assertEquals(a_oFrag.getId(), "2");
assertEquals(a_oFrag.getName(), "frag2");
} catch (PortletPlacementException e)
Modified: portals/jetspeed-2/trunk/components/rdbms/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rdbms/pom.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/rdbms/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/rdbms/pom.xml Thu May 17 14:33:57 2007
@@ -51,8 +51,8 @@
<artifactId>spring</artifactId>
</dependency>
<dependency>
- <groupId>org.springmodules</groupId>
- <artifactId>spring-modules-ojb</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-ojb</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
Modified: portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/dao/InitablePersistenceBrokerDaoSupport.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/dao/InitablePersistenceBrokerDaoSupport.java?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/dao/InitablePersistenceBrokerDaoSupport.java (original)
+++ portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/dao/InitablePersistenceBrokerDaoSupport.java Thu May 17 14:33:57 2007
@@ -21,7 +21,7 @@
import org.apache.ojb.broker.metadata.DescriptorRepository;
import org.apache.ojb.broker.metadata.MetadataManager;
import org.apache.ojb.broker.metadata.RepositoryPersistor;
-import org.springmodules.orm.ojb.support.PersistenceBrokerDaoSupport;
+import org.springframework.orm.ojb.support.PersistenceBrokerDaoSupport;
/**
* <p>
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java Thu May 17 14:33:57 2007
@@ -41,7 +41,7 @@
import org.apache.pluto.om.entity.PortletEntityCtrl;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.window.PortletWindow;
-import org.springmodules.orm.ojb.support.PersistenceBrokerDaoSupport;
+import org.springframework.orm.ojb.support.PersistenceBrokerDaoSupport;
/**
* <p>
Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java Thu May 17 14:33:57 2007
@@ -50,7 +50,7 @@
import org.apache.ojb.broker.query.Query;
import org.apache.ojb.broker.query.QueryByCriteria;
import org.apache.ojb.broker.query.QueryFactory;
-import org.springmodules.orm.ojb.support.PersistenceBrokerDaoSupport;
+import org.springframework.orm.ojb.support.PersistenceBrokerDaoSupport;
/**
* <p>
Modified: portals/jetspeed-2/trunk/components/serializer/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/pom.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/serializer/pom.xml Thu May 17 14:33:57 2007
@@ -48,7 +48,7 @@
<!-- Build Dependencies -->
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-core</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: portals/jetspeed-2/trunk/components/sso/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/sso/pom.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/sso/pom.xml Thu May 17 14:33:57 2007
@@ -72,6 +72,17 @@
<!-- Build Configuration -->
<build>
+ <testResources>
+ <testResource>
+ <directory>../../etc/log4j</directory>
+ </testResource>
+ <testResource>
+ <directory>../../etc/db-ojb</directory>
+ </testResource>
+ <testResource>
+ <directory>../../src/webapp/WEB-INF/assembly</directory>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: portals/jetspeed-2/trunk/components/statistics/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/pom.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/statistics/pom.xml Thu May 17 14:33:57 2007
@@ -87,6 +87,17 @@
<!-- Build Configuration -->
<build>
+ <testResources>
+ <testResource>
+ <directory>../../etc/log4j</directory>
+ </testResource>
+ <testResource>
+ <directory>../../etc/db-ojb</directory>
+ </testResource>
+ <testResource>
+ <directory>../../src/webapp/WEB-INF/assembly</directory>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java Thu May 17 14:33:57 2007
@@ -48,7 +48,7 @@
import org.apache.jetspeed.statistics.PortalStatistics;
import org.apache.jetspeed.statistics.StatisticsQueryCriteria;
import org.apache.jetspeed.statistics.UserStats;
-import org.springmodules.orm.ojb.support.PersistenceBrokerDaoSupport;
+import org.springframework.orm.ojb.support.PersistenceBrokerDaoSupport;
/**
* <p>
Modified: portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java Thu May 17 14:33:57 2007
@@ -310,7 +310,7 @@
request.setUserPrincipal(p);
- request.setRemoteAddr("192.168.2.3");
+ request.setRemoteAddr("123.234.145.156");
request.setSession(session);
request.setServerName("www.sporteportal.com");
request.setScheme("http");
Modified: portals/jetspeed-2/trunk/components/webapp-logging/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/webapp-logging/project.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/components/webapp-logging/project.xml (original)
+++ portals/jetspeed-2/trunk/components/webapp-logging/project.xml Thu May 17 14:33:57 2007
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<id>velocity</id>
- <version>1.4</version>
+ <version>1.5</version>
</dependency>
</dependencies>
Modified: portals/jetspeed-2/trunk/core-build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/core-build.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/core-build.xml (original)
+++ portals/jetspeed-2/trunk/core-build.xml Thu May 17 14:33:57 2007
@@ -76,14 +76,14 @@
<!-- Spring Framework and dependencies -->
<dependency>
- <id>springframework:spring</id>
+ <id>org.springframework:spring</id>
<version>${spring.version}</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
- <id>springmodules:spring-modules-ojb</id>
+ <id>org.springframework:spring-ojb</id>
<version>${spring.modules.version}</version>
<properties>
<war.bundle>true</war.bundle>
@@ -91,7 +91,7 @@
</dependency>
<dependency>
<id>cglib</id>
- <version>full-2.0.2</version>
+ <version>2.1_3</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -129,7 +129,7 @@
</dependency>
<dependency>
<id>oro</id>
- <version>2.0.7</version>
+ <version>2.0.8</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -143,7 +143,7 @@
</dependency>
<dependency>
<id>commons-configuration</id>
- <version>1.0</version>
+ <version>1.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -172,49 +172,49 @@
</dependency>
<dependency>
<id>commons-httpclient</id>
- <version>3.0</version>
+ <version>3.0.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>commons-fileupload</id>
- <version>1.0</version>
+ <version>1.2</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>commons-beanutils</id>
- <version>1.6.1</version>
+ <version>1.7.0</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>commons-collections</id>
- <version>3.1</version>
+ <version>3.2</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>commons-pool</id>
- <version>1.2</version>
+ <version>1.3</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>commons-dbcp</id>
- <version>1.2.1</version>
+ <version>1.2.2</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>commons-digester</id>
- <version>1.5</version>
+ <version>1.8</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -237,7 +237,7 @@
</dependency>
<dependency>
<id>mockrunner</id>
- <version>0.2.7</version>
+ <version>0.3.8</version>
<properties>
<war.bundle>false</war.bundle>
</properties>
@@ -253,7 +253,8 @@
<!--XML Apis and manipulation -->
<dependency>
<id>castor</id>
- <version>0.9.4.3</version>
+<!-- <version>1.1.1-xml</version> -->
+ <version>0.9.4.3</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -352,13 +353,6 @@
</dependency>
<!-- Serializer -->
- <dependency>
- <id>commons-beanutils</id>
- <version>1.6.1</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
<dependency>
<id>commons-betwixt</id>
<version>20061115</version>
Modified: portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml (original)
+++ portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml Thu May 17 14:33:57 2007
@@ -44,18 +44,26 @@
</property>
<property name="transactionAttributes">
<props>
- <prop key="*">PROPAGATION_SUPPORTS</prop>
- <prop key="get*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="add*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="folderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="pageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="linkExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="userFolderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="userPageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ <prop key="getPage*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="getLink*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="getFolder*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="getContentPage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="getAll">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="getUserFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removePage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removeFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removeLink">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removePageSecurity">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="createUserHomePagesFromRoles">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="folderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="pageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="linkExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="userFolderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="userPageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
</props>
</property>
</bean>
Modified: portals/jetspeed-2/trunk/etc/import/assembly/repository-datasource-spring.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/import/assembly/repository-datasource-spring.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/etc/import/assembly/repository-datasource-spring.xml (original)
+++ portals/jetspeed-2/trunk/etc/import/assembly/repository-datasource-spring.xml Thu May 17 14:33:57 2007
@@ -35,7 +35,7 @@
</property>
</bean>
- <bean id="ojbConfigurer" class="org.springmodules.orm.ojb.support.LocalOjbConfigurer"/>
+ <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>
<!--
Dynamically configures Database Platform for OJB by looking at the connection string
Modified: portals/jetspeed-2/trunk/jetspeed-components.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-components.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-components.xml (original)
+++ portals/jetspeed-2/trunk/jetspeed-components.xml Thu May 17 14:33:57 2007
@@ -266,14 +266,14 @@
<!-- Velocity dependencies -->
<dependency>
<id>velocity</id>
- <version>1.4</version>
+ <version>1.5</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>velocity-tools</id>
- <version>1.2</version>
+ <version>1.3</version>
<url>http://jakarta.apache.org/velocity</url>
<properties>
<war.bundle>true</war.bundle>
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml Thu May 17 14:33:57 2007
@@ -46,18 +46,26 @@
</property>
<property name="transactionAttributes">
<props>
- <prop key="*">PROPAGATION_SUPPORTS</prop>
- <prop key="get*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="add*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="folderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="pageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="linkExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="userFolderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="userPageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ <prop key="getPage*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="getLink*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="getFolder*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="getContentPage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="getAll">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="getUserFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removePage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removeFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removeLink">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removePageSecurity">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="createUserHomePagesFromRoles">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="folderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="pageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="linkExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="userFolderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="userPageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
</props>
</property>
</bean>
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml Thu May 17 14:33:57 2007
@@ -44,18 +44,26 @@
</property>
<property name="transactionAttributes">
<props>
- <prop key="*">PROPAGATION_SUPPORTS</prop>
- <prop key="get*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="add*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="folderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="pageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="linkExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="userFolderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="userPageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ <prop key="getPage*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="getLink*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="getFolder*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="getContentPage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="getAll">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="getUserFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removePage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removeFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removeLink">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removePageSecurity">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="createUserHomePagesFromRoles">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="folderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="pageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="linkExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="userFolderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="userPageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
</props>
</property>
</bean>
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/repository-datasource-spring.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/repository-datasource-spring.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/repository-datasource-spring.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/repository-datasource-spring.xml Thu May 17 14:33:57 2007
@@ -35,7 +35,7 @@
</property>
</bean>
- <bean id="ojbConfigurer" class="org.springmodules.orm.ojb.support.LocalOjbConfigurer"/>
+ <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>
<!--
Dynamically configures Database Platform for OJB by looking at the connection string
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml Thu May 17 14:33:57 2007
@@ -112,13 +112,13 @@
<torque.version>3.2-rc3</torque.version>
<!-- Project Dependency Version Properties -->
- <commons-collections.version>3.0</commons-collections.version>
- <commons-digester.version>1.5</commons-digester.version>
- <commons-logging.version>1.0.3</commons-logging.version>
+ <commons-collections.version>3.2</commons-collections.version>
+ <commons-digester.version>1.8</commons-digester.version>
+ <commons-logging.version>1.1</commons-logging.version>
<hsqldb.version>1.8.0.2</hsqldb.version>
<javax.servlet.jstl.version>1.1.2</javax.servlet.jstl.version>
<javax.servlet.version>2.3</javax.servlet.version>
- <log4j.version>1.2.8</log4j.version>
+ <log4j.version>1.2.14</log4j.version>
<org.apache.derby.version>10.1.1.0</org.apache.derby.version>
<org.apache.pluto.version>1.0.1</org.apache.pluto.version>
<org.apache.portals.bridges.common.version>1.0.2-RC</org.apache.portals.bridges.common.version>
@@ -128,8 +128,8 @@
<portlet-api.version>1.0</portlet-api.version>
<taglibs-request.version>1.0.1</taglibs-request.version>
<taglibs-standard.version>1.1.2</taglibs-standard.version>
- <velocity-tools.version>1.2</velocity-tools.version>
- <velocity.version>1.4</velocity.version>
+ <velocity-tools.version>1.3</velocity-tools.version>
+ <velocity.version>1.5</velocity.version>
<org.apache.portals.portal.version>${version}</org.apache.portals.portal.version>
<org.apache.portals.portal.name>${artifactId}</org.apache.portals.portal.name>
Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/pom.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Thu May 17 14:33:57 2007
@@ -134,7 +134,7 @@
<ant.version>1.6.5</ant.version>
<jmock.version>1.0.1</jmock.version>
<junit.version>3.8.1</junit.version>
- <mockrunner.version>0.2.7</mockrunner.version>
+ <mockrunner.version>0.3.8</mockrunner.version>
<org.apache.maven.artifact.ant.version>2.0.4</org.apache.maven.artifact.ant.version>
<!--
Bug: using specific version of surefire plugin
@@ -147,21 +147,22 @@
<!-- Project Dependency Version Properties -->
<aopalliance.version>1.0</aopalliance.version>
- <castor.version>0.9.4.3</castor.version>
- <cglib.version>2.0.2</cglib.version>
+<!-- <castor.version>1.1.1-xml</castor.version> -->
+ <castor.version>0.9.4.3</castor.version>
+ <cglib.version>2.1_3</cglib.version>
<commons-beanutils.version>1.7.0</commons-beanutils.version>
<commons-betwixt.version>20061115</commons-betwixt.version>
<commons-codec.version>1.3</commons-codec.version>
- <commons-collections.version>3.1</commons-collections.version>
+ <commons-collections.version>3.2</commons-collections.version>
<commons-configuration.version>1.1</commons-configuration.version>
- <commons-dbcp.version>1.2.1</commons-dbcp.version>
- <commons-digester.version>1.5</commons-digester.version>
- <commons-fileupload.version>1.0</commons-fileupload.version>
- <commons-httpclient.version>3.0</commons-httpclient.version>
+ <commons-dbcp.version>1.2.2</commons-dbcp.version>
+ <commons-digester.version>1.8</commons-digester.version>
+ <commons-fileupload.version>1.2</commons-fileupload.version>
+ <commons-httpclient.version>3.0.1</commons-httpclient.version>
<commons-io.version>0.1</commons-io.version>
<commons-lang.version>2.1</commons-lang.version>
- <commons-logging.version>1.0.3</commons-logging.version>
- <commons-pool.version>1.2</commons-pool.version>
+ <commons-logging.version>1.1</commons-logging.version>
+ <commons-pool.version>1.3</commons-pool.version>
<ddlutils.version>1.0-RC1-PATCHED</ddlutils.version>
<directory.version>0.9.3</directory.version>
<ehcache.version>1.2.4</ehcache.version>
@@ -175,9 +176,9 @@
<javax.transaction.version>1.0.1B</javax.transaction.version>
<jaxen.version>1.0-FCS</jaxen.version>
<jdom.version>1.0</jdom.version>
- <log4j.version>1.2.8</log4j.version>
+ <log4j.version>1.2.14</log4j.version>
<lucene.version>2.0.0</lucene.version>
- <myfaces.version>1.1.0</myfaces.version>
+ <myfaces.version>1.1.5</myfaces.version>
<nekohtml.version>0.9.5</nekohtml.version>
<ojb.version>1.0.3</ojb.version>
<org.apache.derby.version>10.1.1.0</org.apache.derby.version>
@@ -189,18 +190,18 @@
<org.apache.portals.bridges.jsf.version>1.0.2-RC</org.apache.portals.bridges.jsf.version>
<org.apache.portals.bridges.velocity.version>1.0.2-RC</org.apache.portals.bridges.velocity.version>
<org.apache.portals.bridges.portletfilter.version>1.0.2-RC</org.apache.portals.bridges.portletfilter.version>
- <oro.version>2.0.7</oro.version>
+ <oro.version>2.0.8</oro.version>
<portlet-api.version>1.0</portlet-api.version>
<regexp.version>1.2</regexp.version>
<rome.version>0.8</rome.version>
<saxpath.version>1.0-FCS</saxpath.version>
- <spring.version>2.0</spring.version>
- <spring.modules.version>0.6</spring.modules.version>
+ <spring.version>2.0.5</spring.version>
+ <spring.modules.version>2.0-rc2</spring.modules.version>
<taglibs-random.version>1.0.2</taglibs-random.version>
<taglibs-request.version>1.0.1</taglibs-request.version>
<taglibs-standard.version>1.1.2</taglibs-standard.version>
- <velocity-tools.version>1.2</velocity-tools.version>
- <velocity.version>1.4</velocity.version>
+ <velocity-tools.version>1.3</velocity-tools.version>
+ <velocity.version>1.5</velocity.version>
<xalan.version>2.4.1</xalan.version>
<xerces.version>2.3.0</xerces.version>
<xml-apis.version>1.0.b2</xml-apis.version>
@@ -519,7 +520,7 @@
<!-- Spring Framework -->
<dependency>
<groupId>cglib</groupId>
- <artifactId>cglib-full</artifactId>
+ <artifactId>cglib</artifactId>
<version>${cglib.version}</version>
</dependency>
<dependency>
@@ -531,7 +532,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>${spring.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-portlet</artifactId>
@@ -574,8 +575,8 @@
</dependency>
<!-- Spring Framework Modules -->
<dependency>
- <groupId>org.springmodules</groupId>
- <artifactId>spring-modules-ojb</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-ojb</artifactId>
<version>${spring.modules.version}</version>
</dependency>
@@ -743,11 +744,6 @@
<groupId>javolution</groupId>
<artifactId>javolution</artifactId>
<version>${javolution.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>${commons-beanutils.version}</version>
</dependency>
<dependency>
<groupId>commons-betwixt</groupId>
Modified: portals/jetspeed-2/trunk/project.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/project.properties?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/project.properties (original)
+++ portals/jetspeed-2/trunk/project.properties Thu May 17 14:33:57 2007
@@ -19,7 +19,7 @@
pluto.version=1.0.1
portlet.api.version=1.0
servlet.api.version=2.3
-myfaces.version=1.1.0
+myfaces.version=1.1.5
bridges.groupId=org.apache.portals.bridges
portals.bridges.version=1.0.2-RC
portals.bridges.common.version=1.0.2-RC
@@ -31,16 +31,16 @@
portals.bridges.jpetstore.version=1.0.2-RC
portals.bridges.velocity.version=1.0.2-RC
portals.bridges.portletfilter.version=1.0.2-RC
-commons.logging.version=1.0.3
-spring.version=2.0
-spring.modules.version=0.6
+commons.logging.version=1.1
+spring.version=2.0.5
+spring.modules.version=2.0-rc2
derby.version=10.1.1.0
hsql.version=1.8.0.2
# Whether or not to include commons-logging in war files. Your container may already have this.
commons.logging.include=true
-log4j.version=1.2.8
+log4j.version=1.2.14
# Whether or not to include log4j in war files. Your container may already have this.
log4j.include=true
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org