From slide-dev-richardgriffin@example.net Tue Jun 01 07:49:57 2004 Return-Path: <slide-dev-richardgriffin@example.net> Delivered-To: richardgriffin@example.net Received: (qmail 4851 invoked from network); 1 Jun 2004 07:49:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Jun 2004 07:49:57 -0000 Received: (qmail 16935 invoked by uid 500); 1 Jun 2004 07:49:56 -0000 Delivered-To: richardgriffin@example.net Received: (qmail 16704 invoked by uid 500); 1 Jun 2004 07:49:54 -0000 Mailing-List: contact richardgriffin@example.net; run by ezmlm Precedence: bulk List-Unsubscribe: <mailto:richardgriffin@example.net> List-Subscribe: <mailto:richardgriffin@example.net> List-Help: <mailto:richardgriffin@example.net> List-Post: <mailto:richardgriffin@example.net> List-Id: "Slide Developers Mailing List" <slide-dev.jakarta.apache.org> Reply-To: "Slide Developers Mailing List" <richardgriffin@example.net> Delivered-To: mailing list richardgriffin@example.net Received: (qmail 16690 invoked by uid 500); 1 Jun 2004 07:49:54 -0000 Received: (qmail 16685 invoked by uid 99); 1 Jun 2004 07:49:54 -0000 Received: from [83.161.120.155] (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.27.1) with SMTP; Tue, 01 Jun 2004 00:49:54 -0700 Received: (qmail 4258 invoked by uid 1823); 1 Jun 2004 07:49:37 -0000 Date: 1 Jun 2004 07:49:37 -0000 Message-ID: <richardgriffin@example.net> From: richardgriffin@example.net To: richardgriffin@example.net Subject: cvs commit: jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value - New directory X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N dflorey 2004/06/01 00:49:37 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value - New directory --------------------------------------------------------------------- To unsubscribe, e-mail: richardgriffin@example.net For additional commands, e-mail: richardgriffin@example.net From slide-dev-richardgriffin@example.net Tue Jun 01 07:50:17 2004 Return-Path: <slide-dev-richardgriffin@example.net> Delivered-To: richardgriffin@example.net Received: (qmail 5238 invoked from network); 1 Jun 2004 07:50:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Jun 2004 07:50:16 -0000 Received: (qmail 17207 invoked by uid 500); 1 Jun 2004 07:50:12 -0000 Delivered-To: richardgriffin@example.net Received: (qmail 17134 invoked by uid 500); 1 Jun 2004 07:50:11 -0000 Mailing-List: contact richardgriffin@example.net; run by ezmlm Precedence: bulk List-Unsubscribe: <mailto:richardgriffin@example.net> List-Subscribe: <mailto:richardgriffin@example.net> List-Help: <mailto:richardgriffin@example.net> List-Post: <mailto:richardgriffin@example.net> List-Id: "Slide Developers Mailing List" <slide-dev.jakarta.apache.org> Reply-To: "Slide Developers Mailing List" <richardgriffin@example.net> Delivered-To: mailing list richardgriffin@example.net Received: (qmail 17121 invoked by uid 500); 1 Jun 2004 07:50:11 -0000 Received: (qmail 17102 invoked by uid 99); 1 Jun 2004 07:50:10 -0000 Received: from [83.161.120.155] (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.27.1) with SMTP; Tue, 01 Jun 2004 00:50:10 -0700 Received: (qmail 5011 invoked by uid 1823); 1 Jun 2004 07:49:58 -0000 Date: 1 Jun 2004 07:49:58 -0000 Message-ID: <richardgriffin@example.net> From: richardgriffin@example.net To: richardgriffin@example.net Subject: cvs commit: jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/connector Connector.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N dflorey 2004/06/01 00:49:58 Modified: proposals/projector/src/java/org/apache/slide/projector/descriptor MessageValueDescriptor.java URIValueDescriptor.java BooleanValueDescriptor.java StringValueDescriptorFactory.java ArrayValueDescriptor.java NumberValueDescriptor.java MapValueDescriptor.java TreeValueDescriptor.java StringValueDescriptor.java ValueDescriptor.java LocaleValueDescriptorFactory.java URIValueDescriptorFactory.java AbstractValueDescriptor.java ParameterDescriptor.java StateDescriptor.java LocaleValueDescriptor.java RequiredEnvironmentDescriptor.java ResourceValueDescriptor.java NumberValueDescriptorFactory.java XMLValueDescriptor.java proposals/projector/src/java/org/apache/slide/projector HttpContext.java Constants.java Result.java ConfigurableProcessor.java URI.java proposals/projector/src/java/org/apache/slide/projector/engine ParameterConfiguration.java Process.java Step.java ProcessorManager.java ProjectorClassLoader.java Scheduler.java ResultConfiguration.java ProcessServlet.java proposals/projector/src/java/org/apache/slide/projector/processor/form Form.java FormGenerator.java Control.java EnclosingControl.java Trigger.java ControlContainer.java Test.java ControlComposer.java FormHandler.java proposals/projector/src/java/org/apache/slide/projector/processor Exists.java Echo.java TemplateRenderer.java Event.java SimpleProcessor.java Link.java StringArrayRenderer.java Dispose.java ExceptionRenderer.java URL.java TemplateMapRenderer.java CachedContent.java MapEntry.java TemplateArrayRenderer.java Router.java Content.java proposals/projector/src/java/org/apache/slide/projector/processor/tree Sitemap.java TreeLocalizer.java TreeRenderer.java proposals/projector/src/java/org/apache/slide/projector/util ProcessorHelper.java StreamHelper.java StoreHelper.java proposals/projector/src/java/org/apache/slide/projector/application ApplicationManager.java proposals/projector/src/java/org/apache/slide/projector/store RepositoryStore.java FormStore.java ProcessStore.java proposals/projector/src/java/org/apache/slide/projector/processor/sql SQLProcessor.java proposals/projector/src/java/org/apache/slide/projector/connector/webdav WebdavConnector.java proposals/projector/src/java/org/apache/slide/projector/processor/query PropertyQuery.java ResourceQuery.java proposals/projector/src/java/org/apache/slide/projector/processor/table TableArrayRenderer.java TableHandler.java TableMapRenderer.java TableGenerator.java TablePager.java proposals/projector/src/java/org/apache/slide/projector/processor/xml XPathQuery.java XSLTransformer.java proposals/projector/src/java/org/apache/slide/projector/i18n MessageManager.java LocalizedMessage.java proposals/projector/src/java/org/apache/slide/projector/processor/security Login.java proposals/projector/src/java/org/apache/slide/projector/processor/resolver LocaleResolver.java proposals/projector/src/java/org/apache/slide/projector/connector Connector.java Added: proposals/projector/src/java/org/apache/slide/projector/value MapValue.java Value.java MultipleStreamableValue.java BooleanValue.java InputStreamValue.java PrintableValue.java XMLValue.java AbstractStreamableValue.java ArrayValue.java StreamableValue.java URIValue.java NumberValue.java DocumentValue.java ObjectValue.java LocaleValue.java ElementValue.java NullValue.java StringValue.java MessageValue.java proposals/projector/src/java/org/apache/slide/projector/processor Calculator.java Removed: proposals/projector/src/java/org/apache/slide/projector Resource.java proposals/projector/src/java/org/apache/slide/projector/resource MultipleStreamableResource.java DocumentResource.java NullResource.java StreamableResource.java InputStreamResource.java LocaleResource.java ArrayResource.java NumberResource.java XMLResource.java AbstractStreamableResource.java ElementResource.java StringResource.java ObjectResource.java MessageResource.java BooleanResource.java MapResource.java URIResource.java PrintableResource.java Log: Refactoring Resource -> Value Revision Changes Path 1.3 +16 -16 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/MessageValueDescriptor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/MessageValueDescriptor.java.diff?r1=1.2&r2=1.3 1.3 +6 -6 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/URIValueDescriptor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/URIValueDescriptor.java.diff?r1=1.2&r2=1.3 1.3 +11 -11 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/BooleanValueDescriptor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/BooleanValueDescriptor.java.diff?r1=1.2&r2=1.3 1.2 +3 -3 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/StringValueDescriptorFactory.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/StringValueDescriptorFactory.java.diff?r1=1.1&r2=1.2 1.3 +10 -10 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/ArrayValueDescriptor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/ArrayValueDescriptor.java.diff?r1=1.2&r2=1.3 1.3 +8 -8 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/NumberValueDescriptor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/NumberValueDescriptor.java.diff?r1=1.2&r2=1.3 1.5 +9 -9 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/MapValueDescriptor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/MapValueDescriptor.java.diff?r1=1.4&r2=1.5 1.3 +6 -6 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/TreeValueDescriptor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/TreeValueDescriptor.java.diff?r1=1.2&r2=1.3 1.3 +17 -17 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/StringValueDescriptor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/StringValueDescriptor.java.diff?r1=1.2&r2=1.3 1.3 +4 -4 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/ValueDescriptor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/ValueDescriptor.java.diff?r1=1.2&r2=1.3 1.2 +2 -2 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/LocaleValueDescriptorFactory.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/LocaleValueDescriptorFactory.java.diff?r1=1.1&r2=1.2 1.2 +2 -2 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/URIValueDescriptorFactory.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/URIValueDescriptorFactory.java.diff?r1=1.1&r2=1.2 1.2 +4 -4 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/AbstractValueDescriptor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/AbstractValueDescriptor.java.diff?r1=1.1&r2=1.2 1.5 +4 -4 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/ParameterDescriptor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/ParameterDescriptor.java.diff?r1=1.4&r2=1.5 1.2 +12 -11 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/StateDescriptor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/StateDescriptor.java.diff?r1=1.1&r2=1.2 1.3 +9 -9 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/LocaleValueDescriptor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/LocaleValueDescriptor.java.diff?r1=1.2&r2=1.3 1.2 +2 -2 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/RequiredEnvironmentDescriptor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/RequiredEnvironmentDescriptor.java.diff?r1=1.1&r2=1.2 1.3 +15 -15 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/ResourceValueDescriptor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/ResourceValueDescriptor.java.diff?r1=1.2&r2=1.3 1.2 +3 -3 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/NumberValueDescriptorFactory.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/NumberValueDescriptorFactory.java.diff?r1=1.1&r2=1.2 1.3 +11 -11 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/XMLValueDescriptor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/XMLValueDescriptor.java.diff?r1=1.2&r2=1.3 1.2 +4 -4 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/HttpContext.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/HttpContext.java.diff?r1=1.1&r2=1.2 1.8 +2 -2 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/Constants.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/Constants.java.diff?r1=1.7&r2=1.8 1.2 +3 -2 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/Result.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/Result.java.diff?r1=1.1&r2=1.2 1.2 +2 -2 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/ConfigurableProcessor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/ConfigurableProcessor.java.diff?r1=1.1&r2=1.2 1.2 +3 -1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/URI.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/URI.java.diff?r1=1.1&r2=1.2 1.4 +6 -5 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ParameterConfiguration.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ParameterConfiguration.java.diff?r1=1.3&r2=1.4 1.7 +12 -11 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Process.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Process.java.diff?r1=1.6&r2=1.7 1.3 +2 -2 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Step.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Step.java.diff?r1=1.2&r2=1.3 1.12 +24 -23 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ProcessorManager.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ProcessorManager.java.diff?r1=1.11&r2=1.12 1.3 +4 -4 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ProjectorClassLoader.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ProjectorClassLoader.java.diff?r1=1.2&r2=1.3 1.5 +10 -9 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Scheduler.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Scheduler.java.diff?r1=1.4&r2=1.5 1.4 +8 -8 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ResultConfiguration.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ResultConfiguration.java.diff?r1=1.3&r2=1.4 1.7 +14 -13 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ProcessServlet.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ProcessServlet.java.diff?r1=1.6&r2=1.7 1.8 +23 -23 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/Form.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/Form.java.diff?r1=1.7&r2=1.8 1.9 +32 -32 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/FormGenerator.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/FormGenerator.java.diff?r1=1.8&r2=1.9 1.5 +9 -9 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/Control.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/Control.java.diff?r1=1.4&r2=1.5 1.2 +15 -14 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/EnclosingControl.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/EnclosingControl.java.diff?r1=1.1&r2=1.2 1.8 +15 -15 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/Trigger.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/Trigger.java.diff?r1=1.7&r2=1.8 1.2 +2 -2 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/ControlContainer.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/ControlContainer.java.diff?r1=1.1&r2=1.2 1.4 +15 -15 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/Test.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/Test.java.diff?r1=1.3&r2=1.4 1.8 +44 -44 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/ControlComposer.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/ControlComposer.java.diff?r1=1.7&r2=1.8 1.10 +13 -13 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/FormHandler.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/FormHandler.java.diff?r1=1.9&r2=1.10 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/MapValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/MapValue.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/Value.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/Value.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/MultipleStreamableValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/MultipleStreamableValue.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/BooleanValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/BooleanValue.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/InputStreamValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/InputStreamValue.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/PrintableValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/PrintableValue.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/XMLValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/XMLValue.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/AbstractStreamableValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/AbstractStreamableValue.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/ArrayValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/ArrayValue.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/StreamableValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/StreamableValue.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/URIValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/URIValue.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/NumberValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/NumberValue.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/DocumentValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/DocumentValue.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/ObjectValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/ObjectValue.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/LocaleValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/LocaleValue.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/ElementValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/ElementValue.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/NullValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/NullValue.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/StringValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/StringValue.java?rev=1.1 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/MessageValue.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/value/MessageValue.java?rev=1.1 1.2 +4 -4 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/Exists.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/Exists.java.diff?r1=1.1&r2=1.2 1.2 +2 -2 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/Echo.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/Echo.java.diff?r1=1.1&r2=1.2 1.4 +19 -19 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/TemplateRenderer.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/TemplateRenderer.java.diff?r1=1.3&r2=1.4 1.2 +8 -8 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/Event.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/Event.java.diff?r1=1.1&r2=1.2 1.2 +8 -8 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/SimpleProcessor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/SimpleProcessor.java.diff?r1=1.1&r2=1.2 1.3 +12 -12 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/Link.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/Link.java.diff?r1=1.2&r2=1.3 1.2 +7 -7 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/StringArrayRenderer.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/StringArrayRenderer.java.diff?r1=1.1&r2=1.2 1.2 +3 -3 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/Dispose.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/Dispose.java.diff?r1=1.1&r2=1.2 1.2 +12 -12 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/ExceptionRenderer.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/ExceptionRenderer.java.diff?r1=1.1&r2=1.2 1.4 +5 -5 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/URL.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/URL.java.diff?r1=1.3&r2=1.4 1.3 +10 -10 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/TemplateMapRenderer.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/TemplateMapRenderer.java.diff?r1=1.2&r2=1.3 1.4 +8 -8 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/CachedContent.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/CachedContent.java.diff?r1=1.3&r2=1.4 1.2 +9 -9 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/MapEntry.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/MapEntry.java.diff?r1=1.1&r2=1.2 1.3 +7 -7 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/TemplateArrayRenderer.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/TemplateArrayRenderer.java.diff?r1=1.2&r2=1.3 1.2 +7 -7 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/Router.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/Router.java.diff?r1=1.1&r2=1.2 1.2 +4 -4 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/Content.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/Content.java.diff?r1=1.1&r2=1.2 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/Calculator.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/Calculator.java?rev=1.1 1.2 +13 -12 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/tree/Sitemap.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/tree/Sitemap.java.diff?r1=1.1&r2=1.2 1.2 +20 -20 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/tree/TreeLocalizer.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/tree/TreeLocalizer.java.diff?r1=1.1&r2=1.2 1.4 +16 -17 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/tree/TreeRenderer.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/tree/TreeRenderer.java.diff?r1=1.3&r2=1.4 1.5 +5 -5 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/util/ProcessorHelper.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/util/ProcessorHelper.java.diff?r1=1.4&r2=1.5 1.2 +2 -2 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/util/StreamHelper.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/util/StreamHelper.java.diff?r1=1.1&r2=1.2 1.3 +7 -7 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/util/StoreHelper.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/util/StoreHelper.java.diff?r1=1.2&r2=1.3 1.3 +16 -15 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/application/ApplicationManager.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/application/ApplicationManager.java.diff?r1=1.2&r2=1.3 1.2 +6 -6 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/store/RepositoryStore.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/store/RepositoryStore.java.diff?r1=1.1&r2=1.2 1.2 +5 -5 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/store/FormStore.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/store/FormStore.java.diff?r1=1.1&r2=1.2 1.2 +4 -4 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/store/ProcessStore.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/store/ProcessStore.java.diff?r1=1.1&r2=1.2 1.2 +17 -17 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/sql/SQLProcessor.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/sql/SQLProcessor.java.diff?r1=1.1&r2=1.2 1.5 +17 -18 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/connector/webdav/WebdavConnector.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/connector/webdav/WebdavConnector.java.diff?r1=1.4&r2=1.5 1.2 +11 -11 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/query/PropertyQuery.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/query/PropertyQuery.java.diff?r1=1.1&r2=1.2 1.2 +10 -10 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/query/ResourceQuery.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/query/ResourceQuery.java.diff?r1=1.1&r2=1.2 1.2 +9 -9 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TableArrayRenderer.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TableArrayRenderer.java.diff?r1=1.1&r2=1.2 1.4 +6 -6 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TableHandler.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TableHandler.java.diff?r1=1.3&r2=1.4 1.2 +16 -16 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TableMapRenderer.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TableMapRenderer.java.diff?r1=1.1&r2=1.2 1.2 +14 -14 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TableGenerator.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TableGenerator.java.diff?r1=1.1&r2=1.2 1.2 +24 -24 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TablePager.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TablePager.java.diff?r1=1.1&r2=1.2 1.2 +16 -16 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/xml/XPathQuery.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/xml/XPathQuery.java.diff?r1=1.1&r2=1.2 1.2 +9 -9 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/xml/XSLTransformer.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/xml/XSLTransformer.java.diff?r1=1.1&r2=1.2 1.6 +4 -4 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/i18n/MessageManager.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/i18n/MessageManager.java.diff?r1=1.5&r2=1.6 1.2 +2 -2 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/i18n/LocalizedMessage.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/i18n/LocalizedMessage.java.diff?r1=1.1&r2=1.2 1.2 +2 -2 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/security/Login.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/security/Login.java.diff?r1=1.1&r2=1.2 1.2 +8 -8 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/resolver/LocaleResolver.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/resolver/LocaleResolver.java.diff?r1=1.1&r2=1.2 1.5 +8 -8 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/connector/Connector.java http://cvs.apache.org/viewcvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/connector/Connector.java.diff?r1=1.4&r2=1.5 --------------------------------------------------------------------- To unsubscribe, e-mail: richardgriffin@example.net For additional commands, e-mail: richardgriffin@example.net From slide-dev-richardgriffin@example.net Tue Jun 01 09:30:23 2004 Return-Path: <slide-dev-richardgriffin@example.net> Delivered-To: richardgriffin@example.net Received: (qmail 68439 invoked from network); 1 Jun 2004 09:30:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Jun 2004 09:30:22 -0000 Received: (qmail 76725 invoked by uid 500); 1 Jun 2004 09:30:21 -0000 Delivered-To: richardgriffin@example.net Received: (qmail 76659 invoked by uid 500); 1 Jun 2004 09:30:21 -0000 Mailing-List: contact richardgriffin@example.net; run by ezmlm Precedence: bulk List-Unsubscribe: <mailto:richardgriffin@example.net> List-Subscribe: <mailto:richardgriffin@example.net> List-Help: <mailto:richardgriffin@example.net> List-Post: <mailto:richardgriffin@example.net> List-Id: "Slide Developers Mailing List" <slide-dev.jakarta.apache.org> Reply-To: "Slide Developers Mailing List" <richardgriffin@example.net> Delivered-To: mailing list richardgriffin@example.net Received: (qmail 76646 invoked by uid 99); 1 Jun 2004 09:30:21 -0000 Received: from [83.161.120.155] (HELO smtpgtw.c1-group.de) (83.161.120.155) by apache.org (qpsmtpd/0.27.1) with SMTP; Tue, 01 Jun 2004 02:30:21 -0700 Received: from holhhsrvmsx01.c1-group.dom ([83.161.120.155]) by smtpgtw.c1-group.de (SAVSMTP 83.161.120.155) with SMTP id M2004060111154601773 for <richardgriffin@example.net>; Tue, 01 Jun 2004 11:15:46 +0200 Received: from apache.org ([83.161.120.155]) by holhhsrvmsx01.c1-group.dom with Microsoft SMTPSVC(6.0.3790.0); Tue, 1 Jun 2004 11:12:27 +0200 Message-ID: <richardgriffin@example.net> Date: Tue, 01 Jun 2004 10:24:18 +0200 From: Daniel Florey <richardgriffin@example.net> User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.5) Gecko/20030917 X-Accept-Language: de, en, en-us, da, ar-bh MIME-Version: 1.0 To: Slide Developers Mailing List <richardgriffin@example.net> Subject: Re: MKREDIRECTREF Support References: <richardgriffin@example.net> In-Reply-To: <richardgriffin@example.net> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 01 Jun 2004 09:12:27.0815 (UTC) FILETIME=[8F5F2B70:01C447B8] X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Hi Steve, this would be a nice contribution as it make slide aware of even more WebDAV-related protocols. It should be sufficient to add this to the webdav-layer without changing the slide core, right? Would be nice to hear if you make any progress on this issue. Perhaps we could add redirection support to Slide 2.1? Regards, Daniel Steve Vaughan wrote: >I'm currently working on a project that needs redirect >reference support. I've begun making changes to the >2.0 release to add this functionality, and was >wondering if the Slide community had any interest. > >I've been working off of the latest draft, which can >be found at >http://www.greenbytes.de/tech/webdav/draft-ietf-webdav-redirectref-protocol-latest.html > > > > >__________________________________ >Do you Yahoo!? >Friends. Fun. Try the all-new Yahoo! Messenger. >http://messenger.yahoo.com/ > >--------------------------------------------------------------------- >To unsubscribe, e-mail: richardgriffin@example.net >For additional commands, e-mail: richardgriffin@example.net > > > > --------------------------------------------------------------------- To unsubscribe, e-mail: richardgriffin@example.net For additional commands, e-mail: richardgriffin@example.net From slide-dev-richardgriffin@example.net Tue Jun 01 10:55:19 2004 Return-Path: <slide-dev-richardgriffin@example.net> Delivered-To: richardgriffin@example.net Received: (qmail 25162 invoked from network); 1 Jun 2004 10:55:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Jun 2004 10:55:18 -0000 Received: (qmail 99505 invoked by uid 500); 1 Jun 2004 10:54:59 -0000 Delivered-To: richardgriffin@example.net Received: (qmail 99235 invoked by uid 500); 1 Jun 2004 10:54:57 -0000 Mailing-List: contact richardgriffin@example.net; run by ezmlm Precedence: bulk List-Unsubscribe: <mailto:richardgriffin@example.net> List-Subscribe: <mailto:richardgriffin@example.net> List-Help: <mailto:richardgriffin@example.net> List-Post: <mailto:richardgriffin@example.net> List-Id: "Slide Developers Mailing List" <slide-dev.jakarta.apache.org> Reply-To: "Slide Developers Mailing List" <richardgriffin@example.net> Delivered-To: mailing list richardgriffin@example.net Received: (qmail 99191 invoked by uid 99); 1 Jun 2004 10:54:56 -0000 Received: from [83.161.120.155] (HELO moutng.kundenserver.de) (83.161.120.155) by apache.org (qpsmtpd/0.27.1) with ESMTP; Tue, 01 Jun 2004 03:54:56 -0700 Received: from [83.161.120.155] (helo=mrelayng.kundenserver.de) by moutng.kundenserver.de with esmtp (Exim 3.35 #1) id 1BV6us-0004Jh-00 for richardgriffin@example.net; Tue, 01 Jun 2004 12:54:46 +0200 Received: from [83.161.120.155] (helo=zeigermann.de) by mrelayng.kundenserver.de with asmtp (Exim 3.35 #1) id 1BV6us-0004mB-00 for richardgriffin@example.net; Tue, 01 Jun 2004 12:54:46 +0200 Message-ID: <richardgriffin@example.net> Date: Tue, 01 Jun 2004 12:55:10 +0200 From: Oliver Zeigermann <richardgriffin@example.net> User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.6) Gecko/20040113 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Slide Developers Mailing List <richardgriffin@example.net> Subject: Re: [VOTE] 2.1 supports JDK1.4 only Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Provags-ID: kundenserver.de richardgriffin@example.net auth:1111c0dafcdbde51362bbaaba7a9393a X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Call me insane or weak-minded, but even though I initiated this vote I will have to change my vote from +1 to -1. To release something incompatible in a feature release (2.0 -> 2.1) really isn't somehing that puts trust into users and might bring people already using 2.0 into big trouble. Even though the time to think about a 3.0 release certainly is not now, we should defer JDK 1.4 plans to 3.0... Sorry for causing inconvenience, it simply was my fault to prematurely bring this to a vote :( Oliver > To concentrate on a single JDK and have the nice features of JDK 1.4 avaialble (NIO for the tx file store and maybe other stuff, Logging, Exceptions having causes, etc.) I propose to support JDK1.4 (no longer JDK1.3) for the next 2.1 release. > > This means my vote for this is +1 > > > Please vote: > > > - +1: Yes, please > - +-0: I do not care > - -1: No, because... > > > Cheers, > Oliver --------------------------------------------------------------------- To unsubscribe, e-mail: richardgriffin@example.net For additional commands, e-mail: richardgriffin@example.net From slide-dev-richardgriffin@example.net Tue Jun 01 11:44:48 2004 Return-Path: <slide-dev-richardgriffin@example.net> Delivered-To: richardgriffin@example.net Received: (qmail 49625 invoked from network); 1 Jun 2004 11:44:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Jun 2004 11:44:46 -0000 Received: (qmail 62789 invoked by uid 500); 1 Jun 2004 11:44:44 -0000 Delivered-To: richardgriffin@example.net Received: (qmail 62657 invoked by uid 500); 1 Jun 2004 11:44:41 -0000 Mailing-List: contact richardgriffin@example.net; run by ezmlm Precedence: bulk List-Unsubscribe: <mailto:richardgriffin@example.net> List-Subscribe: <mailto:richardgriffin@example.net> List-Help: <mailto:richardgriffin@example.net> List-Post: <mailto:richardgriffin@example.net> List-Id: "Slide Developers Mailing List" <slide-dev.jakarta.apache.org> Reply-To: "Slide Developers Mailing List" <richardgriffin@example.net> Delivered-To: mailing list richardgriffin@example.net Received: (qmail 62607 invoked by uid 99); 1 Jun 2004 11:44:41 -0000 Received: from [83.161.120.155] (HELO moutng.kundenserver.de) (83.161.120.155) by apache.org (qpsmtpd/0.27.1) with ESMTP; Tue, 01 Jun 2004 04:44:41 -0700 Received: from [83.161.120.155] (helo=mrelayng.kundenserver.de) by moutng.kundenserver.de with esmtp (Exim 3.35 #1) id 1BV6Uz-0002fe-00; Tue, 01 Jun 2004 12:28:01 +0200 Received: from [83.161.120.155] (helo=apache.org) by mrelayng.kundenserver.de with asmtp (Exim 3.35 #1) id 1BV6Uy-0002RS-00; Tue, 01 Jun 2004 12:28:01 +0200 Message-ID: <richardgriffin@example.net> Date: Tue, 01 Jun 2004 12:28:13 +0200 From: Oliver Zeigermann <richardgriffin@example.net> Reply-To: Jakarta General List <richardgriffin@example.net> User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.6) Gecko/20040113 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Slide Users Mailing List <richardgriffin@example.net>, Slide Developers Mailing List <richardgriffin@example.net>, Jakarta General List <richardgriffin@example.net>, richardgriffin@example.net Subject: ANN]: Jakarta Slide 2.1 milestone 1 released Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Provags-ID: kundenserver.de richardgriffin@example.net auth:1111c0dafcdbde51362bbaaba7a9393a X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N The Slide community is proud to announce the release of the first milestone towards the release of Slide 2.1. It includes bugfixes mainly in the client section, support for Oracle and MySQL 4.1, performance enhancements and a bunch of new features, among them an event and an extractor framework. Caution: All this is to be considered *work in progress*! You can download it at: http://jakarta.apache.org/slide/download.html Full release notes can be found here: http://cvs.apache.org/viewcvs.cgi/*checkout*/jakarta-slide/RELEASE-NOTES-2.1M1 Project's page: http://jakarta.apache.org/slide Cheers, Oliver (on behalf of The Jakarta Slide Community) --------------------------------------------------------------------- To unsubscribe, e-mail: richardgriffin@example.net For additional commands, e-mail: richardgriffin@example.net From slide-dev-richardgriffin@example.net Tue Jun 01 14:48:54 2004 Return-Path: <slide-dev-richardgriffin@example.net> Delivered-To: richardgriffin@example.net Received: (qmail 83829 invoked from network); 1 Jun 2004 14:48:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Jun 2004 14:48:53 -0000 Received: (qmail 31835 invoked by uid 500); 1 Jun 2004 14:48:55 -0000 Delivered-To: richardgriffin@example.net Received: (qmail 31737 invoked by uid 500); 1 Jun 2004 14:48:53 -0000 Mailing-List: contact richardgriffin@example.net; run by ezmlm Precedence: bulk List-Unsubscribe: <mailto:richardgriffin@example.net> List-Subscribe: <mailto:richardgriffin@example.net> List-Help: <mailto:richardgriffin@example.net> List-Post: <mailto:richardgriffin@example.net> List-Id: "Slide Developers Mailing List" <slide-dev.jakarta.apache.org> Reply-To: "Slide Developers Mailing List" <richardgriffin@example.net> Delivered-To: mailing list richardgriffin@example.net Received: (qmail 31720 invoked by uid 500); 1 Jun 2004 14:48:53 -0000 Received: (qmail 31703 invoked by uid 99); 1 Jun 2004 14:48:52 -0000 Received: from [83.161.120.155] (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.27.1) with SMTP; Tue, 01 Jun 2004 07:48:52 -0700 Received: (qmail 83725 invoked by uid 1823); 1 Jun 2004 14:48:42 -0000 Date: 1 Jun 2004 14:48:42 -0000 Message-ID: <richardgriffin@example.net> From: richardgriffin@example.net To: richardgriffin@example.net Subject: cvs commit: jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/query ResourceQuery.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N dflorey 2004/06/01 07:48:42 Modified: proposals/projector/src/java/org/apache/slide/projector/processor StringArrayRenderer.java proposals/projector/src/java/org/apache/slide/projector/engine Process.java Step.java ProcessorManager.java proposals/projector/src/java/org/apache/slide/projector/descriptor XMLValueDescriptor.java ArrayValueDescriptor.java proposals/projector/src/java/org/apache/slide/projector/connector/webdav WebdavConnector.java proposals/projector/src/java/org/apache/slide/projector/processor/xml XSLTransformer.java proposals/projector/src/java/org/apache/slide/projector/processor/table TableArrayRenderer.java proposals/projector/src/java/org/apache/slide/projector/processor/query ResourceQuery.java Log: Fixed some bugs regarding XSLT Revision Changes Path 1.3 +4 -1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/StringArrayRenderer.java Index: StringArrayRenderer.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/StringArrayRenderer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- StringArrayRenderer.java 1 Jun 2004 07:49:55 -0000 1.2 +++ StringArrayRenderer.java 1 Jun 2004 14:48:42 -0000 1.3 @@ -8,6 +8,7 @@ import org.apache.slide.projector.i18n.DefaultMessage; import org.apache.slide.projector.i18n.ParameterMessage; import org.apache.slide.projector.value.ArrayValue; +import org.apache.slide.projector.value.PrintableValue; import org.apache.slide.projector.value.StringValue; import org.apache.slide.projector.value.Value; @@ -16,7 +17,9 @@ Value []array = ((ArrayValue)input).getArray(); StringBuffer buffer = new StringBuffer(1024); for ( int i = 0; i < array.length; i++ ) { - buffer.append(((StringValue)array[i]).toString()); + if ( array[i] instanceof PrintableValue ) { + ((PrintableValue)array[i]).print(buffer); + } } return new StringValue(buffer.toString()); } 1.8 +1 -0 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Process.java Index: Process.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Process.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Process.java 1 Jun 2004 07:49:54 -0000 1.7 +++ Process.java 1 Jun 2004 14:48:42 -0000 1.8 @@ -120,6 +120,7 @@ } } catch (Exception exception) { logger.log(Level.SEVERE, "Error while parsing process configuration", exception); + throw new ConfigurationException(new ErrorMessage("process/configurationException"), exception); } } 1.4 +6 -3 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Step.java Index: Step.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Step.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Step.java 1 Jun 2004 07:49:54 -0000 1.3 +++ Step.java 1 Jun 2004 14:48:42 -0000 1.4 @@ -79,9 +79,12 @@ Element loadElement = (Element)i.next(); String parameterName = loadElement.getAttributeValue("parameter"); ParameterConfiguration parameterConfiguration = new ParameterConfiguration(parameterName); - Element valueElement = (Element) loadElement.getChildren().iterator().next(); - parameterConfiguration.configure(valueElement); - parameterConfigurations.put(parameterName, parameterConfiguration); + Iterator childIterator = loadElement.getChildren().iterator(); + if ( childIterator.hasNext() ) { + Element valueElement = (Element)childIterator.next(); + parameterConfiguration.configure(valueElement); + parameterConfigurations.put(parameterName, parameterConfiguration); + } } List saveElements = element.getChildren("save"); for ( Iterator i = saveElements.iterator(); i.hasNext(); ) { 1.13 +1 -1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ProcessorManager.java Index: ProcessorManager.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ProcessorManager.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ProcessorManager.java 1 Jun 2004 07:49:54 -0000 1.12 +++ ProcessorManager.java 1 Jun 2004 14:48:42 -0000 1.13 @@ -135,7 +135,7 @@ } public void notify(URI uri, Map information) { - update((URI)configurationToApplication.get(uri), uri); + update((URI)configurationToApplication.get(uri), new URIValue(uri.toString().substring(Constants.REPOSITORY_DOMAIN.length()+1))); } public Processor getProcessor(URI uri) throws ProcessException { 1.4 +1 -0 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/XMLValueDescriptor.java Index: XMLValueDescriptor.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/XMLValueDescriptor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- XMLValueDescriptor.java 1 Jun 2004 07:49:54 -0000 1.3 +++ XMLValueDescriptor.java 1 Jun 2004 14:48:42 -0000 1.4 @@ -4,6 +4,7 @@ import org.apache.slide.projector.i18n.ErrorMessage; import org.apache.slide.projector.value.DocumentValue; import org.apache.slide.projector.value.StreamableValue; +import org.apache.slide.projector.value.StringValue; import org.apache.slide.projector.value.Value; import org.apache.slide.projector.value.XMLValue; import org.jdom.DocType; 1.4 +1 -1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/ArrayValueDescriptor.java Index: ArrayValueDescriptor.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/descriptor/ArrayValueDescriptor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ArrayValueDescriptor.java 1 Jun 2004 07:49:54 -0000 1.3 +++ ArrayValueDescriptor.java 1 Jun 2004 14:48:42 -0000 1.4 @@ -32,7 +32,7 @@ // validate entries Value[] array = ((ArrayValue)value).getArray(); for ( int i = 0; i < array.length; i++ ) { - if ( entryValueDescriptor.validate(array[i], context) == null ) return null; + array[i] = entryValueDescriptor.validate(array[i], context); } return (ArrayValue)value; } else if ( value instanceof List ) { 1.6 +2 -2 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/connector/webdav/WebdavConnector.java Index: WebdavConnector.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/connector/webdav/WebdavConnector.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- WebdavConnector.java 1 Jun 2004 07:49:58 -0000 1.5 +++ WebdavConnector.java 1 Jun 2004 14:48:42 -0000 1.6 @@ -136,7 +136,7 @@ } public Value[] search(String query, Credentials credentials) throws IOException { - String url = Constants.REPOSITORY_DOMAIN; + String url = Constants.REPOSITORY_DOMAIN+"/"; SearchMethod searchMethod = new SearchMethod(url, query); searchMethod.setDoAuthentication(true); HttpState httpState = new HttpState(); @@ -145,7 +145,7 @@ List resources = new ArrayList(); for ( Enumeration e = searchMethod.getAllResponseURLs(); e.hasMoreElements(); ) { String uri = (String)e.nextElement(); - uri = uri.substring(Constants.REPOSITORY_DOMAIN.length()); +// uri = uri.substring(Constants.REPOSITORY_DOMAIN.length()); Value resource = getResource(new URIValue(uri), credentials); if ( resource != null ) { resources.add(resource); 1.3 +4 -67 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/xml/XSLTransformer.java Index: XSLTransformer.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/xml/XSLTransformer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- XSLTransformer.java 1 Jun 2004 07:49:58 -0000 1.2 +++ XSLTransformer.java 1 Jun 2004 14:48:42 -0000 1.3 @@ -1,74 +1,11 @@ -/* - * $Header$ - * $Revision$ - * $Date$ - * - * ==================================================================== - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999-2002 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Slide", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact richardgriffin@example.net. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * [Additional notices, if required by prior licensing conditions] - * - */ - package org.apache.slide.projector.processor.xml; import org.apache.slide.projector.ConfigurableProcessor; import org.apache.slide.projector.ConfigurationException; import org.apache.slide.projector.Context; import org.apache.slide.projector.descriptor.ParameterDescriptor; -import org.apache.slide.projector.descriptor.ResourceValueDescriptor; import org.apache.slide.projector.descriptor.ResultEntryDescriptor; +import org.apache.slide.projector.descriptor.XMLValueDescriptor; import org.apache.slide.projector.i18n.DefaultMessage; import org.apache.slide.projector.i18n.ErrorMessage; import org.apache.slide.projector.i18n.ParameterMessage; @@ -95,14 +32,14 @@ private Transformer transformer; public Value process(Value input, Context context) throws Exception { - Document document = ((DocumentValue)input).getDocument(); + Document document = ((DocumentValue)input).getDocument(); JDOMResult result = new JDOMResult(); transformer.transform(new JDOMSource(document), result); return new DocumentValue(result.getDocument()); } public ParameterDescriptor getParameterDescriptor() { - return new ParameterDescriptor(INPUT, new ParameterMessage("xslTransformer/parameter/input"), new ResourceValueDescriptor("text/xml")); + return new ParameterDescriptor(INPUT, new ParameterMessage("xslTransformer/parameter/input"), new XMLValueDescriptor()); } public ResultEntryDescriptor getResultEntryDescriptor() { 1.3 +5 -1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TableArrayRenderer.java Index: TableArrayRenderer.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TableArrayRenderer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TableArrayRenderer.java 1 Jun 2004 07:49:58 -0000 1.2 +++ TableArrayRenderer.java 1 Jun 2004 14:48:42 -0000 1.3 @@ -79,7 +79,11 @@ parameter.remove(LENGTH); int maxIndex = getMaxIndex(parameter); offset = Math.min(offset, maxIndex); - length = Math.min(length, maxIndex-offset); + if ( length > 0 ) { + length = Math.min(length, maxIndex-offset); + } else { + length = maxIndex-offset; + } if ( maxIndex == 0 ) { emptyTemplate.evaluate(buffer, parameter); } else { 1.3 +6 -6 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/query/ResourceQuery.java Index: ResourceQuery.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/query/ResourceQuery.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ResourceQuery.java 1 Jun 2004 07:49:58 -0000 1.2 +++ ResourceQuery.java 1 Jun 2004 14:48:42 -0000 1.3 @@ -60,9 +60,9 @@ public Result process(Map parameter, Context context) throws Exception { String query = ((StringValue)parameter.get(DASL_QUERY)).toString(); - Value []resources = ConnectorFactory.getConnector().search(query, context.getCredentials()); - if ( resources.length == 0 ) return new Result(EMPTY); - return new Result(StateDescriptor.OK, SimpleProcessor.OUTPUT, new ArrayValue(resources)); + Value []values = ConnectorFactory.getConnector().search(query, context.getCredentials()); + if ( values.length == 0 ) return new Result(EMPTY); + return new Result(StateDescriptor.OK, SimpleProcessor.OUTPUT, new ArrayValue(values)); } public ParameterDescriptor[] getParameterDescriptors() { --------------------------------------------------------------------- To unsubscribe, e-mail: richardgriffin@example.net For additional commands, e-mail: richardgriffin@example.net From slide-dev-richardgriffin@example.net Tue Jun 01 15:37:22 2004 Return-Path: <slide-dev-richardgriffin@example.net> Delivered-To: richardgriffin@example.net Received: (qmail 10106 invoked from network); 1 Jun 2004 15:37:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Jun 2004 15:37:21 -0000 Received: (qmail 97270 invoked by uid 500); 1 Jun 2004 15:37:16 -0000 Delivered-To: richardgriffin@example.net Received: (qmail 97166 invoked by uid 500); 1 Jun 2004 15:37:14 -0000 Mailing-List: contact richardgriffin@example.net; run by ezmlm Precedence: bulk List-Unsubscribe: <mailto:richardgriffin@example.net> List-Subscribe: <mailto:richardgriffin@example.net> List-Help: <mailto:richardgriffin@example.net> List-Post: <mailto:richardgriffin@example.net> List-Id: "Slide Developers Mailing List" <slide-dev.jakarta.apache.org> Reply-To: "Slide Developers Mailing List" <richardgriffin@example.net> Delivered-To: mailing list richardgriffin@example.net Received: (qmail 97134 invoked by uid 99); 1 Jun 2004 15:37:13 -0000 Received: from [83.161.120.155] (HELO web11803.mail.yahoo.com) (83.161.120.155) by apache.org (qpsmtpd/0.27.1) with SMTP; Tue, 01 Jun 2004 08:37:13 -0700 Message-ID: <richardgriffin@example.net> Received: from [83.161.120.155] by web11803.mail.yahoo.com via HTTP; Tue, 01 Jun 2004 08:36:55 PDT Date: Tue, 1 Jun 2004 08:36:55 -0700 (PDT) From: Steve Vaughan <richardgriffin@example.net> Subject: Re: MKREDIRECTREF Support To: Slide Developers Mailing List <richardgriffin@example.net> In-Reply-To: <richardgriffin@example.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N I did make changes to the slide kernel: 1) content/NodeRevisionDescriptor - Add new resource type and methods. 2) util/resources/messages.properties - Additional messages used during NodeRevisionDescriptor validation. 2) util/Configuration and slide.properties - Allows the redirect ref support to be enabled/disabled. --- Daniel Florey <richardgriffin@example.net> wrote: > Hi Steve, > this would be a nice contribution as it make slide > aware of even more > WebDAV-related protocols. > It should be sufficient to add this to the > webdav-layer without changing > the slide core, right? > Would be nice to hear if you make any progress on > this issue. Perhaps we > could add redirection support to Slide 2.1? > Regards, > Daniel > > Steve Vaughan wrote: > > >I'm currently working on a project that needs > redirect > >reference support. I've begun making changes to > the > >2.0 release to add this functionality, and was > >wondering if the Slide community had any interest. > > > >I've been working off of the latest draft, which > can > >be found at > >http://www.greenbytes.de/tech/webdav/draft-ietf-webdav-redirectref-protocol-latest.html > > > > > > > > > >__________________________________ > >Do you Yahoo!? > >Friends. Fun. Try the all-new Yahoo! Messenger. > >http://messenger.yahoo.com/ > > > >--------------------------------------------------------------------- > >To unsubscribe, e-mail: > richardgriffin@example.net > >For additional commands, e-mail: > richardgriffin@example.net > > > > > > > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: > richardgriffin@example.net > For additional commands, e-mail: > richardgriffin@example.net > __________________________________ Do you Yahoo!? Friends. Fun. Try the all-new Yahoo! Messenger. http://messenger.yahoo.com/ --------------------------------------------------------------------- To unsubscribe, e-mail: richardgriffin@example.net For additional commands, e-mail: richardgriffin@example.net From slide-dev-richardgriffin@example.net Tue Jun 01 16:14:42 2004 Return-Path: <slide-dev-richardgriffin@example.net> Delivered-To: richardgriffin@example.net Received: (qmail 40828 invoked from network); 1 Jun 2004 16:14:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Jun 2004 16:14:41 -0000 Received: (qmail 90788 invoked by uid 500); 1 Jun 2004 16:13:33 -0000 Delivered-To: richardgriffin@example.net Received: (qmail 90617 invoked by uid 500); 1 Jun 2004 16:13:31 -0000 Mailing-List: contact richardgriffin@example.net; run by ezmlm Precedence: bulk List-Unsubscribe: <mailto:richardgriffin@example.net> List-Subscribe: <mailto:richardgriffin@example.net> List-Help: <mailto:richardgriffin@example.net> List-Post: <mailto:richardgriffin@example.net> List-Id: "Slide Developers Mailing List" <slide-dev.jakarta.apache.org> Reply-To: "Slide Developers Mailing List" <richardgriffin@example.net> Delivered-To: mailing list richardgriffin@example.net Received: (qmail 90453 invoked by uid 500); 1 Jun 2004 16:13:29 -0000 Received: (qmail 90177 invoked by uid 99); 1 Jun 2004 16:13:27 -0000 Received: from [83.161.120.155] (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.27.1) with SMTP; Tue, 01 Jun 2004 09:13:26 -0700 Received: (qmail 39403 invoked by uid 1823); 1 Jun 2004 16:13:10 -0000 Date: 1 Jun 2004 16:13:10 -0000 Message-ID: <richardgriffin@example.net> From: richardgriffin@example.net To: richardgriffin@example.net Subject: cvs commit: jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/application ApplicationManager.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N dflorey 2004/06/01 09:13:10 Modified: proposals/projector/src/java/org/apache/slide/projector Constants.java proposals/projector/src/java/org/apache/slide/projector/connector/webdav WebdavConnector.java proposals/projector/src/java/org/apache/slide/projector/application ApplicationManager.java Log: Search method now works both with slide and exchange (although different search syntax is still needed) Revision Changes Path 1.9 +7 -5 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/Constants.java Index: Constants.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/Constants.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Constants.java 1 Jun 2004 07:49:54 -0000 1.8 +++ Constants.java 1 Jun 2004 16:13:10 -0000 1.9 @@ -9,20 +9,22 @@ public interface Constants { // FIXME should be read from configuration public final static String CONNECTOR = "org.apache.slide.projector.connector.webdav.WebdavConnector"; + public final static String REPOSITORY_DOMAIN = "/slide"; public final static String REPOSITORY_HOST = "localhost"; public final static int REPOSITORY_PORT = 8080; public final static String REPOSITORY_USER = "root"; public final static String REPOSITORY_PASSWORD = "root"; public final static Protocol REPOSITORY_PROTOCOL = Protocol.getProtocol("http"); + /* - public final static String REPOSITORY_DOMAIN = "/exchange/user"; - public final static String REPOSITORY_HOST = "xxx.xxx.xxx.xxx"; + public final static String REPOSITORY_DOMAIN = "/exchange/dflorey"; + public final static String REPOSITORY_HOST = "192.168.x.x"; public final static int REPOSITORY_PORT = 443; // Is certificated? public final static Protocol REPOSITORY_PROTOCOL = new Protocol("https", new EasySSLProtocolSocketFactory(), REPOSITORY_PORT); - public final static String REPOSITORY_USER = "exchangeUser"; - public final static String REPOSITORY_PASSWORD = "exchangePasswd"; + public final static String REPOSITORY_USER = "dflorey"; + public final static String REPOSITORY_PASSWORD = "xxx"; */ public final static Credentials CREDENTIALS = new UsernamePasswordCredentials(REPOSITORY_USER, REPOSITORY_PASSWORD); @@ -36,7 +38,7 @@ public final static int OFF = 2; public final static int NOTIFICATION_METHOD = UDP; - public final static String NOTIFICATION_HOST = "83.161.120.155"; + public final static String NOTIFICATION_HOST = "83.161.120.155"; public final static int NOTIFICATION_PORT = 4444; public final static int POLL_INTERVAL = 60000000; // milliseconds public final static int SUBSCRIPTION_LIFETIME = 3600; 1.7 +4 -2 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/connector/webdav/WebdavConnector.java Index: WebdavConnector.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/connector/webdav/WebdavConnector.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- WebdavConnector.java 1 Jun 2004 14:48:42 -0000 1.6 +++ WebdavConnector.java 1 Jun 2004 16:13:10 -0000 1.7 @@ -145,8 +145,10 @@ List resources = new ArrayList(); for ( Enumeration e = searchMethod.getAllResponseURLs(); e.hasMoreElements(); ) { String uri = (String)e.nextElement(); -// uri = uri.substring(Constants.REPOSITORY_DOMAIN.length()); - Value resource = getResource(new URIValue(uri), credentials); + if ( uri.indexOf(Constants.REPOSITORY_DOMAIN) > 0 ) { + uri = uri.substring(uri.indexOf(Constants.REPOSITORY_DOMAIN)); + } + Value resource = getResource(new URIValue(uri), credentials); if ( resource != null ) { resources.add(resource); } 1.4 +3 -3 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/application/ApplicationManager.java Index: ApplicationManager.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/application/ApplicationManager.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ApplicationManager.java 1 Jun 2004 07:49:57 -0000 1.3 +++ ApplicationManager.java 1 Jun 2004 16:13:10 -0000 1.4 @@ -71,8 +71,8 @@ if ( !applicationUri.endsWith("/") ) { applicationUri = applicationUri + "/"; } - if ( applicationUri.startsWith(Constants.REPOSITORY_DOMAIN) ) { - applicationUri = applicationUri.substring(Constants.REPOSITORY_DOMAIN.length()); + if ( applicationUri.indexOf(Constants.REPOSITORY_DOMAIN) > 0 ) { + applicationUri = applicationUri.substring(applicationUri.indexOf(Constants.REPOSITORY_DOMAIN)+Constants.REPOSITORY_DOMAIN.length()); } if ( !installedApplications.containsKey(applicationUri) ) { Application installedApplication = parseApplication(new URIValue(applicationUri)); @@ -170,7 +170,7 @@ ConnectorFactory.getConnector().subscribe("Update", new URIValue(Constants.REPOSITORY_DOMAIN+application.getUri().toString()), 0, Constants.SUBSCRIPTION_LIFETIME, Constants.NOTIFICATION_DELAY, new Subscriber() { public void notify(URI uri, Map information) { - applicationManager.updateApplication(uri); + applicationManager.updateApplication(new URIValue(uri.toString().substring(Constants.REPOSITORY_DOMAIN.length()+1))); } }, context.getCredentials()); for ( Iterator i = application.getContent().entrySet().iterator(); i.hasNext(); ) { --------------------------------------------------------------------- To unsubscribe, e-mail: richardgriffin@example.net For additional commands, e-mail: richardgriffin@example.net From slide-dev-richardgriffin@example.net Tue Jun 01 20:35:09 2004 Return-Path: <slide-dev-richardgriffin@example.net> Delivered-To: richardgriffin@example.net Received: (qmail 93134 invoked from network); 1 Jun 2004 20:35:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Jun 2004 20:35:08 -0000 Received: (qmail 60540 invoked by uid 500); 1 Jun 2004 20:34:37 -0000 Delivered-To: richardgriffin@example.net Received: (qmail 60347 invoked by uid 500); 1 Jun 2004 20:34:33 -0000 Mailing-List: contact richardgriffin@example.net; run by ezmlm Precedence: bulk List-Unsubscribe: <mailto:richardgriffin@example.net> List-Subscribe: <mailto:richardgriffin@example.net> List-Help: <mailto:richardgriffin@example.net> List-Post: <mailto:richardgriffin@example.net> List-Id: "Slide Developers Mailing List" <slide-dev.jakarta.apache.org> Reply-To: "Slide Developers Mailing List" <richardgriffin@example.net> Delivered-To: mailing list richardgriffin@example.net Received: (qmail 60219 invoked by uid 99); 1 Jun 2004 20:34:30 -0000 Received: from [83.161.120.155] (HELO [83.161.120.155]) (83.161.120.155) by apache.org (qpsmtpd/0.27.1) with ESMTP; Tue, 01 Jun 2004 13:34:30 -0700 Date: 01 Jun 04 20:33:01 From: Stefan Bodewig <richardgriffin@example.net> To: richardgriffin@example.net Subject: [GUMP@brutus]: jakarta-slide/jakarta-slide failed X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact folk at richardgriffin@example.net. Project jakarta-slide has an issue affecting its community integration, and has been outstanding for 21 runs. Project State : 'Failed', Reason 'Build Failed' Full details are available at: http://brutus.apache.org:8080/gump/jakarta-slide/jakarta-slide/index.html That said, some snippets follow: The following annotations were provided: -WARNING- Unnamed property for [jakarta-slide] in depend on: jakarta-lucene -WARNING- Unnamed property for [jakarta-slide] in depend on: jaxen -INFO- Dependency on xml-xerces exists, no need to add for property xmlparser.jar. -INFO- Dependency on antlr exists, no need to add for property antlr-tools.jar. -INFO- Dependency on dist-ant exists, no need to add for property ant.jar. -INFO- Dependency on jmx exists, no need to add for property jmx.jar. -INFO- Dependency on jakarta-struts exists, no need to add for property struts.lib. -INFO- Dependency on jakarta-taglibs-standard exists, no need to add for property jstl.jar. -INFO- Dependency on jakarta-taglibs-standard exists, no need to add for property taglibs-standard.jar. -INFO- Dependency on jakarta-tomcat-4.0 exists, no need to add for property catalina.dist. -INFO- Enable "debug" output, due to a sequence of 20 previous errors. -INFO- Failed with reason build failed The following work was performed: http://brutus.apache.org:8080/gump/jakarta-slide/jakarta-slide/gump_work/build_jakarta-slide_jakarta-slide.html Work Name: build_jakarta-slide_jakarta-slide (Type: Build) State: Failed Elapsed: 0 hours, 0 minutes, 23 seconds Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar:/usr/local/gump/public/workspace/xml-xerces2/java/build/xml-apis.jar:/usr/local/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar org.apache.tools.ant.Main -debug -Dgump.merge=/usr/local/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Djakarta-lucene=/usr/local/gump/public/workspace/jakarta-lucene/build/lucene-20040601.jar -Djdbc20ext.jar=/usr/local/gump/packages/jdbc2_0/jdbc2_0-stdext.jar -Dantlr-tools.jar=/usr/local/gump/packages/antlr-2.7.3/antlr.jar -Djaxp.jar=/usr/local/gump/packages/java_xml_pack-summer-02_01/jaxp-1.2_01/jaxp-api.jar -Dservlet.jar=/usr/local/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar -Djstl.jar=/usr/local/gump/public/workspace/jakarta-taglibs/dist/standard/lib/jstl.jar -Djunit.jar=/usr/local/gump/public/workspace/dist/junit/junit.jar -Dcommons-httpclient.jar=/usr/local/gump/public/workspace/commons-httpclient-20-branch/dist/commons-httpclient-2.0-20040601.jar -Dxmlparser.jar=/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar -Djmx.jar=/usr/local/gump/packages/jmx-1_2-ri/lib/jmxri.jar -Dstruts.lib=/usr/local/gump/public/workspace/jakarta-struts/dist/lib -Dantlr.jar=/usr/local/gump/packages/antlr-2.7.3/antlr.jar -Dversion=20040601 -Djaxen=/usr/local/gump/public/workspace/jaxen/target/jaxen-20040601.jar -Dxmlapi.jar=/usr/local/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar -Dtaglibs-standard.jar=/usr/local/gump/public/workspace/jakarta-taglibs/dist/standard/lib/standard.jar -Dlog4j.jar=/usr/local/gump/public/workspace/logging-log4j/log4j-20040601.jar -Djdom.jar=/usr/local/gump/public/workspace/jdom/build/jdom.jar -Djndi.jar=/usr/local/gump/packages/jndi1_2_1/lib/jndi.jar -Dcatalina.dist=/usr/local/gump/public/workspace/jakarta-tomcat-4.0/dist -Dcommons-modeler.jar=/usr/local/gump/public/workspace/jakarta-commons/modeler/dist/commons-modeler.jar -Dant.jar=/usr/local/gump/public/workspace/ant/build/lib/ant.jar -Djta.jar=/usr/local/gump/packages/jta-spec1_0_1/jta-spec1_0_1.jar full-dist [Working Directory: /usr/local/gump/public/workspace/jakarta-slide] CLASSPATH : /usr/local/j2sdk1.4.2_04/lib/tools.jar:/usr/local/gump/public/workspace/jakarta-slide/build/classes:/usr/local/gump/public/workspace/jakarta-slide/build/client/classes:/usr/local/gump/public/workspace/jakarta-slide/webdavclient/build/clientlib/classes:/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-20040601.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-stylebook.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-swing.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-trax.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-junit.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-xalan2.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant.jar:/usr/local/gump/public/workspace/jakarta-commons/dbcp/dist/commons-dbcp.jar:/usr/local/gump/public/workspace/jakarta-commons/pool/dist/commons-pool.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-stylebook.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-swing.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-apache-resolver.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-nodeps.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-apache-regexp.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-commons-net.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-apache-log4j.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-commons-logging.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-jai.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-jmf.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-launcher.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-jdepend.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-apache-bsf.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-xalan2.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-apache-oro.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-apache-bcel.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-trax.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-antlr.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-junit.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-jsch.jar:/usr/local/gump/public/workspace/ant/build/lib/ant-javamail.jar:/usr/local/gump/public/workspace/ant/build/lib/ant.jar:/usr/local/gump/public/workspace/ant/bootstrap/lib/ant-launcher.jar:/usr/local/gump/public/workspace/ant/bootstrap/lib/ant.jar:/usr/local/gump/public/workspace/xml-stylebook/bin/stylebook-1.0-b3_xalan-2.jar:/usr/local/gump/public/workspace/dist/junit/junit.jar:/usr/local/gump/public/workspace/jakarta-tomcat-4.0/dist/common/lib/naming-resources.jar:/usr/local/gump/public/workspace/jakarta-tomcat-4.0/dist/common/lib/jasper-compiler.jar:/usr/local/gump/public/workspace/jakarta-tomcat-4.0/dist/server/lib/servlets-default.jar:/usr/local/gump/public/workspace/jakarta-tomcat-4.0/dist/common/lib/naming-common.jar:/usr/local/gump/public/workspace/jakarta-tomcat-4.0/dist/server/lib/catalina.jar:/usr/local/gump/public/workspace/jakarta-tomcat-4.0/dist/bin/bootstrap.jar:/usr/local/gump/public/workspace/jakarta-tomcat-4.0/dist/common/lib/jasper-runtime.jar:/usr/local/gump/public/workspace/jakarta-tomcat-4.0/dist/server/lib/servlets-common.jar:/usr/local/gump/public/workspace/jakarta-tomcat-4.0/dist/server/lib/servlets-invoker.jar:/usr/local/gump/public/workspace/jakarta-struts/dist/lib/struts.jar:/usr/local/gump/public/workspace/jakarta-oro/jakarta-oro-20040601.jar:/usr/local/gump/public/workspace/jakarta-poi/build/dist/poi-2.5.1-final-20040601.jar:/usr/local/gump/public/workspace/jakarta-poi/build/dist/poi-scratchpad-2.5.1-final-20040601.jar:/usr/local/gump/public/workspace/jakarta-poi/build/dist/poi-contrib-2.5.1-final-20040601.jar:/usr/local/gump/public/workspace/xmlunit/lib/xmlunit-20040601.jar:/usr/local/gump/packages/jmx-1_2-ri/lib/jmxri.jar:/usr/local/gump/packages/jmx-1_2-ri/lib/jmxtools.jar:/usr/local/gump/public/workspace/jakarta-taglibs/dist/standard/lib/standard.jar:/usr/local/gump/public/workspace/jakarta-taglibs/dist/standard/lib/jstl.jar:/usr/local/gump/packages/java_xml_pack-summer-02_01/jaxp-1.2_01/jaxp-api.jar:/usr/local/gump/public/workspace/jdom/build/jdom.jar:/usr/local/gump/packages/jta-spec1_0_1/jta-spec1_0_1.jar:/usr/local/gump/public/workspace/logging-log4j/log4j-20040601.jar:/usr/local/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar:/usr/local/gump/packages/antlr-2.7.3/antlr.jar:/usr/local/gump/packages/jdbc2_0/jdbc2_0-stdext.jar:/usr/local/gump/public/workspace/jakarta-commons/modeler/dist/commons-modeler.jar:/usr/local/gump/packages/jndi1_2_1/lib/jndi.jar:/usr/local/gump/public/workspace/jakarta-lucene/build/lucene-20040601.jar:/usr/local/gump/public/workspace/jaxen/target/jaxen-20040601.jar:/usr/local/gump/public/workspace/commons-httpclient-20-branch/dist/commons-httpclient-2.0-20040601.jar--------------------------------------------- [javac] /usr/local/gump/public/workspace/jakarta-slide/src/wrappers/log4j/Log4jLogger.java:215: incompatible types [javac] found : org.apache.log4j.Level [javac] required: org.apache.log4j.Priority [javac] result = Priority.DEBUG; [javac] ^ [javac] /usr/local/gump/public/workspace/jakarta-slide/src/wrappers/log4j/Log4jLogger.java:220: warning: org.apache.log4j.Priority in org.apache.log4j has been deprecated [javac] result = Priority.toPriority(priority); [javac] ^ [javac] /usr/local/gump/public/workspace/jakarta-slide/src/wrappers/log4j/Log4jLogger.java:220: cannot resolve symbol [javac] symbol : method toPriority (int) [javac] location: class org.apache.log4j.Priority [javac] result = Priority.toPriority(priority); [javac] ^ [javac] /usr/local/gump/public/workspace/jakarta-slide/src/wrappers/log4j/Log4jLogger.java:228: warning: org.apache.log4j.Priority in org.apache.log4j has been deprecated [javac] protected int fromPriority(Priority priority) { [javac] ^ [javac] /usr/local/gump/public/workspace/jakarta-slide/src/wrappers/log4j/Log4jLogger.java:231: warning: org.apache.log4j.Priority in org.apache.log4j has been deprecated [javac] if (priority.equals(Priority.FATAL)){ [javac] ^ [javac] /usr/local/gump/public/workspace/jakarta-slide/src/wrappers/log4j/Log4jLogger.java:234: warning: org.apache.log4j.Priority in org.apache.log4j has been deprecated [javac] else if (priority.equals(Priority.ERROR)){ [javac] ^ [javac] /usr/local/gump/public/workspace/jakarta-slide/src/wrappers/log4j/Log4jLogger.java:237: warning: org.apache.log4j.Priority in org.apache.log4j has been deprecated [javac] else if (priority.equals(Priority.WARN)){ [javac] ^ [javac] /usr/local/gump/public/workspace/jakarta-slide/src/wrappers/log4j/Log4jLogger.java:240: warning: org.apache.log4j.Priority in org.apache.log4j has been deprecated [javac] else if (priority.equals(Priority.INFO)){ [javac] ^ [javac] /usr/local/gump/public/workspace/jakarta-slide/src/wrappers/log4j/Log4jLogger.java:243: warning: org.apache.log4j.Priority in org.apache.log4j has been deprecated [javac] else if (priority.equals(Priority.DEBUG)){ [javac] ^ [javac] 9 errors [javac] 24 warnings BUILD FAILED /usr/local/gump/public/workspace/jakarta-slide/build.xml:270: Compile failed; see the compiler error output for details. at org.apache.tools.ant.taskdefs.Javac.compile(Javac.java:938) at org.apache.tools.ant.taskdefs.Javac.execute(Javac.java:758) at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:275) at org.apache.tools.ant.Task.perform(Task.java:363) at org.apache.tools.ant.Target.execute(Target.java:321) at org.apache.tools.ant.Target.performTasks(Target.java:348) at org.apache.tools.ant.Project.executeTarget(Project.java:1212) at org.apache.tools.ant.Project.executeTargets(Project.java:1060) at org.apache.tools.ant.Main.runBuild(Main.java:666) at org.apache.tools.ant.Main.startAnt(Main.java:187) at org.apache.tools.ant.Main.start(Main.java:151) at org.apache.tools.ant.Main.main(Main.java:234) Total time: 22 seconds --------------------------------------------- To subscribe to this information via syndicated feeds: RSS: http://brutus.apache.org:8080/gump/jakarta-slide/jakarta-slide/rss.xml Atom: http://brutus.apache.org:8080/gump/jakarta-slide/jakarta-slide/atom.xml -- Produced by Gump 2.0.3-alpha-0002. [Run (20040601 09:00:06, brutus:brutus-public:20040601 09:00:06)] http://brutus.apache.org:8080/gump/index.html http://brutus.apache.org:8080/gump/options.html -- Apache Gump http://gump.apache.org/ [Instance: brutus] --------------------------------------------------------------------- To unsubscribe, e-mail: richardgriffin@example.net For additional commands, e-mail: richardgriffin@example.net From slide-dev-richardgriffin@example.net Wed Jun 02 14:26:14 2004 Return-Path: <slide-dev-richardgriffin@example.net> Delivered-To: richardgriffin@example.net Received: (qmail 64632 invoked from network); 2 Jun 2004 14:26:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 2 Jun 2004 14:26:13 -0000 Received: (qmail 78079 invoked by uid 500); 2 Jun 2004 14:26:06 -0000 Delivered-To: richardgriffin@example.net Received: (qmail 77872 invoked by uid 500); 2 Jun 2004 14:26:04 -0000 Mailing-List: contact richardgriffin@example.net; run by ezmlm Precedence: bulk List-Unsubscribe: <mailto:richardgriffin@example.net> List-Subscribe: <mailto:richardgriffin@example.net> List-Help: <mailto:richardgriffin@example.net> List-Post: <mailto:richardgriffin@example.net> List-Id: "Slide Developers Mailing List" <slide-dev.jakarta.apache.org> Reply-To: "Slide Developers Mailing List" <richardgriffin@example.net> Delivered-To: mailing list richardgriffin@example.net Received: (qmail 77738 invoked by uid 500); 2 Jun 2004 14:26:03 -0000 Received: (qmail 77707 invoked by uid 99); 2 Jun 2004 14:26:03 -0000 Received: from [83.161.120.155] (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.27.1) with SMTP; Wed, 02 Jun 2004 07:26:03 -0700 Received: (qmail 43187 invoked by uid 1823); 2 Jun 2004 13:58:53 -0000 Date: 2 Jun 2004 13:58:53 -0000 Message-ID: <richardgriffin@example.net> From: richardgriffin@example.net To: richardgriffin@example.net Subject: cvs commit: jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/application ApplicationManager.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N dflorey 2004/06/02 06:58:53 Modified: proposals/projector/src/java/org/apache/slide/projector/processor/xml XPathQuery.java proposals/projector/src/java/org/apache/slide/projector/engine ResultConfiguration.java Process.java ParameterConfiguration.java proposals/projector/src/java/org/apache/slide/projector Store.java proposals/projector/src/java/org/apache/slide/projector/connector/webdav WebdavConnector.java proposals/projector/src/java/org/apache/slide/projector/application ApplicationManager.java Added: proposals/projector/src/java/org/apache/slide/projector/processor/query ResultResolver.java Log: Improved DASLQuery-handling and fixed some bugs in the real core... Revision Changes Path 1.3 +28 -24 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/xml/XPathQuery.java Index: XPathQuery.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/xml/XPathQuery.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- XPathQuery.java 1 Jun 2004 07:49:58 -0000 1.2 +++ XPathQuery.java 2 Jun 2004 13:58:53 -0000 1.3 @@ -28,16 +28,7 @@ public Value process(Value input, Context context) throws Exception { XPath xPath = XPath.newInstance(((StringValue)input).toString()); List nodeList = xPath.selectNodes(rootElement); - if ( nodeList.size() > 1 ) { - List resources = new ArrayList(); - for ( Iterator i = nodeList.iterator(); i.hasNext(); ) { - resources.add(createResourceFromNode(i.next())); - } - Value[] array = new Value[resources.size()]; - return new ArrayValue((Value [])resources.toArray(array)); - } else { - return createResourceFromNode(nodeList.get(0)); - } + return createValueFromNodeList(nodeList); } public ParameterDescriptor getParameterDescriptor() { @@ -56,19 +47,32 @@ } } - private Value createResourceFromNode(Object node) throws ProcessException { - if ( node instanceof Element ) { - return new ElementValue((Element)node); - } else if ( node instanceof Attribute ) { - return new StringValue(((Attribute)node).getValue()); - } else if ( node instanceof Text ) { - return new StringValue(((Text)node).getText()); - } else if ( node instanceof Comment ) { - return new StringValue(((Comment)node).getText()); - } else if ( node instanceof CDATA ) { - return new StringValue(((CDATA)node).toString()); - } else if ( node instanceof ProcessingInstruction ) { - return new StringValue(((ProcessingInstruction)node).getData()); + public static Value createValueFromNodeList(List nodeList) throws ProcessException { + if ( nodeList.size() > 1 ) { + List resources = new ArrayList(); + for ( Iterator i = nodeList.iterator(); i.hasNext(); ) { + resources.add(createValueFromNode(i.next())); + } + Value[] array = new Value[resources.size()]; + return new ArrayValue((Value [])resources.toArray(array)); + } else { + return createValueFromNode(nodeList.get(0)); + } + } + + public static Value createValueFromNode(Object node) throws ProcessException { + if ( node instanceof Element ) { + return new ElementValue((Element)node); + } else if ( node instanceof Attribute ) { + return new StringValue(((Attribute)node).getValue()); + } else if ( node instanceof Text ) { + return new StringValue(((Text)node).getText()); + } else if ( node instanceof Comment ) { + return new StringValue(((Comment)node).getText()); + } else if ( node instanceof CDATA ) { + return new StringValue(((CDATA)node).toString()); + } else if ( node instanceof ProcessingInstruction ) { + return new StringValue(((ProcessingInstruction)node).getData()); } throw new ProcessException(new ErrorMessage("unconvertableJDomNode")); } 1.5 +26 -6 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ResultConfiguration.java Index: ResultConfiguration.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ResultConfiguration.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ResultConfiguration.java 1 Jun 2004 07:49:54 -0000 1.4 +++ ResultConfiguration.java 2 Jun 2004 13:58:53 -0000 1.5 @@ -4,6 +4,7 @@ import org.apache.slide.projector.Context; import org.apache.slide.projector.Result; import org.apache.slide.projector.Store; +import org.apache.slide.projector.descriptor.ResultEntryDescriptor; import org.apache.slide.projector.util.StoreHelper; import org.apache.slide.projector.value.MapValue; import org.apache.slide.projector.value.StreamableValue; @@ -56,8 +57,9 @@ return name; } - protected void storeValue(Value value, Result result, Context context) { - if (presentable ) { + protected void storeValue(Value value, Store stepStore, Result result, ResultEntryDescriptor[] resultEntryDescriptors, Context context) { + // FIXME: Throw process exception instead of severe logging + if (presentable ) { if ( value instanceof StreamableValue ) { if ( context instanceof HttpContext ) { ((HttpContext)context).setPresentableResource((StreamableValue)value); @@ -68,11 +70,29 @@ logger.log(Level.SEVERE, "Only resources of type StreamableResource can be presented!"); } } - if ( store == Store.NONE ) { - } else if ( store == Store.OUTPUT ) { - result.addResultEntry(key, value); + Store resultStore = stepStore; + if ( store == Store.OUTPUT ) { + // check if result is defined + boolean resultDefined = false; + for ( int i = 0; i < resultEntryDescriptors.length; i++ ) { + if ( resultEntryDescriptors[i].getName().equals(key) ) { + // check if result matches description + if ( ContentType.matches(resultEntryDescriptors[i].getContentType(), value.getContentType()) ) { + result.addResultEntry(key, value); + resultDefined = true; + break; + } else { + logger.log(Level.SEVERE, "Storing result with key '"+key+"' failed, because content type of generated result is '"+value.getContentType()+"' and does not match defined content type '"+resultEntryDescriptors[i].getContentType()+"'"); + } + } + } + if ( !resultDefined ) { + logger.log(Level.SEVERE, "Storing result failed, because result with key '"+key+"' is not defined in processor description!"); + } } else { - Store resultStore = context.getStore(store); + if ( store != Store.NONE ) { + resultStore = context.getStore(store); + } if ( resultStore == null ) { logger.log(Level.SEVERE, "Storing result with key '"+key+"' failed, because store '"+Store.stores[store]+"' in not available in context '"+context+"'"); } else { 1.9 +19 -17 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Process.java Index: Process.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Process.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Process.java 1 Jun 2004 14:48:42 -0000 1.8 +++ Process.java 2 Jun 2004 13:58:53 -0000 1.9 @@ -62,7 +62,7 @@ this.parameterDescriptors = (ParameterDescriptor [])parameterDescriptors.toArray(new ParameterDescriptor[parameterDescriptors.size()]); List outputResults = XPath.newInstance("/process/description/output/result").selectNodes(rootElement); List resultEntryDescriptors = new ArrayList(); - for ( Iterator i = inputParamters.iterator(); i.hasNext(); ) { + for ( Iterator i = outputResults.iterator(); i.hasNext(); ) { Element outputResult = (Element)i.next(); String name = outputResult.getAttributeValue("name"); String description = outputResult.getAttributeValue("description"); @@ -126,18 +126,20 @@ public Result process(Map parameter, Context context) throws Exception { URI processorUri = ProcessorManager.getInstance().getProcessorDescriptor(this).getUri(); - context.setProcess(processorUri); - String nextStep = getStep(firstStep, context); - Result result = null; - Step step; + context.setProcess(processorUri); // Remember current process in context + String nextStep = getStep(firstStep, context); // Lookup the first step of this process + Store stepStore = new Cache(); // This store is used to allow stack-like result/parameter delivery between steps + Result result = new Result(OK); // The result of this process processor + Result stepResult = null; // The result of the last executed step + Step step; // The current step do { logger.log(Level.INFO, "Processing step: " + nextStep); - context.setStep(nextStep); + context.setStep(nextStep); // Remember current step in context step = (Step)steps.get(nextStep); if (step == null) throw new ProcessException(new ErrorMessage("stepNotFound", new String[]{nextStep})); Processor processor = ProcessorManager.getInstance().getProcessor(step.getProcessorURI()); try { - Map processorParameters = loadParameters(step, processor, parameter, result, context); + Map processorParameters = loadParameters(step, processor, parameter, stepStore, context); if ( processor instanceof EnvironmentConsumer ) { checkRequirements((EnvironmentConsumer)processor, context); } @@ -145,12 +147,12 @@ try { if (step.getExpression() == null ) { // no expression set, so invoke processor - result = processor.process(processorParameters, context); - saveResults(step, result, context); + stepResult = processor.process(processorParameters, context); + saveResults(step, stepResult, stepStore, result, getResultDescriptor().getResultEntryDescriptors(), context); } else { // expression set, so schedule this processor as job Scheduler.getInstance().addJob(step.getExpression(), step.getProcessorURI(), processorParameters, step.repeat(), step.isPersistent()); - result = new Result(OK); + stepResult = new Result(OK); } nextStep = routeState(step, result.getState()); } catch (Exception e) { @@ -160,7 +162,8 @@ throw new ValidationException(new ErrorMessage("validationFailed", new Object[] { step.getProcessorURI(), nextStep }), exception); } } while (nextStep != null); - return generateResult(getState(step, result.getState()), result); + result.setState(getState(step, stepResult.getState())); + return result; } public ParameterDescriptor[] getParameterDescriptors() { @@ -246,7 +249,7 @@ return key; } - static Map loadParameters(Step step, Processor processor, Map parameter, Result previousResult, Context context) throws Exception { + static Map loadParameters(Step step, Processor processor, Map parameter, Store stepStore, Context context) throws Exception { // Collect parameters for this processor Map parameters = new HashMap(); ParameterDescriptor[] parameterDescriptors = processor.getParameterDescriptors(); @@ -263,7 +266,7 @@ } } else if ( parameterConfiguration != null ) { try { - Value validatedValue = parameterConfiguration.getValidatedValue(parameterDescriptor, parameter, previousResult, context); + Value validatedValue = parameterConfiguration.getValidatedValue(parameterDescriptor, parameter, stepStore, context); parameters.put(parameterDescriptor.getName(), validatedValue); } catch ( ValidationException exception ) { throw new ProcessException(new ErrorMessage("invalidParameter", new String[]{parameterDescriptor.getName()}), exception); @@ -273,14 +276,13 @@ return parameters; } - private static void saveResults(Step step, Result result, Context context) { + private static void saveResults(Step step, Result stepResult, Store stepStore, Result result, ResultEntryDescriptor[] resultEntryDescriptors, Context context) { // save results by using result configuration - for (Iterator i = step.getResultConfigurations().entrySet().iterator(); i.hasNext();) { Map.Entry entry = (Map.Entry)i.next(); String resultName = (String)entry.getKey(); - Value resultValue = (Value)result.getResultEntries().get(resultName); - ((ResultConfiguration)entry.getValue()).storeValue(resultValue, result, context); + Value resultValue = (Value)stepResult.getResultEntries().get(resultName); + ((ResultConfiguration)entry.getValue()).storeValue(resultValue, stepStore, result, resultEntryDescriptors, context); } } 1.5 +11 -11 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ParameterConfiguration.java Index: ParameterConfiguration.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ParameterConfiguration.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ParameterConfiguration.java 1 Jun 2004 07:49:54 -0000 1.4 +++ ParameterConfiguration.java 2 Jun 2004 13:58:53 -0000 1.5 @@ -55,8 +55,8 @@ this.configuration = configuration; } - public Value getValidatedValue(ParameterDescriptor descriptor, Map parameter, Result result, Context context) throws ProcessException, IOException { - Object evaluatedValue = configuration.getEvaluatedValue(parameter, result, context); + public Value getValidatedValue(ParameterDescriptor descriptor, Map parameter, Store stepStore, Context context) throws ProcessException, IOException { + Object evaluatedValue = configuration.getEvaluatedValue(parameter, stepStore, context); if ( evaluatedValue == null && !descriptor.isRequired() ) { return descriptor.getDefaultValue(); } else { @@ -67,7 +67,7 @@ public interface Configuration { public void configure(Element element); - public Object getEvaluatedValue(Map parameter, Result result, Context context) throws ProcessException, IOException; + public Object getEvaluatedValue(Map parameter, Store stepStore, Context context) throws ProcessException, IOException; } public abstract class EnclosingConfiguration implements Configuration { @@ -97,10 +97,10 @@ return (Configuration[])elements.toArray(configurations); } - public Object getEvaluatedValue(Map parameter, Result result, Context context) throws ProcessException, IOException { + public Object getEvaluatedValue(Map parameter, Store stepStore, Context context) throws ProcessException, IOException { List array = new ArrayList(); for ( Iterator i = elements.iterator(); i.hasNext(); ) { - Object evaluatedValue = ((Configuration)i.next()).getEvaluatedValue(parameter, result, context); + Object evaluatedValue = ((Configuration)i.next()).getEvaluatedValue(parameter, stepStore, context); array.add(evaluatedValue); } return array; @@ -119,11 +119,11 @@ return (Configuration[])entries.toArray(configurations); } - public Object getEvaluatedValue(Map parameter, Result result, Context context) throws ProcessException, IOException { + public Object getEvaluatedValue(Map parameter, Store stepStore, Context context) throws ProcessException, IOException { Map map = new HashMap(); for ( Iterator i = entries.iterator(); i.hasNext(); ) { MapEntryConfiguration entry = (MapEntryConfiguration)i.next(); - map.put(entry.getKey(), entry.getEvaluatedValue(parameter, result, context)); + map.put(entry.getKey(), entry.getEvaluatedValue(parameter, stepStore, context)); } return map; } @@ -146,8 +146,8 @@ return new Configuration[] { configuration }; } - public Object getEvaluatedValue(Map parameter, Result result, Context context) throws ProcessException, IOException { - return configuration.getEvaluatedValue(parameter, result, context); + public Object getEvaluatedValue(Map parameter, Store stepStore, Context context) throws ProcessException, IOException { + return configuration.getEvaluatedValue(parameter, stepStore, context); } public String getKey() { @@ -175,12 +175,12 @@ processorUri = ( processor == null ? null : new URIValue(processor) ); } - public Object getEvaluatedValue(Map parameter, Result result, Context context) throws ProcessException, IOException { + public Object getEvaluatedValue(Map parameter, Store stepStore, Context context) throws ProcessException, IOException { Object value = getValue(); if (isStoreUsed()) { String key = Process.evaluateKey(storeKey, context); if ( getStore() == Store.NONE ) { - if (result != null) value = result.getResultEntries().get(key); + value = stepStore.get(key); } else if ( getStore() == Store.INPUT ) { value = parameter.get(key); } else { 1.3 +1 -1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/Store.java Index: Store.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/Store.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Store.java 6 May 2004 12:54:11 -0000 1.2 +++ Store.java 2 Jun 2004 13:58:53 -0000 1.3 @@ -4,7 +4,7 @@ public interface Store { public final static int NONE = -1; - public final static int REQUEST_PARAMETER = 0; // Reqeust parameter (can only be of type String) + public final static int REQUEST_PARAMETER = 0; // Reqeust parameter (can only be of type String or String[]) public final static int REQUEST_ATTRIBUTE = 1; // Request attribute public final static int REQUEST_HEADER = 2; public final static int SESSION = 3; 1.8 +16 -5 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/connector/webdav/WebdavConnector.java Index: WebdavConnector.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/connector/webdav/WebdavConnector.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- WebdavConnector.java 1 Jun 2004 16:13:10 -0000 1.7 +++ WebdavConnector.java 2 Jun 2004 13:58:53 -0000 1.8 @@ -141,19 +141,30 @@ searchMethod.setDoAuthentication(true); HttpState httpState = new HttpState(); httpState.setCredentials(null, Constants.REPOSITORY_HOST, credentials); - searchMethod.execute(httpState, new HttpConnection(Constants.REPOSITORY_HOST, Constants.REPOSITORY_PORT, Constants.REPOSITORY_PROTOCOL)); - List resources = new ArrayList(); + int state = searchMethod.execute(httpState, new HttpConnection(Constants.REPOSITORY_HOST, Constants.REPOSITORY_PORT, Constants.REPOSITORY_PROTOCOL)); + if ( state != HttpStatus.SC_MULTI_STATUS ) { + throw new IOException("Received status code "+state+" when doing SEARCH with query="+query); + } + List values = new ArrayList(); for ( Enumeration e = searchMethod.getAllResponseURLs(); e.hasMoreElements(); ) { + Map searchResults = new HashMap(); String uri = (String)e.nextElement(); + for ( Enumeration pe = searchMethod.getResponseProperties(uri); pe.hasMoreElements(); ) { + Property property = (Property)pe.nextElement(); + searchResults.put(property.getLocalName(), property.getPropertyAsString()); + } if ( uri.indexOf(Constants.REPOSITORY_DOMAIN) > 0 ) { uri = uri.substring(uri.indexOf(Constants.REPOSITORY_DOMAIN)); } - Value resource = getResource(new URIValue(uri), credentials); + searchResults.put("uri", uri); + /* + Value resource = getResource(new URIValue(uri), credentials); if ( resource != null ) { resources.add(resource); } + */ + values.add(new MapValue(searchResults)); } - Value[] resourceArray = new Value[resources.size()]; - return (Value [])resources.toArray(resourceArray); + return (Value [])values.toArray(new Value[values.size()]); } } 1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/query/ResultResolver.java Index: ResultResolver.java =================================================================== /* * * ==================================================================== * * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package org.apache.slide.projector.processor.query; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; import org.apache.slide.projector.Context; import org.apache.slide.projector.Processor; import org.apache.slide.projector.Result; import org.apache.slide.projector.URI; import org.apache.slide.projector.connector.ConnectorFactory; import org.apache.slide.projector.descriptor.ArrayValueDescriptor; import org.apache.slide.projector.descriptor.BooleanValueDescriptor; import org.apache.slide.projector.descriptor.MapValueDescriptor; import org.apache.slide.projector.descriptor.ParameterDescriptor; import org.apache.slide.projector.descriptor.ResultDescriptor; import org.apache.slide.projector.descriptor.ResultEntryDescriptor; import org.apache.slide.projector.descriptor.StateDescriptor; import org.apache.slide.projector.descriptor.StringValueDescriptor; import org.apache.slide.projector.descriptor.URIValueDescriptor; import org.apache.slide.projector.i18n.DefaultMessage; import org.apache.slide.projector.i18n.ParameterMessage; import org.apache.slide.projector.processor.SimpleProcessor; import org.apache.slide.projector.processor.xml.XPathQuery; import org.apache.slide.projector.value.ArrayValue; import org.apache.slide.projector.value.BooleanValue; import org.apache.slide.projector.value.DocumentValue; import org.apache.slide.projector.value.MapValue; import org.apache.slide.projector.value.MultipleStreamableValue; import org.apache.slide.projector.value.NullValue; import org.apache.slide.projector.value.StreamableValue; import org.apache.slide.projector.value.Value; import org.jdom.xpath.XPath; /** * @author dflorey */ public class ResultResolver implements Processor { private final static String URI_ENTRY = "uri"; private final static String INSTRUCTIONS = "instructions"; private final static String INCLUDE_CONTENT = "includeContent"; private final static String CONTENT_ENTRY = "content"; private final static ParameterDescriptor[] parameterDescriptors = new ParameterDescriptor[] { new ParameterDescriptor( SimpleProcessor.INPUT, new ParameterMessage("resultResolver/paramter/input"), new ArrayValueDescriptor(new MapValueDescriptor( new ParameterDescriptor(URI_ENTRY, new ParameterMessage("resultResolver/parameter/input/uri"), new URIValueDescriptor())))), new ParameterDescriptor( INSTRUCTIONS, new ParameterMessage("resultResolver/paramter/instructions"), new MapValueDescriptor(new ParameterDescriptor(MapValueDescriptor.ALL, new ParameterMessage("resultResolver/parameter/instruction/instruction"), new StringValueDescriptor())), NullValue.NULL), new ParameterDescriptor( INCLUDE_CONTENT, new ParameterMessage("resultResolver/paramter/include-content"), new BooleanValueDescriptor(), BooleanValue.TRUE) }; private final static ResultDescriptor resultDescriptor = new ResultDescriptor(new StateDescriptor[] { StateDescriptor.OK_DESCRIPTOR }, new ResultEntryDescriptor[] { new ResultEntryDescriptor(SimpleProcessor.OUTPUT, new DefaultMessage("resultResolver/result/output"), ArrayValue.CONTENT_TYPE, false) }); public Result process(Map parameter, Context context) throws Exception { Value []values = ((ArrayValue)parameter.get(SimpleProcessor.INPUT)).getArray(); boolean includeContent = ((BooleanValue)parameter.get(INCLUDE_CONTENT)).booleanValue(); Value instructions = (Value)parameter.get(INSTRUCTIONS); List arrayEntries = new ArrayList(); for ( int i = 0; i < values.length; i++ ) { Map map = ((MapValue)values[i]).getMap(); Map resultMap = new HashMap(); resultMap.putAll(map); URI uri = (URI)map.get(URI_ENTRY); Value content = ConnectorFactory.getConnector().getResource(uri, context.getCredentials()); if ( instructions instanceof MapValue ) { if ( includeContent ) { content = new MultipleStreamableValue((StreamableValue) content); } DocumentValue documentValue = new DocumentValue((StreamableValue)content); Map instructionMap = ((MapValue)instructions).getMap(); for ( Iterator j = instructionMap.entrySet().iterator(); j.hasNext(); ) { Map.Entry entry = (Map.Entry)j.next(); String key = (String) entry.getKey(); XPath xPath = XPath.newInstance(entry.getValue().toString()); List nodeList = xPath.selectNodes(documentValue.getRootElement()); resultMap.put(key, XPathQuery.createValueFromNodeList(nodeList)); } } if ( includeContent ) { resultMap.put(CONTENT_ENTRY, content); } arrayEntries.add(new MapValue(resultMap)); } return new Result(StateDescriptor.OK, SimpleProcessor.OUTPUT, new ArrayValue((Value [])arrayEntries.toArray(new Value[arrayEntries.size()]))); } public ParameterDescriptor[] getParameterDescriptors() { return parameterDescriptors; } public ResultDescriptor getResultDescriptor() { return resultDescriptor; } } 1.5 +1 -1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/application/ApplicationManager.java Index: ApplicationManager.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/application/ApplicationManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ApplicationManager.java 1 Jun 2004 16:13:10 -0000 1.4 +++ ApplicationManager.java 2 Jun 2004 13:58:53 -0000 1.5 @@ -71,7 +71,7 @@ if ( !applicationUri.endsWith("/") ) { applicationUri = applicationUri + "/"; } - if ( applicationUri.indexOf(Constants.REPOSITORY_DOMAIN) > 0 ) { + if ( applicationUri.indexOf(Constants.REPOSITORY_DOMAIN) != -1 ) { applicationUri = applicationUri.substring(applicationUri.indexOf(Constants.REPOSITORY_DOMAIN)+Constants.REPOSITORY_DOMAIN.length()); } if ( !installedApplications.containsKey(applicationUri) ) { --------------------------------------------------------------------- To unsubscribe, e-mail: richardgriffin@example.net For additional commands, e-mail: richardgriffin@example.net From slide-dev-richardgriffin@example.net Wed Jun 02 14:34:15 2004 Return-Path: <slide-dev-richardgriffin@example.net> Delivered-To: richardgriffin@example.net Received: (qmail 72693 invoked from network); 2 Jun 2004 14:34:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 2 Jun 2004 14:34:15 -0000 Received: (qmail 92203 invoked by uid 500);
{'source': 'Apache Software Foundation Public Mail Archives'}