tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject svn commit: r514053 - in /tapestry/tapestry5/tapestry-spring-integration/trunk: ./ src/main/java/org/apache/tapestry/internal/spring/ src/main/resources/org/apache/tapestry/internal/spring/ src/test/java/org/apache/tapestry/internal/spring/
Date Sat, 03 Mar 2007 02:14:36 GMT
Author: hlship
Date: Fri Mar  2 18:14:35 2007
New Revision: 514053

URL: http://svn.apache.org/viewvc?view=rev&rev=514053
Log:
Complete unit test suite, add missing license files.

Added:
    tapestry/tapestry5/tapestry-spring-integration/trunk/LICENSE-2.0.txt
    tapestry/tapestry5/tapestry-spring-integration/trunk/NOTICE.txt
    tapestry/tapestry5/tapestry-spring-integration/trunk/src/test/java/org/apache/tapestry/internal/spring/SpringBean.java
Modified:
    tapestry/tapestry5/tapestry-spring-integration/trunk/pom.xml
    tapestry/tapestry5/tapestry-spring-integration/trunk/src/main/java/org/apache/tapestry/internal/spring/SpringMessages.java
    tapestry/tapestry5/tapestry-spring-integration/trunk/src/main/resources/org/apache/tapestry/internal/spring/SpringStrings.properties
    tapestry/tapestry5/tapestry-spring-integration/trunk/src/test/java/org/apache/tapestry/internal/spring/SpringObjectProviderTest.java

Added: tapestry/tapestry5/tapestry-spring-integration/trunk/LICENSE-2.0.txt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-spring-integration/trunk/LICENSE-2.0.txt?view=auto&rev=514053
==============================================================================
--- tapestry/tapestry5/tapestry-spring-integration/trunk/LICENSE-2.0.txt (added)
+++ tapestry/tapestry5/tapestry-spring-integration/trunk/LICENSE-2.0.txt Fri Mar  2 18:14:35
2007
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.

Added: tapestry/tapestry5/tapestry-spring-integration/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-spring-integration/trunk/NOTICE.txt?view=auto&rev=514053
==============================================================================
--- tapestry/tapestry5/tapestry-spring-integration/trunk/NOTICE.txt (added)
+++ tapestry/tapestry5/tapestry-spring-integration/trunk/NOTICE.txt Fri Mar  2 18:14:35 2007
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Modified: tapestry/tapestry5/tapestry-spring-integration/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-spring-integration/trunk/pom.xml?view=diff&rev=514053&r1=514052&r2=514053
==============================================================================
--- tapestry/tapestry5/tapestry-spring-integration/trunk/pom.xml (original)
+++ tapestry/tapestry5/tapestry-spring-integration/trunk/pom.xml Fri Mar  2 18:14:35 2007
@@ -32,20 +32,20 @@
       <artifactId>spring-web</artifactId>
       <version>1.2.8</version>
       <scope>provided</scope>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
       <version>5.1</version>
       <classifier>jdk15</classifier>
       <scope>test</scope>
-    </dependency>    
-    
+    </dependency>
+
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
@@ -80,7 +80,7 @@
           </execution>
         </executions>
       </plugin>
-      
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -92,7 +92,7 @@
           </archive>
         </configuration>
       </plugin>
-      
+
     </plugins>
   </build>
   <reporting>
@@ -119,7 +119,7 @@
           </links>
           <stylesheetfile>${basedir}/src/site/resources/css/jdstyle.css</stylesheetfile>
         </configuration>
-      </plugin> <!--
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
@@ -129,15 +129,15 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
       </plugin>
-      
+
       <plugin>
         <groupId>org.apache.tapestry</groupId>
         <artifactId>tapestry-component-report</artifactId>
         <version>5.0.2</version>
         <configuration>
           <rootPackage>org.apache.tapestry.corelib</rootPackage>
-        </configuration>                
-      </plugin> -->
+        </configuration>
+      </plugin>
     </plugins>
   </reporting>
-</project>
\ No newline at end of file
+</project>

Modified: tapestry/tapestry5/tapestry-spring-integration/trunk/src/main/java/org/apache/tapestry/internal/spring/SpringMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-spring-integration/trunk/src/main/java/org/apache/tapestry/internal/spring/SpringMessages.java?view=diff&rev=514053&r1=514052&r2=514053
==============================================================================
--- tapestry/tapestry5/tapestry-spring-integration/trunk/src/main/java/org/apache/tapestry/internal/spring/SpringMessages.java
(original)
+++ tapestry/tapestry5/tapestry-spring-integration/trunk/src/main/java/org/apache/tapestry/internal/spring/SpringMessages.java
Fri Mar  2 18:14:35 2007
@@ -35,9 +35,7 @@
 
   static String usingContext(WebApplicationContext context)
   {
-    // context.getDisplayName() ?
-
-    return MESSAGES.format("using-context", context);
+    return MESSAGES.format("using-context", context.getDisplayName());
   }
 
   static String beanAccessFailure(String beanName, Class beanType, Throwable cause)

Modified: tapestry/tapestry5/tapestry-spring-integration/trunk/src/main/resources/org/apache/tapestry/internal/spring/SpringStrings.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-spring-integration/trunk/src/main/resources/org/apache/tapestry/internal/spring/SpringStrings.properties?view=diff&rev=514053&r1=514052&r2=514053
==============================================================================
--- tapestry/tapestry5/tapestry-spring-integration/trunk/src/main/resources/org/apache/tapestry/internal/spring/SpringStrings.properties
(original)
+++ tapestry/tapestry5/tapestry-spring-integration/trunk/src/main/resources/org/apache/tapestry/internal/spring/SpringStrings.properties
Fri Mar  2 18:14:35 2007
@@ -15,4 +15,4 @@
 failure-obtaining-context=An exception occurred obtained the Spring WebApplicationContext:
%s
 missing-context=The Spring WebApplicationContext is not present. The likely cause is that
the %s listener was not declared inside the application's web.xml deployment descriptor.
 using-context=Using Spring WebApplicationContext %s.
-bean-access-failure=Failure to obtain Spring bean '%s' (of type %s): %s
+bean-access-failure=A failure occured obtaining Spring bean '%s' (of type %s): %s

Added: tapestry/tapestry5/tapestry-spring-integration/trunk/src/test/java/org/apache/tapestry/internal/spring/SpringBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-spring-integration/trunk/src/test/java/org/apache/tapestry/internal/spring/SpringBean.java?view=auto&rev=514053
==============================================================================
--- tapestry/tapestry5/tapestry-spring-integration/trunk/src/test/java/org/apache/tapestry/internal/spring/SpringBean.java
(added)
+++ tapestry/tapestry5/tapestry-spring-integration/trunk/src/test/java/org/apache/tapestry/internal/spring/SpringBean.java
Fri Mar  2 18:14:35 2007
@@ -0,0 +1,20 @@
+// Copyright 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.spring;
+
+public interface SpringBean
+{
+
+}

Modified: tapestry/tapestry5/tapestry-spring-integration/trunk/src/test/java/org/apache/tapestry/internal/spring/SpringObjectProviderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-spring-integration/trunk/src/test/java/org/apache/tapestry/internal/spring/SpringObjectProviderTest.java?view=diff&rev=514053&r1=514052&r2=514053
==============================================================================
--- tapestry/tapestry5/tapestry-spring-integration/trunk/src/test/java/org/apache/tapestry/internal/spring/SpringObjectProviderTest.java
(original)
+++ tapestry/tapestry5/tapestry-spring-integration/trunk/src/test/java/org/apache/tapestry/internal/spring/SpringObjectProviderTest.java
Fri Mar  2 18:14:35 2007
@@ -15,6 +15,8 @@
 package org.apache.tapestry.internal.spring;
 
 import org.apache.commons.logging.Log;
+import org.apache.tapestry.ioc.ObjectProvider;
+import org.apache.tapestry.ioc.ServiceLocator;
 import org.apache.tapestry.services.Context;
 import org.apache.tapestry.test.TapestryTestCase;
 import org.springframework.web.context.WebApplicationContext;
@@ -22,6 +24,12 @@
 
 public class SpringObjectProviderTest extends TapestryTestCase
 {
+  private static final String STARTUP_MESSAGE = "Using Spring WebApplicationContext [Mock
WebApplicationContext].";
+
+  private static final String BEAN_NAME = "mySpringBean";
+
+  private static final String DISPLAY_NAME = "[Mock WebApplicationContext]";
+
   @Test
   public void missing_spring_context()
   {
@@ -50,6 +58,7 @@
   {
     Log log = newLog();
     Context context = newContext("[Placeholder]");
+    SpringBean bean = newMock(SpringBean.class);
 
     replay();
 
@@ -67,7 +76,71 @@
     verify();
   }
 
-  private Context newContext(Object webApplicationContext)
+  @Test
+  public void get_bean_from_context()
+  {
+    Log log = newLog();
+    WebApplicationContext webContext = newWebApplicationContext(DISPLAY_NAME);
+    Context context = newContext(webContext);
+    ServiceLocator locator = newServiceLocator();
+    SpringBean bean = newMock(SpringBean.class);
+
+    log.info(STARTUP_MESSAGE);
+
+    expect(webContext.getBean(BEAN_NAME, SpringBean.class)).andReturn(bean);
+
+    replay();
+
+    ObjectProvider provider = new SpringObjectProvider(log, context);
+
+    assertSame(provider.provide(BEAN_NAME, SpringBean.class, locator), bean);
+
+    verify();
+  }
+
+  @Test
+  public void failure_getting_bean_from_context()
+  {
+    Log log = newLog();
+    WebApplicationContext webContext = newWebApplicationContext(DISPLAY_NAME);
+    Context context = newContext(webContext);
+    ServiceLocator locator = newServiceLocator();
+    Throwable t = new RuntimeException("Simulated failure.");
+
+    log.info(STARTUP_MESSAGE);
+
+    expect(webContext.getBean(BEAN_NAME, SpringBean.class)).andThrow(t);
+
+    replay();
+
+    ObjectProvider provider = new SpringObjectProvider(log, context);
+
+    try
+    {
+      provider.provide(BEAN_NAME, SpringBean.class, locator);
+      unreachable();
+    }
+    catch (RuntimeException ex)
+    {
+      assertEquals(
+          ex.getMessage(),
+          "A failure occured obtaining Spring bean \'mySpringBean\' (of type org.apache.tapestry.internal.spring.SpringBean):
Simulated failure.");
+      assertSame(ex.getCause(), t);
+    }
+
+    verify();
+  }
+
+  protected final WebApplicationContext newWebApplicationContext(String name)
+  {
+    WebApplicationContext context = newMock(WebApplicationContext.class);
+
+    expect(context.getDisplayName()).andReturn(name).atLeastOnce();
+
+    return context;
+  }
+
+  protected final Context newContext(Object webApplicationContext)
   {
     Context context = newContext();
 



Mime
View raw message