Author: tv
Date: Mon Mar 30 20:22:18 2009
New Revision: 760151
URL: http://svn.apache.org/viewvc?rev=760151&view=rev
Log:
Removed the XSLT service. It has been replaced by the Fulcrum XSLT component
Removed:
turbine/core/trunk/src/java/org/apache/turbine/services/xslt/
Modified:
turbine/core/trunk/pom.xml
turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java
turbine/core/trunk/xdocs/changes.xml
Modified: turbine/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=760151&r1=760150&r2=760151&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Mon Mar 30 20:22:18 2009
@@ -53,12 +53,12 @@
<repository>
<id>default</id>
<name>Default Repository</name>
- <url>people.apache.org/www/www.apache.org/dist/turbine/releases/</url>
+
<url>${turbine.deployment.protocol}://people.apache.org/www/www.apache.org/dist/turbine/releases/</url>
</repository>
<site>
<id>default</id>
<name>Default Site</name>
- <url>scp://people.apache.org/www/turbine.apache.org</url>
+
<url>${turbine.deployment.protocol}://people.apache.org/www/turbine.apache.org</url>
</site>
</distributionManagement>
@@ -974,9 +974,14 @@
<version>1.0.7-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-xslt</artifactId>
+ <version>1.0.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-mimetype</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.excalibur.component</groupId>
@@ -1252,7 +1257,7 @@
Make the deployment protocol pluggable. This allows to switch to
other protocols like scpexe, which some users prefer over scp.
-->
- <turbine.deployment.protocol>scp</turbine.deployment.protocol>
+ <turbine.deployment.protocol>scpexe</turbine.deployment.protocol>
<!--
Encoding of Java source files: Make sure, that the compiler and
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java?rev=760151&r1=760150&r2=760151&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java
Mon Mar 30 20:22:18 2009
@@ -25,9 +25,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.ecs.ConcreteElement;
-
+import org.apache.fulcrum.xslt.XSLTServiceFacade;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.modules.Layout;
import org.apache.turbine.modules.Screen;
@@ -35,10 +34,8 @@
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.assemblerbroker.TurbineAssemblerBroker;
import org.apache.turbine.services.velocity.TurbineVelocity;
-import org.apache.turbine.services.xslt.TurbineXSLT;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.template.TemplateNavigation;
-
import org.apache.velocity.context.Context;
/**
@@ -126,7 +123,7 @@
// Finally we do a transformation and send the result
// back to the browser
- TurbineXSLT.transform(
+ XSLTServiceFacade.transform(
data.getTemplateInfo().getScreenTemplate(),
new StringReader(temp), data.getResponse().getWriter());
}
@@ -178,7 +175,7 @@
// Finally we do a transformation and send the result
// back to the browser
- TurbineXSLT.transform(
+ XSLTServiceFacade.transform(
data.getTemplateInfo().getScreenTemplate(),
new StringReader(temp), data.getResponse().getWriter());
}
Modified: turbine/core/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/changes.xml?rev=760151&r1=760150&r2=760151&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/changes.xml (original)
+++ turbine/core/trunk/xdocs/changes.xml Mon Mar 30 20:22:18 2009
@@ -26,6 +26,13 @@
<body>
<release version="4.0-dev" date="in Subversion">
<action type="update" dev="tv">
+ Replaced the XSLT-Service with its Fulcrum counterpart.
+ </action>
+ <action type="remove" dev="tv">
+ Removed the XMLRPC-Service. There is a more current alternative
+ implementation available in the Fulcrum repository.
+ </action>
+ <action type="update" dev="tv">
Adjusted the IntakeTool to use IntakeServiceFacade instead of Intake
</action>
<action type="update" dev="tv">
