tapestry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject svn commit: r433072 - in /tapestry/tapestry5/tapestry-core/trunk: ./ null/ null/Tapestry 5/ src/main/java/org/apache/tapestry/annotations/ src/main/java/org/apache/tapestry/internal/ src/main/java/org/apache/tapestry/internal/ioc/ src/main/java/org/apa...
Date Sun, 20 Aug 2006 22:43:52 GMT
Author: hlship
Date: Sun Aug 20 15:43:51 2006
New Revision: 433072

URL: http://svn.apache.org/viewvc?rev=433072&view=rev
Log:
Move the Match annotation to the proper package (org.apache.tapestry.ioc.annotations).
Remove some unnecessary entries in pom.xml.

Added:
    tapestry/tapestry5/tapestry-core/trunk/null/
    tapestry/tapestry5/tapestry-core/trunk/null/Tapestry 5/
    tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/annotations/Match.java
      - copied, changed from r432902, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/annotations/Match.java
Removed:
    tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/annotations/Match.java
Modified:
    tapestry/tapestry5/tapestry-core/trunk/pom.xml
    tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/InternalModule.java
    tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/DefaultModuleDefImpl.java
    tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/BarneyModule.java
    tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/FredModule.java

Modified: tapestry/tapestry5/tapestry-core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/pom.xml?rev=433072&r1=433071&r2=433072&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/pom.xml (original)
+++ tapestry/tapestry5/tapestry-core/trunk/pom.xml Sun Aug 20 15:43:51 2006
@@ -38,22 +38,21 @@
             <artifactId>testng</artifactId>
             <!-- Looks like if you override scope, you have to provide version (and classifier)
as well.
                 Or perhaps this has something to do with classifier. -->
-            <version>4.7</version>
+            <version>5.1</version>
             <classifier>jdk15</classifier>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>            
+            <artifactId>aspectjrt</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
         </dependency>
-        <dependency><groupId>log4j</groupId> <artifactId>log4j</artifactId>
-            <version>1.2.9</version>
-            <scope>test</scope>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
         </dependency>
     </dependencies>
     <build>
@@ -80,13 +79,13 @@
                         <manifestEntries>
                             <Tapestry-Module-Classes>
                                 <!-- tapestry.ioc module is provided in code -->
-                                <!-- Many other modules via @SubModule -->
-                                org.apache.tapestry.services.TapestryModule
+                                <!-- Many other modules via @SubModule --> org.apache.tapestry.services.TapestryModule
                             </Tapestry-Module-Classes>
                         </manifestEntries>
                     </archive>
                 </configuration>
-            </plugin> <!--
+            </plugin>
+            <!--
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
@@ -113,29 +112,26 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <!-- Had a classloader problem with version 2.0.3 -->
-                <version>2.0</version>
-                <configuration>
+                <!--        <version>2.0</version> -->
+                <configuration> <!--
                     <tags>
                         <tag>
                             <name>todo</name>
-                            <!-- Should be a combinaison of the letters Xaoptcmf -->
+                            <!- - Should be a combinaison of the letters Xaoptcmf - ->
                             <placement>a</placement>
                             <head>To do something:</head>
                         </tag>
-                    </tags>
+                    </tags> -->
                     <linksource>true</linksource>
                     <links>
-                        <link>http://jakarta.apache.org/hivemind/hivemind/apidocs/</link>
-                        <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
-                        <link>http://java.sun.com/products/servlet/2.3/javadoc/</link>
-                        <link>http://jakarta.apache.org/commons/codec/api-release/</link>
-                        <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
+                        <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+                        <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
                         <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
-                        <link>http://www.ognl.org/2.6.9/Documentation/javadoc/</link>
                     </links>
                     <stylesheetfile>${basedir}/src/site/resources/css/jdstyle.css</stylesheetfile>
                 </configuration>
-            </plugin> <!--
+            </plugin>
+            <!--
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>

Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/InternalModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/InternalModule.java?rev=433072&r1=433071&r2=433072&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/InternalModule.java
(original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/InternalModule.java
Sun Aug 20 15:43:51 2006
@@ -15,12 +15,12 @@
 package org.apache.tapestry.internal;
 
 import org.apache.commons.logging.Log;
-import org.apache.tapestry.annotations.Match;
 import org.apache.tapestry.internal.services.UpdateListenerHub;
 import org.apache.tapestry.internal.services.UpdateListenerHubImpl;
 import org.apache.tapestry.internal.transform.InternalTransformModule;
 import org.apache.tapestry.ioc.annotations.Id;
 import org.apache.tapestry.ioc.annotations.InjectService;
+import org.apache.tapestry.ioc.annotations.Match;
 import org.apache.tapestry.ioc.annotations.Order;
 import org.apache.tapestry.ioc.annotations.SubModule;
 import org.apache.tapestry.ioc.services.LoggingDecorator;

Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/DefaultModuleDefImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/DefaultModuleDefImpl.java?rev=433072&r1=433071&r2=433072&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/DefaultModuleDefImpl.java
(original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/DefaultModuleDefImpl.java
Sun Aug 20 15:43:51 2006
@@ -23,7 +23,6 @@
 import java.util.Set;
 
 import org.apache.commons.logging.Log;
-import org.apache.tapestry.annotations.Match;
 import org.apache.tapestry.ioc.Configuration;
 import org.apache.tapestry.ioc.IOCConstants;
 import org.apache.tapestry.ioc.IOCUtilities;
@@ -32,6 +31,7 @@
 import org.apache.tapestry.ioc.annotations.Contribute;
 import org.apache.tapestry.ioc.annotations.Id;
 import org.apache.tapestry.ioc.annotations.Lifecycle;
+import org.apache.tapestry.ioc.annotations.Match;
 import org.apache.tapestry.ioc.annotations.Order;
 import org.apache.tapestry.ioc.annotations.Private;
 import org.apache.tapestry.ioc.def.ContributionDef;

Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/annotations/Match.java
(from r432902, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/annotations/Match.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/annotations/Match.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/annotations/Match.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/annotations/Match.java&r1=432902&r2=433072&rev=433072&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/annotations/Match.java
(original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/annotations/Match.java
Sun Aug 20 15:43:51 2006
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.annotations;
+package org.apache.tapestry.ioc.annotations;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/BarneyModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/BarneyModule.java?rev=433072&r1=433071&r2=433072&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/BarneyModule.java
(original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/BarneyModule.java
Sun Aug 20 15:43:51 2006
@@ -19,10 +19,10 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.tapestry.annotations.Match;
 import org.apache.tapestry.internal.annotations.SuppressNullCheck;
 import org.apache.tapestry.ioc.annotations.Contribute;
 import org.apache.tapestry.ioc.annotations.Id;
+import org.apache.tapestry.ioc.annotations.Match;
 import org.apache.tapestry.ioc.annotations.Order;
 
 import static org.apache.tapestry.util.CollectionFactory.newList;

Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/FredModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/FredModule.java?rev=433072&r1=433071&r2=433072&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/FredModule.java
(original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/FredModule.java
Sun Aug 20 15:43:51 2006
@@ -18,7 +18,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.tapestry.annotations.Match;
+import org.apache.tapestry.ioc.annotations.Match;
 import org.apache.tapestry.ioc.annotations.Order;
 import org.apache.tapestry.ioc.annotations.Contribute;
 import org.apache.tapestry.ioc.annotations.Id;



Mime
View raw message