Humm... Glad you spoke up! I assumed that the ONLY user of Turbine 3 was Scarab, and that I was free to make changes to Turbine 3 to suit moving Scarab to Turbine 2.4.
I tossed in a bit of code about ConditioalValve and xstream, however, Scarab doesn't use it, so it didn't get tested. Is there any reason you can't go to Turbine 2.4? I know its a big change at the template level, but Turbine 3 is a dead end. As soon as Scarab is setup on Turbine 2.4, my involvement in Turbine 3 will be done, and I'll be pushing to remove Turbine 3 from Gump etc. I personally would appreciate your coding skills helping me on T2.4! Eric PS, I tried applying it, and it didn't go, can you double check you cut the patch against the latest? > -----Original Message----- > From: Youngho Cho [mailto:[EMAIL PROTECTED] > Sent: Tuesday, November 02, 2004 3:29 AM > To: Turbine Developers List > Subject: Re: cvs commit: > jakarta-turbine-3/src/java/org/apache/turbine Turbine.java > > > Hi, > I am very happy if we can get the pipeline descriptor from class loader. > please look at the following patch. > > And, Does the xstream change support ConditionalValve ? > I used the ConditionalValve extensively.. > But I am not sure how do I change to. > > Is there any pipeline sample using ConditionalValve ? > > > Thanks, > > Youngho > > > Index: src/java/org/apache/turbine/Turbine.java > =================================================================== > RCS file: > /home/cvspublic/jakarta-turbine-3/src/java/org/apache/turbine/Turb > ine.java,v > retrieving revision 1.50 > diff -r1.50 Turbine.java > 61a62,63 > > import java.io.InputStream; > > import java.io.InputStreamReader; > 758a761 > > Reader reader =null; > 761,763c764,774 > < descriptorPath = getRealPath(descriptorPath); > < log.debug("Using descriptor path: " + descriptorPath); > < Reader reader = new BufferedReader(new > FileReader(descriptorPath)); > --- > > InputStream inputStream = > Turbine.class.getClassLoader().getResourceAsStream(descriptorPath); > > if(inputStream != null) > > { > > reader = new BufferedReader(new > InputStreamReader(inputStream)); > > } > > else > > { > > descriptorPath = getRealPath(descriptorPath); > > reader = new BufferedReader(new > FileReader(descriptorPath)); > > } > > log.debug("Using descriptor path: " + descriptorPath) > > ----- Original Message ----- > From: <[EMAIL PROTECTED]> > To: <[EMAIL PROTECTED]> > Sent: Tuesday, November 02, 2004 4:41 AM > Subject: cvs commit: > jakarta-turbine-3/src/java/org/apache/turbine Turbine.java > > > > epugh 2004/11/01 11:41:39 > > > > Modified: src/java/org/apache/turbine Turbine.java > > Log: > > don't read from classpath, but get real path > > > > Revision Changes Path > > 1.50 +2 -2 > jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java > > > > Index: Turbine.java > > =================================================================== > > RCS file: > /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java,v > > retrieving revision 1.49 > > retrieving revision 1.50 > > diff -u -r1.49 -r1.50 > > --- Turbine.java 1 Nov 2004 19:10:15 -0000 1.49 > > +++ Turbine.java 1 Nov 2004 19:41:39 -0000 1.50 > > @@ -758,7 +758,7 @@ > > // descriptors to define what Valves are attached to it. > > String descriptorPath = configuration.getString( > > "pipeline.default.descriptor", > TurbinePipeline.CLASSIC_PIPELINE); > > - > > + descriptorPath = getRealPath(descriptorPath); > > log.debug("Using descriptor path: " + descriptorPath); > > Reader reader = new BufferedReader(new > FileReader(descriptorPath)); > > XStream pipelineMapper = new XStream(new > DomDriver()); // does not require XPP3 library > > > > > > > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: [EMAIL PROTECTED] > > For additional commands, e-mail: [EMAIL PROTECTED] > --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
