Author: olamy
Date: Wed Apr 11 08:31:54 2012
New Revision: 1324629
URL: http://svn.apache.org/viewvc?rev=1324629&view=rev
Log:
remove not anymore needed @plexus. javadoc tags
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/builder/DefaultCacheBuilder.java
archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/resources/META-INF/spring-context.xml
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-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCache.java
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCache.java
archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/DefaultWineService.java
archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/MockWineDao.java
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/builder/DefaultCacheBuilder.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/builder/DefaultCacheBuilder.java?rev=1324629&r1=1324628&r2=1324629&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/builder/DefaultCacheBuilder.java
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/builder/DefaultCacheBuilder.java
Wed Apr 11 08:31:54 2012
@@ -35,7 +35,6 @@ import javax.inject.Inject;
*
* @author Olivier Lamy
* @version $Id$
- * @plexus.component
role="org.apache.archiva.redback.components.cache.builder.CacheBuilder"
role-hint="default"
*/
@Service
public class DefaultCacheBuilder
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/resources/META-INF/spring-context.xml?rev=1324629&r1=1324628&r2=1324629&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/resources/META-INF/spring-context.xml
Wed Apr 11 08:31:54 2012
@@ -28,6 +28,6 @@
<context:annotation-config />
<context:component-scan
- base-package="org.codehaus.plexus.cache.builder"/>
+ base-package="org.apache.archiva.redback.components.cache.builder"/>
</beans>
\ No newline at end of file
Modified:
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/codehaus/plexus/cache/ehcache/EhcacheCache.java?rev=1324629&r1=1324628&r2=1324629&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/codehaus/plexus/cache/ehcache/EhcacheCache.java
Wed Apr 11 08:31:54 2012
@@ -37,7 +37,6 @@ import javax.annotation.PostConstruct;
* @author <a href="mailto:[email protected]">Joakim Erdfelt</a>
* @version $Id$
*
- * @plexus.component role="org.apache.archiva.redback.components.cache.Cache"
role-hint="ehcache"
*/
public class EhcacheCache
implements org.apache.archiva.redback.components.cache.Cache
@@ -86,63 +85,59 @@ public class EhcacheCache
/**
* how often to run the disk store expiry thread. A large number of 120
seconds plus is recommended
*
- * @plexus.configuration default-value="600"
*/
private long diskExpiryThreadIntervalSeconds = 600;
/**
* Whether to persist the cache to disk between JVM restarts.
*
- * @plexus.configuration default-value="true"
*/
private boolean diskPersistent = true;
/**
* Location on disk for the ehcache store.
*
- * @plexus.configuration default-value="${java.io.tmpdir}/ehcache"
*/
private String diskStorePath = System.getProperty( "java.io.tmpdir" ) +
"/ehcache";
/**
- * @plexus.configuration default-value="false"
+ *
*/
private boolean eternal = false;
/**
- * @plexus.configuration default-value="1000"
+ *
*/
private int maxElementsInMemory = 1000;
/**
- * @plexus.configuration default-value="LRU"
+ *
*/
private String memoryEvictionPolicy = "LRU";
/**
- * @plexus.configuration default-value="cache"
+ *
*/
private String name = "cache";
/**
* Flag indicating when to use the disk store.
*
- * @plexus.configuration default-value="false"
*/
private boolean overflowToDisk = false;
/**
- * @plexus.configuration default-value="600"
+ *
*/
private int timeToIdleSeconds = 600;
/**
- * @plexus.configuration default-value="300"
+ *
*/
private int timeToLiveSeconds = 300;
/**
- * @plexus.configuration default-value="false"
+ *
*/
private boolean failOnDuplicateCache = false;
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCache.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCache.java?rev=1324629&r1=1324628&r2=1324629&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCache.java
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCache.java
Wed Apr 11 08:31:54 2012
@@ -55,7 +55,6 @@ import java.util.Map;
* @author <a href="mailto:[email protected]">Joakim Erdfelt</a>
* @version $Id$
*
- * @plexus.component role="org.apache.archiva.redback.components.cache.Cache"
role-hint="hashmap"
*/
@Service("cache#hashmap")
public class HashMapCache
@@ -87,19 +86,18 @@ public class HashMapCache
private Map cache;
/**
- * @plexus.configuration default-value="1.0"
+ *
*/
private double cacheHitRatio = 1.0;
/**
- * @plexus.configuration default-value="0"
+ *
*/
private int cacheMaxSize = 0;
/**
*
- * @plexus.configuration
- * default-value="0"
+ *
*/
private int refreshTime;
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCache.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCache.java?rev=1324629&r1=1324628&r2=1324629&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCache.java
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCache.java
Wed Apr 11 08:31:54 2012
@@ -37,7 +37,6 @@ import java.util.Properties;
* @version $Id$
* @author <a href="mailto:[email protected]">Olivier Lamy</a>
*
- * @plexus.component role="org.apache.archiva.redback.components.cache.Cache"
role-hint="oscache"
*/
public class OsCacheCache
implements Cache
@@ -53,62 +52,58 @@ public class OsCacheCache
/**
* use memory cache
*
- * @plexus.configuration default-value="true"
*/
private boolean cacheMemory = true;
/**
* maximum item numbers default value -1 means unlimited
*
- * @plexus.configuration default-value="-1"
*/
private int capacity = -1;
/**
* cache algorithm
- * @plexus.configuration
default-value="com.opensymphony.oscache.base.algorithm.UnlimitedCache"
*/
private String cacheAlgorithm;
/**
- * @plexus.configuration default-value="false"
+ *
*/
private boolean blockingCache = false;
/**
- * @plexus.configuration default-value="false"
+ *
*/
private boolean cacheUnlimitedDisk = false;
/**
- * @plexus.configuration
+ *
*/
private String cachePersistenceClass;
/**
- * @plexus.configuration
+ *
*/
private String cachePath;
/**
- * @plexus.configuration default-value="false"
+ *
*/
private boolean cachePersistenceOverflowOnly = false;
/**
* A default one will be added to provided CacheStatistics
- *
- * @plexus.configuration
+ *
*/
private List cacheEventListeners;
/**
- * @plexus.configuration default-value="oscache"
+ *
*/
private String cacheKey;
/**
- * @plexus.configuration default-value="false"
+ *
*/
private boolean cacheUseHostDomainInKey = false;
@@ -119,7 +114,6 @@ public class OsCacheCache
/**
* default Value {@link CacheEntry#INDEFINITE_EXPIRY}
- * @plexus.configuration
*/
private int refreshPeriod = CacheEntry.INDEFINITE_EXPIRY;
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/DefaultWineService.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/DefaultWineService.java?rev=1324629&r1=1324628&r2=1324629&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/DefaultWineService.java
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/DefaultWineService.java
Wed Apr 11 08:31:54 2012
@@ -28,8 +28,6 @@ import javax.inject.Inject;
* @since 5 February, 2007
* @version $Id$
* @author Olivier Lamy
- * @plexus.component
- * role="org.codehaus.plexus.cache.test.examples.wine.WineService"
role-hint="default"
*/
@Service
public class DefaultWineService
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/MockWineDao.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/MockWineDao.java?rev=1324629&r1=1324628&r2=1324629&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/MockWineDao.java
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/MockWineDao.java
Wed Apr 11 08:31:54 2012
@@ -25,8 +25,6 @@ import org.springframework.stereotype.Re
* @since 5 February, 2007
* @version $Id$
* @author Olivier Lamy
- * @plexus.component
- * role="org.codehaus.plexus.cache.test.examples.wine.WineDao"
role-hint="mock"
*/
@Repository
public class MockWineDao