You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by rg...@apache.org on 2006/11/20 23:43:03 UTC
svn commit: r477381 - in /forrest/trunk/whiteboard/forrest2/src: conf/
core/org/apache/forrest/core/ core/org/apache/forrest/core/reader/
core/org/apache/forrest/reader/ examples/affiliateProductCatalogue/src/
examples/helloWorld/src/ test/
Author: rgardler
Date: Mon Nov 20 14:43:02 2006
New Revision: 477381
URL: http://svn.apache.org/viewvc?view=rev&rev=477381
Log:
Move reader package into core package to bring into line with other package names
Added:
forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/
- copied from r476652, forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/
forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/AbstractReader.java
- copied, changed from r477380, forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/AbstractReader.java
forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/ChainedReader.java
- copied, changed from r477380, forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/ChainedReader.java
forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/FileReader.java
- copied, changed from r477380, forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/FileReader.java
forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/HTTPReader.java
- copied, changed from r477380, forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/HTTPReader.java
forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/IReader.java
- copied, changed from r477380, forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/IReader.java
Removed:
forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/
Modified:
forrest/trunk/whiteboard/forrest2/src/conf/defaultForrestContext.xml
forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/Controller.java
forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/IController.java
forrest/trunk/whiteboard/forrest2/src/examples/affiliateProductCatalogue/src/forrestContext.xml
forrest/trunk/whiteboard/forrest2/src/examples/helloWorld/src/forrestContext.xml
forrest/trunk/whiteboard/forrest2/src/test/forrestContext.xml
Modified: forrest/trunk/whiteboard/forrest2/src/conf/defaultForrestContext.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/src/conf/defaultForrestContext.xml?view=diff&rev=477381&r1=477380&r2=477381
==============================================================================
--- forrest/trunk/whiteboard/forrest2/src/conf/defaultForrestContext.xml (original)
+++ forrest/trunk/whiteboard/forrest2/src/conf/defaultForrestContext.xml Mon Nov 20 14:43:02 2006
@@ -18,6 +18,13 @@
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
+
+ <!-- ============================================= -->
+ <!-- Readers -->
+ <!-- ============================================= -->
+
+ <bean id="http" class="org.apache.forrest.core.reader.HTTPReader"></bean>
+ <bean id="file" class="org.apache.forrest.core.reader.FileReader"></bean>
<!-- ============================================= -->
<!-- Input Plugins -->
@@ -33,12 +40,5 @@
<property name="xsltPath"
value="/xdocs/samples/xslt/internal-to-html.xsl" />
</bean>
-
- <!-- ============================================= -->
- <!-- Readers -->
- <!-- ============================================= -->
-
- <bean id="http" class="org.apache.forrest.reader.HTTPReader"></bean>
- <bean id="file" class="org.apache.forrest.reader.FileReader"></bean>
</beans>
Modified: forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/Controller.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/Controller.java?view=diff&rev=477381&r1=477380&r2=477381
==============================================================================
--- forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/Controller.java (original)
+++ forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/Controller.java Mon Nov 20 14:43:02 2006
@@ -39,7 +39,7 @@
import org.apache.forrest.core.plugin.AbstractInputPlugin;
import org.apache.forrest.core.plugin.BaseOutputPlugin;
import org.apache.forrest.core.plugin.PassThroughInputPlugin;
-import org.apache.forrest.reader.IReader;
+import org.apache.forrest.core.reader.IReader;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
Modified: forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/IController.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/IController.java?view=diff&rev=477381&r1=477380&r2=477381
==============================================================================
--- forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/IController.java (original)
+++ forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/IController.java Mon Nov 20 14:43:02 2006
@@ -13,7 +13,7 @@
import org.apache.forrest.core.locationMap.Location;
import org.apache.forrest.core.plugin.AbstractInputPlugin;
import org.apache.forrest.core.plugin.BaseOutputPlugin;
-import org.apache.forrest.reader.IReader;
+import org.apache.forrest.core.reader.IReader;
public interface IController {
Copied: forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/AbstractReader.java (from r477380, forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/AbstractReader.java)
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/AbstractReader.java?view=diff&rev=477381&p1=forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/AbstractReader.java&r1=477380&p2=forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/AbstractReader.java&r2=477381
==============================================================================
--- forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/AbstractReader.java (original)
+++ forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/AbstractReader.java Mon Nov 20 14:43:02 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.forrest.reader;
+package org.apache.forrest.core.reader;
public abstract class AbstractReader implements IReader {
Copied: forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/ChainedReader.java (from r477380, forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/ChainedReader.java)
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/ChainedReader.java?view=diff&rev=477381&p1=forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/ChainedReader.java&r1=477380&p2=forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/ChainedReader.java&r2=477381
==============================================================================
--- forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/ChainedReader.java (original)
+++ forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/ChainedReader.java Mon Nov 20 14:43:02 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.forrest.reader;
+package org.apache.forrest.core.reader;
import java.net.MalformedURLException;
import java.net.URI;
@@ -35,7 +35,7 @@
* It is defined in forrestContext.xml as follows:
*
* <bean id="fooProtocol"
- * class="org.apache.forrest.reader.ChainedReader" >
+ * class="org.apache.forrest.core.reader.ChainedReader" >
* <property name="docType"
* value="org.foo.Bar" />
* </bean>
Copied: forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/FileReader.java (from r477380, forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/FileReader.java)
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/FileReader.java?view=diff&rev=477381&p1=forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/FileReader.java&r1=477380&p2=forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/FileReader.java&r2=477381
==============================================================================
--- forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/FileReader.java (original)
+++ forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/FileReader.java Mon Nov 20 14:43:02 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.forrest.reader;
+package org.apache.forrest.core.reader;
import java.io.File;
import java.io.FileInputStream;
@@ -37,7 +37,7 @@
/*
* (non-Javadoc)
*
- * @see org.apache.forrest.reader.IReader#read(org.apache.forrest.test.core.locationMap.Location)
+ * @see org.apache.forrest.core.reader.IReader#read(org.apache.forrest.test.core.locationMap.Location)
*/
public AbstractSourceDocument read(IController controller, URI requestURI, final Location location) {
AbstractSourceDocument result = null;
Copied: forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/HTTPReader.java (from r477380, forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/HTTPReader.java)
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/HTTPReader.java?view=diff&rev=477381&p1=forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/HTTPReader.java&r1=477380&p2=forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/HTTPReader.java&r2=477381
==============================================================================
--- forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/HTTPReader.java (original)
+++ forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/HTTPReader.java Mon Nov 20 14:43:02 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.forrest.reader;
+package org.apache.forrest.core.reader;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -42,7 +42,7 @@
/*
* (non-Javadoc)
*
- * @see org.apache.forrest.reader.IReader#init()
+ * @see org.apache.forrest.core.reader.IReader#init()
*/
public void init() {
this.client = new HttpClient(new MultiThreadedHttpConnectionManager());
@@ -53,7 +53,7 @@
/*
* (non-Javadoc)
*
- * @see org.apache.forrest.reader.IReader#read(org.apache.forrest.test.core.locationMap.Location)
+ * @see org.apache.forrest.core.reader.IReader#read(org.apache.forrest.test.core.locationMap.Location)
*/
public AbstractSourceDocument read(IController controller, final URI requestURI, final Location location)
throws MalformedURLException, ProcessingException {
Copied: forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/IReader.java (from r477380, forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/IReader.java)
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/IReader.java?view=diff&rev=477381&p1=forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/IReader.java&r1=477380&p2=forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/IReader.java&r2=477381
==============================================================================
--- forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/reader/IReader.java (original)
+++ forrest/trunk/whiteboard/forrest2/src/core/org/apache/forrest/core/reader/IReader.java Mon Nov 20 14:43:02 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.forrest.reader;
+package org.apache.forrest.core.reader;
import java.net.MalformedURLException;
import java.net.URI;
Modified: forrest/trunk/whiteboard/forrest2/src/examples/affiliateProductCatalogue/src/forrestContext.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/src/examples/affiliateProductCatalogue/src/forrestContext.xml?view=diff&rev=477381&r1=477380&r2=477381
==============================================================================
--- forrest/trunk/whiteboard/forrest2/src/examples/affiliateProductCatalogue/src/forrestContext.xml (original)
+++ forrest/trunk/whiteboard/forrest2/src/examples/affiliateProductCatalogue/src/forrestContext.xml Mon Nov 20 14:43:02 2006
@@ -23,9 +23,9 @@
<!-- Readers -->
<!-- ============================================= -->
- <bean id="file" class="org.apache.forrest.reader.FileReader"></bean>
+ <bean id="file" class="org.apache.forrest.core.reader.FileReader"></bean>
<bean id="tradeDoubler"
- class="org.apache.forrest.reader.ChainedReader">
+ class="org.apache.forrest.core.reader.ChainedReader">
<property name="docType"
value="org.apache.forrest.example.affiliateProductCatalogue.TradeDoublerProductFeed"/>
</bean>
Modified: forrest/trunk/whiteboard/forrest2/src/examples/helloWorld/src/forrestContext.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/src/examples/helloWorld/src/forrestContext.xml?view=diff&rev=477381&r1=477380&r2=477381
==============================================================================
--- forrest/trunk/whiteboard/forrest2/src/examples/helloWorld/src/forrestContext.xml (original)
+++ forrest/trunk/whiteboard/forrest2/src/examples/helloWorld/src/forrestContext.xml Mon Nov 20 14:43:02 2006
@@ -18,6 +18,14 @@
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
+
+ <!-- ============================================= -->
+ <!-- Readers -->
+ <!-- ============================================= -->
+
+ <bean id="http" class="org.apache.forrest.core.reader.HTTPReader"></bean>
+ <bean id="file" class="org.apache.forrest.core.reader.FileReader"></bean>
+
<!-- ============================================= -->
<!-- Input Plugins -->
<!-- ============================================= -->
@@ -35,12 +43,5 @@
<property name="xsltPath"
value="/xdocs/samples/xslt/internal-to-html.xsl" />
</bean>
-
- <!-- ============================================= -->
- <!-- Readers -->
- <!-- ============================================= -->
-
- <bean id="http" class="org.apache.forrest.reader.HTTPReader"></bean>
- <bean id="file" class="org.apache.forrest.reader.FileReader"></bean>
</beans>
Modified: forrest/trunk/whiteboard/forrest2/src/test/forrestContext.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/src/test/forrestContext.xml?view=diff&rev=477381&r1=477380&r2=477381
==============================================================================
--- forrest/trunk/whiteboard/forrest2/src/test/forrestContext.xml (original)
+++ forrest/trunk/whiteboard/forrest2/src/test/forrestContext.xml Mon Nov 20 14:43:02 2006
@@ -23,8 +23,11 @@
<!-- Readers -->
<!-- ============================================= -->
+
+ <bean id="http" class="org.apache.forrest.core.reader.HTTPReader"></bean>
+ <bean id="file" class="org.apache.forrest.core.reader.FileReader"></bean>
<bean id="hello"
- class="org.apache.forrest.reader.ChainedReader">
+ class="org.apache.forrest.core.reader.ChainedReader">
<property name="docType"
value="org.apache.forrest.helloWorld"/>
</bean>
@@ -46,12 +49,5 @@
<property name="xsltPath"
value="/xdocs/samples/xslt/internal-to-html.xsl" />
</bean>
-
- <!-- ============================================= -->
- <!-- Readers -->
- <!-- ============================================= -->
-
- <bean id="http" class="org.apache.forrest.reader.HTTPReader"></bean>
- <bean id="file" class="org.apache.forrest.reader.FileReader"></bean>
</beans>