svn commit: r1324639 - in /archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src: main/java/org/apache/ main/java/org/apache/archiva/ main/java/org/apache/archiva/redback/ main/java/org/apache/archiva/red...

Wed, 11 Apr 2012 01:46:14 -0700 

Author: olamy
Date: Wed Apr 11 08:45:47 2012
New Revision: 1324639

URL: http://svn.apache.org/viewvc?rev=1324639&view=rev
Log:
use o.a.a package namespace for spring-cache-ehcache component

Added:
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/cache/
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/cache/ehcache/
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCache.java
      - copied, changed from r1324633, 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCache.java
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCreator.java
      - copied, changed from r1324633, 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCreator.java
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/redback/
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/redback/components/
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/redback/components/cache/
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/redback/components/cache/ehcache/
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCacheTest.java
      - copied, changed from r1324636, 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/codehaus/plexus/cache/ehcache/EhcacheCacheTest.java
Removed:
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/codehaus/
Modified:
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/resources/META-INF/plexus-cache.properties
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/resources/META-INF/spring-context.xml
    
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/resources/spring-context.xml

Copied: 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCache.java
 (from r1324633, 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCache.java)
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCache.java?p2=archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCache.java&p1=archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCache.java&r1=1324633&r2=1324639&rev=1324639&view=diff
==============================================================================
--- 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCache.java
 (original)
+++ 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCache.java
 Wed Apr 11 08:45:47 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache.ehcache;
+package org.apache.archiva.redback.components.cache.ehcache;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCreator.java
 (from r1324633, 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCreator.java)
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCreator.java?p2=archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCreator.java&p1=archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCreator.java&r1=1324633&r2=1324639&rev=1324639&view=diff
==============================================================================
--- 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCreator.java
 (original)
+++ 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCreator.java
 Wed Apr 11 08:45:47 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache.ehcache;
+package org.apache.archiva.redback.components.cache.ehcache;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/resources/META-INF/plexus-cache.properties
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/resources/META-INF/plexus-cache.properties?rev=1324639&r1=1324638&r2=1324639&view=diff
==============================================================================
--- 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/resources/META-INF/plexus-cache.properties
 (original)
+++ 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/resources/META-INF/plexus-cache.properties
 Wed Apr 11 08:45:47 2012
@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-cache.creator=org.codehaus.plexus.cache.ehcache.EhcacheCreator
\ No newline at end of file
+cache.creator=org.apache.archiva.redback.components.cache.ehcache.EhcacheCreator
\ No newline at end of file

Modified: 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/resources/META-INF/spring-context.xml
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/resources/META-INF/spring-context.xml?rev=1324639&r1=1324638&r2=1324639&view=diff
==============================================================================
--- 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/resources/META-INF/spring-context.xml
 (original)
+++ 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/resources/META-INF/spring-context.xml
 Wed Apr 11 08:45:47 2012
@@ -29,6 +29,6 @@
 
   <context:annotation-config />
   <context:component-scan 
-    base-package="org.codehaus.plexus.cache.ehcache"/>
+    base-package="org.apache.archiva.redback.components.cache.ehcache"/>
  
 </beans>
\ No newline at end of file

Copied: 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCacheTest.java
 (from r1324636, 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/codehaus/plexus/cache/ehcache/EhcacheCacheTest.java)
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCacheTest.java?p2=archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCacheTest.java&p1=archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/codehaus/plexus/cache/ehcache/EhcacheCacheTest.java&r1=1324636&r2=1324639&rev=1324639&view=diff
==============================================================================
--- 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/codehaus/plexus/cache/ehcache/EhcacheCacheTest.java
 (original)
+++ 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCacheTest.java
 Wed Apr 11 08:45:47 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache.ehcache;
+package org.apache.archiva.redback.components.cache.ehcache;
 
 /*
  * Copyright 2001-2007 The Codehaus.
@@ -17,6 +17,7 @@ package org.codehaus.plexus.cache.ehcach
  */
 
 import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.redback.components.cache.ehcache.EhcacheCache;
 import org.apache.archiva.redback.components.cache.test.AbstractCacheTestCase;
 
 import javax.inject.Inject;

Modified: 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/resources/spring-context.xml
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/resources/spring-context.xml?rev=1324639&r1=1324638&r2=1324639&view=diff
==============================================================================
--- 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/resources/spring-context.xml
 (original)
+++ 
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/resources/spring-context.xml
 Wed Apr 11 08:45:47 2012
@@ -20,14 +20,11 @@
   -->
 <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-3.0.xsd
-           http://www.springframework.org/schema/context 
-           
http://www.springframework.org/schema/context/spring-context-3.0.xsd";>
+           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
 
 
-  <bean name="cache#ehcache" 
class="org.codehaus.plexus.cache.ehcache.EhcacheCache">
+  <bean name="cache#ehcache" 
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
     <property name="diskExpiryThreadIntervalSeconds" value="600"/>
     <property name="diskPersistent" value="false"/>
     <property name="diskStorePath" value="./target/ehcache-test-store"/>
@@ -40,7 +37,7 @@
     <property name="timeToLiveSeconds" value="300"/>
   </bean>
 
-  <bean name="cache#alwaysrefresh" 
class="org.codehaus.plexus.cache.ehcache.EhcacheCache">
+  <bean name="cache#alwaysrefresh" 
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
     <property name="diskExpiryThreadIntervalSeconds" value="600"/>
     <property name="diskPersistent" value="false"/>
     <property name="diskStorePath" value="./target/ehcache-test-store"/>
@@ -53,7 +50,7 @@
     <property name="timeToLiveSeconds" value="-1"/>
   </bean>
 
-  <bean name="cache#neverrefresh" 
class="org.codehaus.plexus.cache.ehcache.EhcacheCache">
+  <bean name="cache#neverrefresh" 
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
     <property name="diskExpiryThreadIntervalSeconds" value="600"/>
     <property name="diskPersistent" value="false"/>
     <property name="diskStorePath" value="./target/ehcache-test-store"/>
@@ -66,7 +63,7 @@
     <property name="timeToLiveSeconds" value="-1"/>
   </bean>
 
-  <bean name="cache#onesecondrefresh" 
class="org.codehaus.plexus.cache.ehcache.EhcacheCache">
+  <bean name="cache#onesecondrefresh" 
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
     <property name="diskExpiryThreadIntervalSeconds" value="600"/>
     <property name="diskPersistent" value="false"/>
     <property name="diskStorePath" value="./target/ehcache-test-store"/>
@@ -79,7 +76,7 @@
     <property name="timeToLiveSeconds" value="1"/>
   </bean>
 
-  <bean name="cache#twosecondrefresh" 
class="org.codehaus.plexus.cache.ehcache.EhcacheCache">
+  <bean name="cache#twosecondrefresh" 
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
     <property name="diskExpiryThreadIntervalSeconds" value="600"/>
     <property name="diskPersistent" value="false"/>
     <property name="diskStorePath" value="./target/ehcache-test-store"/>

Reply via email to