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/08/27 12:46:27 UTC
svn commit: r689440 - in /labs/droids/trunk: ivy.xml
src/core/java/org/apache/droids/droids-core-context.xml
src/core/java/org/apache/droids/droids-core-factories-context.xml
Author: thorsten
Date: Wed Aug 27 03:46:26 2008
New Revision: 689440
URL: http://svn.apache.org/viewvc?rev=689440&view=rev
Log:
Updating cocoon-configurator which as well get rid of the explicit dependency on spring 2.5
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
Modified: labs/droids/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/labs/droids/trunk/ivy.xml?rev=689440&r1=689439&r2=689440&view=diff
==============================================================================
--- labs/droids/trunk/ivy.xml (original)
+++ labs/droids/trunk/ivy.xml Wed Aug 27 03:46:26 2008
@@ -31,14 +31,12 @@
<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.springframework" name="spring-core" rev="2.5.5"/>
- <dependency org="org.springframework" name="spring-beans" rev="2.5.5"/>
<dependency org="org.apache.httpcomponents" name="httpclient" rev="4.0-alpha4"/>
+ <dependency org="org.apache.cocoon" name="cocoon-spring-configurator" rev="2.0.0"/>
<!-- till now we do not have tika support yet.
As soon we are coming around to implement we have to do it in a plugin.
Leaving it for now in comment.
<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=689440&r1=689439&r2=689440&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 Aug 27 03:46:26 2008
@@ -15,7 +15,7 @@
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.5.xsd
- http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
+ http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.1.0.xsd">
<import resource="droids-core-factories-context.xml"/>
@@ -47,7 +47,16 @@
<!-- Parser -->
<bean
name="text/html"
- class="org.apache.droids.parse.html.HtmlParser"/>
+ class="org.apache.droids.parse.html.HtmlParser">
+ <property name="elements">
+ <map>
+ <entry key="a" value="href"/>
+ <entry key="link" value="href"/>
+ <entry key="img" value="src"/>
+ <entry key="script" value="src"/>
+ </map>
+ </property>
+ </bean>
<!-- Filter -->
<bean
name="org.apache.droids.api.URLFilter/org.apache.droids.net.RegexURLFilter"
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=689440&r1=689439&r2=689440&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 Aug 27 03:46:26 2008
@@ -4,7 +4,7 @@
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.5.xsd
- http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
+ http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.1.0.xsd">
<!-- Core - factories register -->
<bean id="org.apache.droids.Core" class="org.apache.droids.Core">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org