You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@excalibur.apache.org by cz...@apache.org on 2008/03/27 20:09:24 UTC
svn commit: r641953 - in /excalibur/trunk/components/sourceresolve: api/
api/src/main/java/org/apache/excalibur/source/validity/
impl/src/main/java/org/apache/excalibur/source/factories/
impl/src/main/java/org/apache/excalibur/source/impl/validity/
Author: cziegeler
Date: Thu Mar 27 12:09:20 2008
New Revision: 641953
URL: http://svn.apache.org/viewvc?rev=641953&view=rev
Log:
Move validity implementations to api.
Added:
excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/
excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/AggregatedValidity.java
- copied, changed from r587641, excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/AggregatedValidity.java
excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/ExpiresValidity.java
- copied, changed from r587641, excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/ExpiresValidity.java
excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/FileTimeStampValidity.java
- copied, changed from r587641, excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/FileTimeStampValidity.java
excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/NOPValidity.java
- copied, changed from r587641, excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/NOPValidity.java
excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/TimeStampValidity.java
- copied, changed from r587641, excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/TimeStampValidity.java
Removed:
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/AbstractAggregatedValidity.java
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/AggregatedValidity.java
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/DeferredAggregatedValidity.java
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/DeferredValidity.java
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/ExpiresValidity.java
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/FileTimeStampValidity.java
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/NOPValidity.java
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/TimeStampValidity.java
Modified:
excalibur/trunk/components/sourceresolve/api/pom.xml
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/FileSource.java
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/HTTPClientSource.java
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/ResourceSource.java
excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/URLSource.java
Modified: excalibur/trunk/components/sourceresolve/api/pom.xml
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/api/pom.xml?rev=641953&r1=641952&r2=641953&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/api/pom.xml (original)
+++ excalibur/trunk/components/sourceresolve/api/pom.xml Thu Mar 27 12:09:20 2008
@@ -39,6 +39,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
Copied: excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/AggregatedValidity.java (from r587641, excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/AggregatedValidity.java)
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/AggregatedValidity.java?p2=excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/AggregatedValidity.java&p1=excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/AggregatedValidity.java&r1=587641&r2=641953&rev=641953&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/AggregatedValidity.java (original)
+++ excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/AggregatedValidity.java Thu Mar 27 12:09:20 2008
@@ -14,8 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.excalibur.source.impl.validity;
+package org.apache.excalibur.source.validity;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -28,9 +30,36 @@
* @version $Id$
*/
public final class AggregatedValidity
- extends AbstractAggregatedValidity
implements SourceValidity
{
+ final ArrayList m_list = new ArrayList();
+
+ public void add( final SourceValidity validity )
+ {
+ m_list.add( validity );
+ }
+
+ public String toString()
+ {
+ final StringBuffer sb = new StringBuffer( "SourceValidity " );
+ for( final Iterator i = m_list.iterator(); i.hasNext(); )
+ {
+ sb.append( i.next() );
+ if( i.hasNext() ) sb.append( ':' );
+ }
+ return sb.toString();
+ }
+
+ public List getValidities()
+ {
+ return Collections.unmodifiableList(m_list);
+ }
+
+ SourceValidity getValidity(final int index)
+ {
+ return (SourceValidity) m_list.get(index);
+ }
+
/**
* Check if the component is still valid.
* If <code>0</code> is returned the isValid(SourceValidity) must be
Copied: excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/ExpiresValidity.java (from r587641, excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/ExpiresValidity.java)
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/ExpiresValidity.java?p2=excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/ExpiresValidity.java&p1=excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/ExpiresValidity.java&r1=587641&r2=641953&rev=641953&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/ExpiresValidity.java (original)
+++ excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/ExpiresValidity.java Thu Mar 27 12:09:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.excalibur.source.impl.validity;
+package org.apache.excalibur.source.validity;
import org.apache.excalibur.source.SourceValidity;
Copied: excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/FileTimeStampValidity.java (from r587641, excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/FileTimeStampValidity.java)
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/FileTimeStampValidity.java?p2=excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/FileTimeStampValidity.java&p1=excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/FileTimeStampValidity.java&r1=587641&r2=641953&rev=641953&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/FileTimeStampValidity.java (original)
+++ excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/FileTimeStampValidity.java Thu Mar 27 12:09:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.excalibur.source.impl.validity;
+package org.apache.excalibur.source.validity;
import java.io.File;
Copied: excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/NOPValidity.java (from r587641, excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/NOPValidity.java)
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/NOPValidity.java?p2=excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/NOPValidity.java&p1=excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/NOPValidity.java&r1=587641&r2=641953&rev=641953&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/NOPValidity.java (original)
+++ excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/NOPValidity.java Thu Mar 27 12:09:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.excalibur.source.impl.validity;
+package org.apache.excalibur.source.validity;
import org.apache.excalibur.source.SourceValidity;
Copied: excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/TimeStampValidity.java (from r587641, excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/TimeStampValidity.java)
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/TimeStampValidity.java?p2=excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/TimeStampValidity.java&p1=excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/TimeStampValidity.java&r1=587641&r2=641953&rev=641953&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/impl/validity/TimeStampValidity.java (original)
+++ excalibur/trunk/components/sourceresolve/api/src/main/java/org/apache/excalibur/source/validity/TimeStampValidity.java Thu Mar 27 12:09:20 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.excalibur.source.impl.validity;
+package org.apache.excalibur.source.validity;
import org.apache.excalibur.source.SourceValidity;
Modified: excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/FileSource.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/FileSource.java?rev=641953&r1=641952&r2=641953&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/FileSource.java (original)
+++ excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/FileSource.java Thu Mar 27 12:09:20 2008
@@ -37,7 +37,7 @@
import org.apache.excalibur.source.SourceNotFoundException;
import org.apache.excalibur.source.SourceUtil;
import org.apache.excalibur.source.SourceValidity;
-import org.apache.excalibur.source.impl.validity.FileTimeStampValidity;
+import org.apache.excalibur.source.validity.FileTimeStampValidity;
/**
* A {@link ModifiableTraversableSource} for filesystem objects.
Modified: excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/HTTPClientSource.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/HTTPClientSource.java?rev=641953&r1=641952&r2=641953&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/HTTPClientSource.java (original)
+++ excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/HTTPClientSource.java Thu Mar 27 12:09:20 2008
@@ -51,7 +51,7 @@
import org.apache.excalibur.source.SourceUtil;
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.AbstractLoggable;
-import org.apache.excalibur.source.impl.validity.TimeStampValidity;
+import org.apache.excalibur.source.validity.TimeStampValidity;
/**
* HTTP URL Source object, based on the Jakarta Commons
Modified: excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/ResourceSource.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/ResourceSource.java?rev=641953&r1=641952&r2=641953&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/ResourceSource.java (original)
+++ excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/ResourceSource.java Thu Mar 27 12:09:20 2008
@@ -28,7 +28,7 @@
import org.apache.excalibur.source.SourceUtil;
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.AbstractSource;
-import org.apache.excalibur.source.impl.validity.TimeStampValidity;
+import org.apache.excalibur.source.validity.TimeStampValidity;
/**
* Description of a source which is described by the resource protocol
Modified: excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/URLSource.java
URL: http://svn.apache.org/viewvc/excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/URLSource.java?rev=641953&r1=641952&r2=641953&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/URLSource.java (original)
+++ excalibur/trunk/components/sourceresolve/impl/src/main/java/org/apache/excalibur/source/factories/URLSource.java Thu Mar 27 12:09:20 2008
@@ -34,7 +34,7 @@
import org.apache.excalibur.source.SourceUtil;
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.AbstractSource;
-import org.apache.excalibur.source.impl.validity.TimeStampValidity;
+import org.apache.excalibur.source.validity.TimeStampValidity;
/**
* Description of a source which is described by an URL.
---------------------------------------------------------------------
To unsubscribe, e-mail: scm-unsubscribe@excalibur.apache.org
For additional commands, e-mail: scm-help@excalibur.apache.org