You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by th...@apache.org on 2008/03/19 21:34:17 UTC
svn commit: r639000 - in /labs/droids/trunk: ./
src/core/java/org/apache/droids/
src/core/java/org/apache/droids/helper/factories/
src/examples/java/org/apache/droids/examples/
Author: thorsten
Date: Wed Mar 19 13:34:15 2008
New Revision: 639000
URL: http://svn.apache.org/viewvc?rev=639000&view=rev
Log:
LABS-117 Replace all linkedHashmaps within the factory classes with cocoons configurator:bean-map
Modified:
labs/droids/trunk/ivy.xml
labs/droids/trunk/src/core/java/org/apache/droids/droids-core-context.xml
labs/droids/trunk/src/core/java/org/apache/droids/droids-core-factories-context.xml
labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/GenericFactory.java
labs/droids/trunk/src/examples/java/org/apache/droids/examples/droids-example-context.xml
labs/droids/trunk/status.xml
Modified: labs/droids/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/labs/droids/trunk/ivy.xml?rev=639000&r1=638999&r2=639000&view=diff
==============================================================================
--- labs/droids/trunk/ivy.xml (original)
+++ labs/droids/trunk/ivy.xml Wed Mar 19 13:34:15 2008
@@ -28,13 +28,12 @@
<artifact name="org.apache.droids" type="jar" ext="jar"/>
</publications>
<dependencies>
- <dependency org="org.springframework" name="spring-core" rev="2.0.8"/>
- <dependency org="org.springframework" name="spring-mock" rev="2.0.8"/>
<dependency org="stax" name="stax-api" rev="1.0.1"/>
<dependency org="stax" name="stax" rev="1.2.0"/>
<dependency org="nekohtml" name="nekohtml" rev="1.9.6.1"/>
<dependency org="org.apache.httpcomponents" name="httpclient" rev="4.0-alpha3"/>
<dependency org="org.apache.tika" name="tika" rev="0.1-incubating"/>
+ <dependency org="org.apache.cocoon" name="cocoon-spring-configurator" rev="1.0.1"/>
<!-- Backport if you need a 1.4 lib -->
<dependency org="net.sf.retrotranslator" name="retrotranslator-transformer" rev="1.2.4"/>
<dependency org="net.sf.retrotranslator" name="retrotranslator-runtime" rev="1.2.4"/>
Modified: labs/droids/trunk/src/core/java/org/apache/droids/droids-core-context.xml
URL: http://svn.apache.org/viewvc/labs/droids/trunk/src/core/java/org/apache/droids/droids-core-context.xml?rev=639000&r1=638999&r2=639000&view=diff
==============================================================================
--- labs/droids/trunk/src/core/java/org/apache/droids/droids-core-context.xml (original)
+++ labs/droids/trunk/src/core/java/org/apache/droids/droids-core-context.xml Wed Mar 19 13:34:15 2008
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
- "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<!--
Using your own context
@@ -13,17 +11,21 @@
d) Call the ant target like:
ant droids.crawl default -Ddroids.spring.context=PATH/droids-your-context.xml
-->
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:configurator="http://cocoon.apache.org/schema/configurator"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
<import resource="droids-core-factories-context.xml"/>
-
+
<!-- Droids -->
- <bean id="default" class="org.apache.droids.DefaultCrawler">
+ <bean name="org.apache.droids.api.Droid/default"
+ class="org.apache.droids.DefaultCrawler">
<property name="core" ref="org.apache.droids.Core"/>
<property name="queue" ref="org.apache.droids.queue.Simple"/>
<property name="maxThreads" value="@droids.maxThreads@"/>
- <property name="url"
- value="@droids.initial.url@"/>
+ <property name="url" value="@droids.initial.url@"/>
</bean>
<!-- Queue -->
<bean id="org.apache.droids.queue.Simple"
@@ -32,7 +34,8 @@
<property name="maxSize" value="@droids.queue.maxSize@"/>
</bean>
<!-- Protocol -->
- <bean id="org.apache.droids.protocol.http.Http"
+ <bean
+ name="org.apache.droids.api.Protocol/http"
class="org.apache.droids.protocol.http.Http">
<property name="from" value="labs@labs.apache.org"/>
<property name="refer" value="http://svn.apache.org/repos/asf/labs/droids"/>
@@ -40,15 +43,23 @@
<property name="timeout" value="10000"/>
</bean>
<!-- Parser -->
- <bean id="org.apache.droids.parse.html.HtmlParser" class="org.apache.droids.parse.html.HtmlParser"/>
+ <bean
+ name="text/html"
+ class="org.apache.droids.parse.html.HtmlParser"/>
<!-- Filter -->
- <bean id="org.apache.droids.net.RegexURLFilter" class="org.apache.droids.net.RegexURLFilter">
+ <bean
+ name="org.apache.droids.api.URLFilter/org.apache.droids.net.RegexURLFilter"
+ class="org.apache.droids.net.RegexURLFilter">
<property name="file" value="@droids.filter.regex@"/>
</bean>
<!-- Handler -->
- <bean id="org.apache.droids.handle.Save" class="org.apache.droids.handle.Save">
+ <bean
+ name="org.apache.droids.api.Handler/org.apache.droids.handle.Sysout"
+ class="org.apache.droids.handle.Sysout"/>
+ <bean
+ name="org.apache.droids.api.Handler/org.apache.droids.handle.Save"
+ class="org.apache.droids.handle.Save">
<property name="outputDir" value="@droids.handler.save.dir@"/>
<property name="includeHost" value="@droids.handler.save.includeHost@"/>
</bean>
- <bean id="org.apache.droids.handle.Sysout" class="org.apache.droids.handle.Sysout"/>
</beans>
Modified: labs/droids/trunk/src/core/java/org/apache/droids/droids-core-factories-context.xml
URL: http://svn.apache.org/viewvc/labs/droids/trunk/src/core/java/org/apache/droids/droids-core-factories-context.xml?rev=639000&r1=638999&r2=639000&view=diff
==============================================================================
--- labs/droids/trunk/src/core/java/org/apache/droids/droids-core-factories-context.xml (original)
+++ labs/droids/trunk/src/core/java/org/apache/droids/droids-core-factories-context.xml Wed Mar 19 13:34:15 2008
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
- "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:configurator="http://cocoon.apache.org/schema/configurator"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
<!-- Core - factories register -->
<bean id="org.apache.droids.Core" class="org.apache.droids.Core">
@@ -22,46 +24,44 @@
<bean id="org.apache.droids.helper.factories.DroidFactory"
class="org.apache.droids.helper.factories.DroidFactory">
<property name="map">
- <map>
- <entry key="default" value-ref="default"/>
- </map>
+ <configurator:bean-map
+ type="org.apache.droids.api.Droid" check-parent="true"
+ strip-prefix="true"/>
</property>
</bean>
<bean id="org.apache.droids.helper.factories.ParserFactory"
class="org.apache.droids.helper.factories.ParserFactory">
<property name="map">
- <map>
- <entry key="text/html" value-ref="org.apache.droids.parse.html.HtmlParser"/>
- </map>
+ <configurator:bean-map type="org.apache.droids.api.Parser"
+ check-parent="false"/>
</property>
</bean>
<bean id="org.apache.droids.helper.factories.ProtocolFactory"
class="org.apache.droids.helper.factories.ProtocolFactory">
<property name="map">
- <map>
- <entry key="http" value-ref="org.apache.droids.protocol.http.Http"/>
- </map>
+ <configurator:bean-map
+ type="org.apache.droids.api.Protocol" check-parent="true"
+ strip-prefix="true"/>
</property>
</bean>
<bean id="org.apache.droids.helper.factories.URLFiltersFactory"
class="org.apache.droids.helper.factories.URLFiltersFactory">
<property name="map">
- <map>
- <entry key="regExp" value-ref="org.apache.droids.net.RegexURLFilter"/>
- </map>
+ <configurator:bean-map
+ type="org.apache.droids.api.URLFilter" check-parent="true"
+ strip-prefix="true"/>
</property>
</bean>
<bean id="org.apache.droids.helper.factories.HandlerFactory"
class="org.apache.droids.helper.factories.HandlerFactory">
<property name="map">
- <map>
- <entry key="save" value-ref="org.apache.droids.handle.Save"/>
- <!--<entry key="sysout" value-ref="org.apache.droids.handle.Sysout"/>-->
- </map>
+ <configurator:bean-map
+ type="org.apache.droids.api.Handler" check-parent="true"
+ strip-prefix="true"/>
</property>
</bean>
Modified: labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/GenericFactory.java
URL: http://svn.apache.org/viewvc/labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/GenericFactory.java?rev=639000&r1=638999&r2=639000&view=diff
==============================================================================
--- labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/GenericFactory.java (original)
+++ labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/GenericFactory.java Wed Mar 19 13:34:15 2008
@@ -1,7 +1,6 @@
package org.apache.droids.helper.factories;
-import java.util.LinkedHashMap;
-
+import org.apache.cocoon.spring.configurator.impl.BeanMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -9,13 +8,13 @@
protected final Log log = LogFactory.getLog(this.getClass().getCanonicalName());
- private LinkedHashMap<String, Object> map;
+ private BeanMap map;
- public LinkedHashMap<String, Object> getMap() {
+ public BeanMap getMap() {
return map;
}
- public void setMap(LinkedHashMap<String, Object> map) {
+ public void setMap(BeanMap map) {
this.map = map;
}
Modified: labs/droids/trunk/src/examples/java/org/apache/droids/examples/droids-example-context.xml
URL: http://svn.apache.org/viewvc/labs/droids/trunk/src/examples/java/org/apache/droids/examples/droids-example-context.xml?rev=639000&r1=638999&r2=639000&view=diff
==============================================================================
--- labs/droids/trunk/src/examples/java/org/apache/droids/examples/droids-example-context.xml (original)
+++ labs/droids/trunk/src/examples/java/org/apache/droids/examples/droids-example-context.xml Wed Mar 19 13:34:15 2008
@@ -1,21 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
- "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:configurator="http://cocoon.apache.org/schema/configurator"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
+
<import
resource="classpath:/org/apache/droids/droids-core-factories-context.xml"/>
+
<import resource="classpath:/org/apache/droids/droids-core-context.xml"/>
- <bean id="org.apache.droids.helper.factories.DroidFactory"
- class="org.apache.droids.helper.factories.DroidFactory">
- <property name="map">
- <map>
- <entry key="indexer" value-ref="indexer"/>
- </map>
- </property>
- </bean>
<!-- Indexer -->
- <bean id="indexer" class="org.apache.droids.examples.IndexerCrawler">
+ <bean
+ name="org.apache.droids.api.Droid/indexer"
+ class="org.apache.droids.examples.IndexerCrawler">
<property name="core" ref="org.apache.droids.Core"/>
<property name="queue" ref="org.apache.droids.queue.Simple"/>
<property name="maxThreads" value="@droids.maxThreads@"/>
@@ -23,17 +21,10 @@
<property name="updateUrl" value="http://localhost:8983/solr/update"/>
</bean>
- <bean id="org.apache.droids.helper.factories.HandlerFactory"
- class="org.apache.droids.helper.factories.HandlerFactory">
- <property name="map">
- <map>
- <entry key="solr" value-ref="org.apache.droids.handle.Solr"/>
- </map>
- </property>
- </bean>
-
<!-- Handler -->
- <bean id="org.apache.droids.handle.Solr" class="org.apache.droids.handle.Solr">
+ <bean
+ name="org.apache.droids.api.Handler/org.apache.droids.handle.Solr"
+ class="org.apache.droids.handle.Solr">
<property name="updateUrl" value="http://localhost:8983/solr/update"/>
</bean>
</beans>
Modified: labs/droids/trunk/status.xml
URL: http://svn.apache.org/viewvc/labs/droids/trunk/status.xml?rev=639000&r1=638999&r2=639000&view=diff
==============================================================================
--- labs/droids/trunk/status.xml (original)
+++ labs/droids/trunk/status.xml Wed Mar 19 13:34:15 2008
@@ -34,6 +34,11 @@
<changes>
<!-- Add new releases here -->
<release version="0.0.1" date="unreleased">
+ <action type="fix" context="code" dev="thorsten" fixes-bug="LABS-117" importance="high">
+ <link
+ href="http://cocoon.apache.org/subprojects/configuration/1.0/spring-configurator/1.0/1400_1_1.html">
+ Dynamic Registry</link> Support is crucial in a multi plugin environment since a
+ plugin can add new components to the registry.</action>
<action context="code" dev="thorsten" importance="high" type="update"> Cleaning up
old nutch based code with a clean new spring implementation.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org