You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jt...@apache.org on 2002/05/07 21:16:23 UTC
cvs commit: jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/xslt TurbineXSLTService.java
jtaylor 02/05/07 12:16:23
Modified: . build-gump.xml
src/services/org/apache/fulcrum/xslt TurbineXSLTService.java
Added: . gump.xml
Removed: . jakarta-turbine-fulcrum.xml
Log:
Update / rename of gump desc
Revision Changes Path
1.3 +6 -10 jakarta-turbine-fulcrum/build-gump.xml
Index: build-gump.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/build-gump.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-gump.xml 1 May 2002 15:21:35 -0000 1.2
+++ build-gump.xml 7 May 2002 19:16:23 -0000 1.3
@@ -10,12 +10,12 @@
name="jar">
<property name="build.dir" value="target"/>
- <property name="build.dest" value="${build.dir}/classes"/>
+ <property name="build.dest" value="${maven.build.dir}/classes"/>
- <mkdir dir="${build.dest}"/>
+ <mkdir dir="${maven.build.dest}"/>
<javac
- destdir="${build.dest}"
+ destdir="${maven.build.dest}"
excludes="**/package.html"
debug="false"
deprecation="false"
@@ -28,15 +28,11 @@
</javac>
<jar
- jarfile="${build.dir}/${final.name}.jar"
- basedir="${build.dest}"
+ jarfile="${maven.build.dir}/${maven.final.name}.jar"
+ basedir="${maven.build.dest}"
excludes="**/package.html"
/>
-
+
</target>
-
- <nag from="turbine-dev@jakarta.apache.org" to="turbine-dev@jakarta.apache.org"/>
-
-
</project>
1.1 jakarta-turbine-fulcrum/gump.xml
Index: gump.xml
===================================================================
<module name="jakarta-turbine-fulcrum">
<description>Services Framework</description>
<url href="http://jakarta.apache.org/turbine/fulcrum/"/>
<cvs repository="jakarta"/>
<!-- This is really the cvs module. We need to change this but -->
<!-- I will leave this for now until everything works. -->
<project name="jakarta-turbine-fulcrum">
<!-- Standard Maven target to produce Javadocs, source -->
<!-- and binary distributions. -->
<ant buildfile="build-gump.xml" target="jar">
<property name="final.name" value="fulcrum-@@DATE@@"/>
</ant>
<!-- All Maven projects need Ant and Xerces to build. -->
<depend project="jakarta-ant"/>
<depend project="xml-xerces"/>
<depend project="bsf"/>
<depend project="commons-collections"/>
<depend project="commons-codec"/>
<depend project="commons-email"/>
<depend project="commons-email"/>
<depend project="commons-lang"/>
<depend project="commons-pool"/>
<depend project="commons-fileupload"/>
<depend project="dom4j"/>
<depend project="jaf"/>
<depend project="jakarta-regexp"/>
<depend project="javamail"/>
<depend project="jdbc"/>
<depend project="jndi"/>
<depend project="jakarta-log4j"/>
<depend project="jakarta-servletapi"/>
<depend project="commons-configuration"/>
<depend project="jakarta-turbine-stratum"/>
<depend project="jakarta-turbine-torque"/>
<depend project="jakarta-velocity"/>
<depend project="jakarta-velocity-dvsl"/>
<depend project="village"/>
<depend project="xml-xerces"/>
<depend project="xml-apis"/>
<depend project="xml-rpc"/>
<depend project="xml-xalan2"/>
<work nested="target/classes"/>
<home nested="target"/>
<jar name="fulcrum-@@DATE@@.jar"/>
<javadoc nested="docs/apidocs"/>
<nag from="turbine-dev@jakarta.apache.org"
to="turbine-dev@jakarta.apache.org"/>
</project>
</module>
1.3 +25 -12 jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/xslt/TurbineXSLTService.java
Index: TurbineXSLTService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/xslt/TurbineXSLTService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineXSLTService.java 10 Aug 2001 11:46:25 -0000 1.2
+++ TurbineXSLTService.java 7 May 2002 19:16:23 -0000 1.3
@@ -223,18 +223,7 @@
protected void transform (String xslName, Source xmlin, Result xmlout)
throws Exception
{
- Templates sr = getTemplates(xslName);
- Transformer transformer;
-
- // If there is no stylesheet we just echo the xml
- if (sr == null)
- {
- transformer = tfactory.newTransformer();
- }
- else
- {
- transformer = sr.newTransformer();
- }
+ Transformer transformer = getTransformer( xslName );
transformer.transform(xmlin, xmlout);
}
@@ -282,6 +271,30 @@
StringWriter sw = new StringWriter();
transform (xslName,in,sw);
return sw.toString();
+ }
+
+ /**
+ * Retrieve a transformer for the given stylesheet name. If no stylesheet
+ * is available for the provided name, an identity transformer will be
+ * returned. This allows clients of this service to perform more complex
+ * transformations (for example, where parameters must be set). When
+ * possible prefer using one of the forms of {@link #transform}.
+ *
+ * @param xslName Identifies stylesheet to get transformer for
+ * @return A transformer for that stylesheet
+ */
+ public Transformer getTransformer(String xslName) throws Exception
+ {
+ Templates sr = getTemplates(xslName);
+
+ if (sr == null)
+ {
+ return tfactory.newTransformer();
+ }
+ else
+ {
+ return sr.newTransformer();
+ }
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit:
jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/xslt
TurbineXSLTService.java
Posted by James Taylor <jt...@4lane.com>.
Ooops, a change to XSLTService got into this commit as well.
On Tue, 2002-05-07 at 15:16, jtaylor@apache.org wrote:
> jtaylor 02/05/07 12:16:23
>
> Modified: . build-gump.xml
> src/services/org/apache/fulcrum/xslt TurbineXSLTService.java
> Added: . gump.xml
> Removed: . jakarta-turbine-fulcrum.xml
> Log:
> Update / rename of gump desc
>
> Revision Changes Path
> 1.3 +6 -10 jakarta-turbine-fulcrum/build-gump.xml
>
> Index: build-gump.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-turbine-fulcrum/build-gump.xml,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- build-gump.xml 1 May 2002 15:21:35 -0000 1.2
> +++ build-gump.xml 7 May 2002 19:16:23 -0000 1.3
> @@ -10,12 +10,12 @@
> name="jar">
>
> <property name="build.dir" value="target"/>
> - <property name="build.dest" value="${build.dir}/classes"/>
> + <property name="build.dest" value="${maven.build.dir}/classes"/>
>
> - <mkdir dir="${build.dest}"/>
> + <mkdir dir="${maven.build.dest}"/>
>
> <javac
> - destdir="${build.dest}"
> + destdir="${maven.build.dest}"
> excludes="**/package.html"
> debug="false"
> deprecation="false"
> @@ -28,15 +28,11 @@
> </javac>
>
> <jar
> - jarfile="${build.dir}/${final.name}.jar"
> - basedir="${build.dest}"
> + jarfile="${maven.build.dir}/${maven.final.name}.jar"
> + basedir="${maven.build.dest}"
> excludes="**/package.html"
> />
> -
> +
> </target>
>
> -
> - <nag from="turbine-dev@jakarta.apache.org" to="turbine-dev@jakarta.apache.org"/>
> -
> -
> </project>
>
>
>
> 1.1 jakarta-turbine-fulcrum/gump.xml
>
> Index: gump.xml
> ===================================================================
> <module name="jakarta-turbine-fulcrum">
>
>
> <description>Services Framework</description>
> <url href="http://jakarta.apache.org/turbine/fulcrum/"/>
>
> <cvs repository="jakarta"/>
>
> <!-- This is really the cvs module. We need to change this but -->
> <!-- I will leave this for now until everything works. -->
>
> <project name="jakarta-turbine-fulcrum">
>
> <!-- Standard Maven target to produce Javadocs, source -->
> <!-- and binary distributions. -->
>
> <ant buildfile="build-gump.xml" target="jar">
> <property name="final.name" value="fulcrum-@@DATE@@"/>
> </ant>
>
> <!-- All Maven projects need Ant and Xerces to build. -->
> <depend project="jakarta-ant"/>
> <depend project="xml-xerces"/>
>
> <depend project="bsf"/>
> <depend project="commons-collections"/>
> <depend project="commons-codec"/>
> <depend project="commons-email"/>
> <depend project="commons-email"/>
> <depend project="commons-lang"/>
> <depend project="commons-pool"/>
> <depend project="commons-fileupload"/>
> <depend project="dom4j"/>
> <depend project="jaf"/>
> <depend project="jakarta-regexp"/>
> <depend project="javamail"/>
> <depend project="jdbc"/>
> <depend project="jndi"/>
> <depend project="jakarta-log4j"/>
> <depend project="jakarta-servletapi"/>
> <depend project="commons-configuration"/>
> <depend project="jakarta-turbine-stratum"/>
> <depend project="jakarta-turbine-torque"/>
> <depend project="jakarta-velocity"/>
> <depend project="jakarta-velocity-dvsl"/>
> <depend project="village"/>
> <depend project="xml-xerces"/>
> <depend project="xml-apis"/>
> <depend project="xml-rpc"/>
> <depend project="xml-xalan2"/>
>
> <work nested="target/classes"/>
> <home nested="target"/>
> <jar name="fulcrum-@@DATE@@.jar"/>
> <javadoc nested="docs/apidocs"/>
>
> <nag from="turbine-dev@jakarta.apache.org"
> to="turbine-dev@jakarta.apache.org"/>
>
>
> </project>
>
> </module>
>
>
>
> 1.3 +25 -12 jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/xslt/TurbineXSLTService.java
>
> Index: TurbineXSLTService.java
> ===================================================================
> RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/xslt/TurbineXSLTService.java,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- TurbineXSLTService.java 10 Aug 2001 11:46:25 -0000 1.2
> +++ TurbineXSLTService.java 7 May 2002 19:16:23 -0000 1.3
> @@ -223,18 +223,7 @@
> protected void transform (String xslName, Source xmlin, Result xmlout)
> throws Exception
> {
> - Templates sr = getTemplates(xslName);
> - Transformer transformer;
> -
> - // If there is no stylesheet we just echo the xml
> - if (sr == null)
> - {
> - transformer = tfactory.newTransformer();
> - }
> - else
> - {
> - transformer = sr.newTransformer();
> - }
> + Transformer transformer = getTransformer( xslName );
>
> transformer.transform(xmlin, xmlout);
> }
> @@ -282,6 +271,30 @@
> StringWriter sw = new StringWriter();
> transform (xslName,in,sw);
> return sw.toString();
> + }
> +
> + /**
> + * Retrieve a transformer for the given stylesheet name. If no stylesheet
> + * is available for the provided name, an identity transformer will be
> + * returned. This allows clients of this service to perform more complex
> + * transformations (for example, where parameters must be set). When
> + * possible prefer using one of the forms of {@link #transform}.
> + *
> + * @param xslName Identifies stylesheet to get transformer for
> + * @return A transformer for that stylesheet
> + */
> + public Transformer getTransformer(String xslName) throws Exception
> + {
> + Templates sr = getTemplates(xslName);
> +
> + if (sr == null)
> + {
> + return tfactory.newTransformer();
> + }
> + else
> + {
> + return sr.newTransformer();
> + }
> }
>
> }
>
>
>
>
> --
> To unsubscribe, e-mail: <ma...@jakarta.apache.org>
> For additional commands, e-mail: <ma...@jakarta.apache.org>
>
>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>