Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FieldValidatorSourceImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FieldValidatorSourceImplTest.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FieldValidatorSourceImplTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FieldValidatorSourceImplTest.java Tue Nov 13 13:34:47 2007 @@ -41,8 +41,6 @@ } - ; - @Test public void unknown_validator_type() { @@ -64,8 +62,7 @@ replay(); - FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null, - map); + FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null, map); try { @@ -74,9 +71,7 @@ } catch (IllegalArgumentException ex) { - assertEquals( - ex.getMessage(), - "Unknown validator type 'foo'. Configured validators are alpha, beta."); + assertEquals(ex.getMessage(), "Unknown validator type 'foo'. Configured validators are alpha, beta."); } verify(); @@ -119,8 +114,7 @@ replay(); - FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null, - map); + FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null, map); FieldValidator fieldValidator = source.createValidator(field, "required", null); @@ -160,8 +154,7 @@ replay(); - FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null, - map); + FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null, map); FieldValidator fieldValidator = source.createValidator(field, "required", null); @@ -212,8 +205,7 @@ replay(); - FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null, - map); + FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null, map); FieldValidator fieldValidator = source.createValidators(field, "minlength"); @@ -246,8 +238,7 @@ replay(); - FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null, - map); + FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null, map); try { @@ -256,9 +247,8 @@ } catch (IllegalArgumentException ex) { - assertEquals( - ex.getMessage(), - "Validator \'minlength\' requires a validation constraint (of type java.lang.Integer) but none was provided."); + assertEquals(ex.getMessage(), + "Validator \'minlength\' requires a validation constraint (of type java.lang.Integer) but none was provided."); } verify(); @@ -301,8 +291,7 @@ replay(); - FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null, - map); + FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null, map); FieldValidator fieldValidator = source.createValidators(field, "required"); @@ -365,8 +354,7 @@ replay(); - FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null, - map); + FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null, map); FieldValidator fieldValidator = source.createValidators(field, "required,minLength=15"); @@ -414,8 +402,7 @@ replay(); - FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null, - map); + FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null, map); FieldValidator fieldValidator = source.createValidator(field, "minLength", "5"); @@ -439,10 +426,7 @@ @Test public void parse_simple_type_list() { - test( - "required,email", - new ValidatorSpecification("required", null), - new ValidatorSpecification("email", null)); + test("required,email", new ValidatorSpecification("required", null), new ValidatorSpecification("email", null)); } @Test @@ -454,26 +438,21 @@ @Test public void ignore_whitespace_around_type_name() { - test( - " required , email ", - new ValidatorSpecification("required", null), - new ValidatorSpecification("email", null)); + test(" required , email ", new ValidatorSpecification("required", null), + new ValidatorSpecification("email", null)); } @Test public void parse_simple_type_with_value() { - test( - "minLength=5,sameAs=otherComponentId", - new ValidatorSpecification("minLength", "5"), - new ValidatorSpecification("sameAs", "otherComponentId")); + test("minLength=5,sameAs=otherComponentId", new ValidatorSpecification("minLength", "5"), + new ValidatorSpecification("sameAs", "otherComponentId")); } @Test public void whitespace_ignored_around_value() { - test("minLength= 5 , sameAs = otherComponentId ", new ValidatorSpecification("minLength", - "5"), + test("minLength= 5 , sameAs = otherComponentId ", new ValidatorSpecification("minLength", "5"), new ValidatorSpecification("sameAs", "otherComponentId")); } @@ -493,9 +472,7 @@ } catch (RuntimeException ex) { - assertEquals( - ex.getMessage(), - "Unexpected character '.' at position 9 of input string: required.email"); + assertEquals(ex.getMessage(), "Unexpected character '.' at position 9 of input string: required.email"); } } @@ -509,9 +486,8 @@ } catch (RuntimeException ex) { - assertEquals( - ex.getMessage(), - "Unexpected character '.' at position 13 of input string: minLength=3 . email"); + assertEquals(ex.getMessage(), + "Unexpected character '.' at position 13 of input string: minLength=3 . email"); } } }
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FooInterface.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FooInterface.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FooInterface.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FooInterface.java Tue Nov 13 13:34:47 2007 @@ -1,17 +1,17 @@ -// Copyright 2006 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. - +// Copyright 2006 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.tapestry.internal.services; /** Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/GetterMethodsInterface.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/GetterMethodsInterface.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/GetterMethodsInterface.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/GetterMethodsInterface.java Tue Nov 13 13:34:47 2007 @@ -1,17 +1,17 @@ -// Copyright 2006 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. - +// Copyright 2006 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.tapestry.internal.services; /** Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/Named.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/Named.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/Named.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/Named.java Tue Nov 13 13:34:47 2007 @@ -1,17 +1,17 @@ -// Copyright 2006 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. - +// Copyright 2006 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.tapestry.internal.services; /** Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java Tue Nov 13 13:34:47 2007 @@ -1,17 +1,17 @@ -// Copyright 2006, 2007 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. - +// Copyright 2006, 2007 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.tapestry.internal.services; import org.apache.tapestry.annotations.Parameter; Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParserExperiment.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParserExperiment.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParserExperiment.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParserExperiment.java Tue Nov 13 13:34:47 2007 @@ -49,9 +49,7 @@ // factory.setFeature("http://xml.org/sax/features/namespaces";, true); // Doesn't seem to do anything: - factory.setFeature( - "http://apache.org/xml/features/validation/schema/normalized-value";, - true); + factory.setFeature("http://apache.org/xml/features/validation/schema/normalized-value";, true); // Doesn't seem to do anything: factory.setFeature("http://xml.org/sax/features/namespace-prefixes";, true); @@ -138,8 +136,7 @@ { _locator = locator; - log("setDocumentLocator", "publicId=" + locator.getPublicId(), "systemId=" - + locator.getSystemId()); + log("setDocumentLocator", "publicId=" + locator.getPublicId(), "systemId=" + locator.getSystemId()); } @Override @@ -155,8 +152,7 @@ } @Override - public void startElement(String uri, String localName, String qName, Attributes attributes) - throws SAXException + public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { log("startElement", localName, "uri=" + uri, "qName=" + qName); @@ -164,11 +160,8 @@ for (int i = 0; i < count; i++) { - log( - "attribute", - attributes.getLocalName(i), - "value=" + attributes.getValue(i), - "qName=" + attributes.getQName(i)); + log("attribute", attributes.getLocalName(i), "value=" + attributes.getValue(i), + "qName=" + attributes.getQName(i)); } } @@ -179,8 +172,8 @@ } @Override - public void unparsedEntityDecl(String name, String publicId, String systemId, - String notationName) throws SAXException + public void unparsedEntityDecl(String name, String publicId, String systemId, String notationName) + throws SAXException { log("unparsedEntityDecl", name, "publicId=" + publicId, "systemId=" + systemId); } Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PersistentFieldBundleImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PersistentFieldBundleImplTest.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PersistentFieldBundleImplTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PersistentFieldBundleImplTest.java Tue Nov 13 13:34:47 2007 @@ -1,17 +1,17 @@ -// Copyright 2006 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. - +// Copyright 2006 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.tapestry.internal.services; import org.apache.tapestry.internal.test.InternalBaseTestCase; Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/VisibilityBean.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/VisibilityBean.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/VisibilityBean.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/VisibilityBean.java Tue Nov 13 13:34:47 2007 @@ -1,17 +1,17 @@ -// Copyright 2006 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. - +// Copyright 2006 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.tapestry.internal.services; import org.apache.tapestry.annotations.Retain; Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterSessionTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterSessionTest.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterSessionTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterSessionTest.java Tue Nov 13 13:34:47 2007 @@ -1,17 +1,17 @@ -// Copyright 2006, 2007 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. - +// Copyright 2006, 2007 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.tapestry.internal.test; import org.testng.Assert; Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/AbstractFoo.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/AbstractFoo.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/AbstractFoo.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/AbstractFoo.java Tue Nov 13 13:34:47 2007 @@ -1,17 +1,17 @@ -// Copyright 2006 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. - +// Copyright 2006 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.tapestry.internal.transform.pages; import org.apache.tapestry.internal.services.FooInterface; Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/BarImpl.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/BarImpl.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/BarImpl.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/BarImpl.java Tue Nov 13 13:34:47 2007 @@ -1,17 +1,17 @@ -// Copyright 2006 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. - +// Copyright 2006 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.tapestry.internal.transform.pages; import org.apache.tapestry.internal.services.BarInterface; Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/ChildClassInheritsAnnotation.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/ChildClassInheritsAnnotation.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/ChildClassInheritsAnnotation.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/ChildClassInheritsAnnotation.java Tue Nov 13 13:34:47 2007 @@ -1,17 +1,17 @@ -// Copyright 2006 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. - +// Copyright 2006 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.tapestry.internal.transform.pages; /** Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/FooImpl.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/FooImpl.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/FooImpl.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/FooImpl.java Tue Nov 13 13:34:47 2007 @@ -1,17 +1,17 @@ -// Copyright 2006 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. - +// Copyright 2006 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.tapestry.internal.transform.pages; import org.apache.tapestry.internal.services.FooInterface; Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/TargetObject.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/TargetObject.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/TargetObject.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/TargetObject.java Tue Nov 13 13:34:47 2007 @@ -1,17 +1,17 @@ -// Copyright 2006 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. - +// Copyright 2006 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.tapestry.internal.transform.pages; /** Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/TargetObjectSubclass.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/TargetObjectSubclass.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/TargetObjectSubclass.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/TargetObjectSubclass.java Tue Nov 13 13:34:47 2007 @@ -1,17 +1,17 @@ -// Copyright 2006 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. - +// Copyright 2006 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.tapestry.internal.transform.pages; /** Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/util/Base64Tests.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/util/Base64Tests.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/util/Base64Tests.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/util/Base64Tests.java Tue Nov 13 13:34:47 2007 @@ -84,8 +84,7 @@ @Test public void checks_for_eof() throws Exception { - String[] values = - {"fred", "barney", "wilma"}; + String[] values = {"fred", "barney", "wilma"}; Base64ObjectOutputStream os = new Base64ObjectOutputStream(); Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/util/MethodInvocationBuilderTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/util/MethodInvocationBuilderTest.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/util/MethodInvocationBuilderTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/util/MethodInvocationBuilderTest.java Tue Nov 13 13:34:47 2007 @@ -35,8 +35,8 @@ replay(); - TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "void", "myMethod", new String[] - {MARKUP_WRITER_CLASS_NAME}, null); + TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "void", "myMethod", + new String[]{MARKUP_WRITER_CLASS_NAME}, null); MethodInvocationBuilder invoker = new MethodInvocationBuilder(); @@ -54,8 +54,8 @@ replay(); - TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "void", "myMethod", new String[] - {MARKUP_WRITER_CLASS_NAME}, null); + TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "void", "myMethod", + new String[]{MARKUP_WRITER_CLASS_NAME}, null); MethodInvocationBuilder invoker = new MethodInvocationBuilder(); @@ -71,8 +71,8 @@ replay(); - TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "void", "myMethod", new String[] - {MARKUP_WRITER_CLASS_NAME, LOCALE_CLASS_NAME}, null); + TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "void", "myMethod", new String[]{ + MARKUP_WRITER_CLASS_NAME, LOCALE_CLASS_NAME}, null); MethodInvocationBuilder invoker = new MethodInvocationBuilder(); Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/SyncCostBench.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/SyncCostBench.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/SyncCostBench.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/SyncCostBench.java Tue Nov 13 13:34:47 2007 @@ -44,8 +44,7 @@ */ static class Worker implements Runnable { - private long[] _series = - {1, 1}; + private long[] _series = {1, 1}; public void run() { Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/TransformUtilsTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/TransformUtilsTest.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/TransformUtilsTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/TransformUtilsTest.java Tue Nov 13 13:34:47 2007 @@ -1,17 +1,17 @@ -// Copyright 2006 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. - +// Copyright 2006 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.tapestry.services; import static org.apache.tapestry.services.TransformUtils.*; Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/FindTheParameterizedType.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/FindTheParameterizedType.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/FindTheParameterizedType.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/util/FindTheParameterizedType.java Tue Nov 13 13:34:47 2007 @@ -1,17 +1,17 @@ -// Copyright 2006 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. - +// Copyright 2006 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.tapestry.util; import org.apache.tapestry.ioc.internal.util.Orderer; Modified: tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/AbstractIntegrationTestSuite.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/AbstractIntegrationTestSuite.java?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/AbstractIntegrationTestSuite.java (original) +++ tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/AbstractIntegrationTestSuite.java Tue Nov 13 13:34:47 2007 @@ -47,9 +47,9 @@ public static final String DEFAULT_WEB_APP_ROOT = "src/main/webapp"; /** - * 60 seconds + * 15 seconds */ - public static final String PAGE_LOAD_TIMEOUT = "600000"; + public static final String PAGE_LOAD_TIMEOUT = "15000"; /** * The port on which the internal copy of Jetty is executed. @@ -110,23 +110,16 @@ } catch (RuntimeException ex) { - System.err.printf( - "Error accessing %s: %s, in:\n\n%s\n\n", - locator, - ex.getMessage(), - _selenium.getHtmlSource()); + System.err.printf("Error accessing %s: %s, in:\n\n%s\n\n", locator, ex.getMessage(), + _selenium.getHtmlSource()); throw ex; } if (actual.equals(expected)) return; - System.err.printf( - "Text for %s should be '%s' but is '%s', in:\n\n%s\n\n", - locator, - expected, - actual, - getHtmlSource()); + System.err.printf("Text for %s should be '%s' but is '%s', in:\n\n%s\n\n", locator, expected, actual, + getHtmlSource()); throw new AssertionError(String.format("%s was '%s' not '%s'", locator, actual, expected)); } @@ -197,8 +190,7 @@ _server.start(); - CommandProcessor cp = new HttpCommandProcessor("localhost", SeleniumServer.DEFAULT_PORT, - "*firefox", BASE_URL); + CommandProcessor cp = new HttpCommandProcessor("localhost", SeleniumServer.DEFAULT_PORT, "*firefox", BASE_URL); _selenium = new DefaultSelenium(new ErrorReportingCommandProcessor(cp)); Modified: tapestry/tapestry5/trunk/tapestry5.ipr URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry5.ipr?rev=594648&r1=594647&r2=594648&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry5.ipr (original) +++ tapestry/tapestry5/trunk/tapestry5.ipr Tue Nov 13 13:34:47 2007 @@ -13,6 +13,7 @@ <component name="CodeStyleSettingsManager"> <option name="PER_PROJECT_SETTINGS"> <value> + <option name="KEEP_LINE_BREAKS" value="false" /> <option name="BRACE_STYLE" value="2" /> <option name="CLASS_BRACE_STYLE" value="2" /> <option name="METHOD_BRACE_STYLE" value="2" /> @@ -50,25 +51,15 @@ <option name="DEFAULT_COMPILER" value="Javac" /> <option name="DEPLOY_AFTER_MAKE" value="0" /> <excludeFromCompile> - <file url="file://$PROJECT_DIR$/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Start.java" /> - <file url="file://$PROJECT_DIR$/quickstart/src/main/resources/archetype-resources/src/main/java/services/AppModule.java" /> + <directory url="file://$PROJECT_DIR$/quickstart/src/main/resources" includeSubdirectories="true" /> </excludeFromCompile> <resourceExtensions> - <entry name=".+\.(properties|xml|html|dtd|tld)" /> + <entry name=".+\.(properties|xml|html|dtd|tld|tml|js|css)" /> <entry name=".+\.(gif|png|jpeg|jpg)" /> </resourceExtensions> <wildcardResourcePatterns> <entry name="?*.properties" /> <entry name="?*.xml" /> - <entry name="?*.gif" /> - <entry name="?*.png" /> - <entry name="?*.jpeg" /> - <entry name="?*.jpg" /> - <entry name="?*.html" /> - <entry name="?*.dtd" /> - <entry name="?*.tld" /> - <entry name="?*.properties" /> - <entry name="?*.xml" /> <entry name="?*.html" /> <entry name="?*.dtd" /> <entry name="?*.tld" /> @@ -76,6 +67,9 @@ <entry name="?*.png" /> <entry name="?*.jpeg" /> <entry name="?*.jpg" /> + <entry name="?*.tml" /> + <entry name="?*.css" /> + <entry name="?*.js" /> </wildcardResourcePatterns> </component> <component name="DependenciesAnalyzeManager"> @@ -108,6 +102,25 @@ <module name="tutorial1"> <files> <file url="file://$PROJECT_DIR$/tapestry-tutorial1/src/main/webapp/WEB-INF/web.xml" /> + </files> + </module> + <module name="quickstart"> + <files> + <file url="file://$PROJECT_DIR$/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml" /> + </files> + </module> + <module name="tapestry-core"> + <files> + <file url="file://$PROJECT_DIR$/tapestry-core/src/test/app1/WEB-INF/web.xml" /> + </files> + </module> + </modules> + </facet-type> + <facet-type id="hibernate"> + <modules> + <module name="tapestry-hibernate"> + <files> + <file url="file://$PROJECT_DIR$/tapestry-hibernate/src/test/resources/hibernate.cfg.xml" /> </files> </module> </modules>
