portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r725897 - in /portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE: ./ components/page-manager/ maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/ src/webapp/WEB-INF/assembly/
Date Fri, 12 Dec 2008 03:47:39 GMT
Author: rwatler
Date: Thu Dec 11 19:47:38 2008
New Revision: 725897

URL: http://svn.apache.org/viewvc?rev=725897&view=rev
Log:
M1 Build Fixes For Distributed Cache Backport
- added ehcache 1.5.0 dependencies
- corrected page-manager unit test configuration for new tests


Modified:
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/project.xml
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/core-build.xml
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/cache.xml
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/cache.xml

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/project.xml?rev=725897&r1=725896&r2=725897&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/project.xml
(original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/project.xml
Thu Dec 11 19:47:38 2008
@@ -90,6 +90,7 @@
             <excludes>
                 <exclude>**/PageManagerTestShared.java</exclude>
               <exclude>**/DirectoryXMLTransform.java</exclude>
+              <exclude>**/DatabasePageManagerServer.java</exclude>
             </excludes>
             <resources>
                 <resource>
@@ -110,6 +111,10 @@
                 </resource>
                 <resource>
                     <directory>${basedir}/../../etc/db-ojb</directory>
+                    <excludes>
+                        <exclude>**/ehcache.xml</exclude>
+                        <exclude>**/distributed-ehcache.xml</exclude>
+                    </excludes>
                 </resource>
                 <resource>
                     <directory>${basedir}/../../src/webapp/WEB-INF/assembly</directory>

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/core-build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/core-build.xml?rev=725897&r1=725896&r2=725897&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/core-build.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/core-build.xml Thu Dec 11
19:47:38 2008
@@ -106,7 +106,21 @@
 	    </dependency>
 	    <dependency>
 	      <id>ehcache</id>
-	      <version>1.2.4</version>
+	      <version>1.5.0</version>
+	      <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>
+	    <dependency>
+	      <id>backport-util-concurrent</id>
+	      <version>3.1</version>
+	      <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>
+	    <dependency>
+	      <id>jsr107cache</id>
+	      <version>1.0</version>
 	      <properties>
 	        <war.bundle>true</war.bundle>
 	      </properties>
@@ -251,6 +265,13 @@
 	        <war.bundle>false</war.bundle>
 	      </properties>
 	    </dependency>      
+	    <dependency>
+	      <id>commons-jexl</id>
+	      <version>1.1</version>
+		  <properties>
+	        <war.bundle>false</war.bundle>
+	      </properties>
+	    </dependency>      
 	
 		<!--XML Apis and manipulation -->
 	    <dependency>

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/cache.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/cache.xml?rev=725897&r1=725896&r2=725897&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/cache.xml
(original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/cache.xml
Thu Dec 11 19:47:38 2008
@@ -20,6 +20,7 @@
 
     <!-- Cache Manager -->
     <bean id="cacheManagerConfig" class="org.apache.jetspeed.cache.impl.EhCacheConfigResource">
+        <!-- <property name="defaultConfigResource" value="distributed-ehcache.xml"/>
-->
         <property name="defaultConfigResource" value="ehcache.xml"/>
     </bean>
 

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/cache.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/cache.xml?rev=725897&r1=725896&r2=725897&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/cache.xml
(original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/cache.xml
Thu Dec 11 19:47:38 2008
@@ -20,6 +20,7 @@
 
     <!-- Cache Manager -->
     <bean id="cacheManagerConfig" class="org.apache.jetspeed.cache.impl.EhCacheConfigResource">
+        <!-- <property name="defaultConfigResource" value="distributed-ehcache.xml"/>
-->
         <property name="defaultConfigResource" value="ehcache.xml"/>
     </bean>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message