You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jb...@apache.org on 2010/10/10 01:33:47 UTC

svn commit: r1006234 - in /tomcat/taglibs/standard/trunk/impl: ./ src/main/java/org/apache/taglibs/standard/lang/jstl/ src/main/java/org/apache/taglibs/standard/resources/ src/main/resources/META-INF/ src/main/resources/META-INF/tlds/ src/main/resource...

Author: jboynes
Date: Sat Oct  9 23:33:46 2010
New Revision: 1006234

URL: http://svn.apache.org/viewvc?rev=1006234&view=rev
Log:
move resources to location in default Maven resources tree to remove need for custom definition

Added:
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c-1_0-rt.tld
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/c-1_0-rt.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c-1_0.tld
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/c-1_0.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c-1_1.tld
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/c-1_1.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c.tld
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/c.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt-1_0-rt.tld
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/fmt-1_0-rt.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt-1_0.tld
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/fmt-1_0.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt.tld
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/fmt.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fn.tld
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/fn.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/permittedTaglibs.tld
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/permittedTaglibs.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/scriptfree.tld
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/scriptfree.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql-1_0-rt.tld
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/sql-1_0-rt.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql-1_0.tld
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/sql-1_0.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql.tld
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/sql.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x-1_0-rt.tld
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/x-1_0-rt.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x-1_0.tld
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/x-1_0.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x.tld
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/x.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/org/
    tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/
    tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/
    tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/
    tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/lang/
    tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/lang/jstl/
    tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/lang/jstl/Resources.properties   (props changed)
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/lang/jstl/Resources.properties
    tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/lang/jstl/Resources_ja.properties   (props changed)
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/lang/jstl/Resources_ja.properties
    tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/resources/
    tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/resources/Resources.properties   (props changed)
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/resources/Resources.properties
    tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/resources/Resources_ja.properties   (props changed)
      - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/resources/Resources_ja.properties
Removed:
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/lang/jstl/Resources.properties
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/lang/jstl/Resources_ja.properties
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/resources/Resources.properties
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/resources/Resources_ja.properties
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/
Modified:
    tomcat/taglibs/standard/trunk/impl/pom.xml

Modified: tomcat/taglibs/standard/trunk/impl/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1006234&r1=1006233&r2=1006234&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/impl/pom.xml Sat Oct  9 23:33:46 2010
@@ -127,26 +127,6 @@
   </properties>
 
   <build>
-      <resources>
-          <resource>
-            <directory>.</directory>
-            <targetPath>META-INF</targetPath>
-            <includes>
-              <include>NOTICE.txt</include>
-              <include>LICENSE.txt</include>
-            </includes>
-          </resource>
-          <resource>
-              <directory>src/main/java</directory>
-              <includes>
-                  <include>**/*.properties</include>
-              </includes>
-          </resource>
-          <resource>
-            <directory>src/main/resources/META-INF/tlds</directory>
-            <targetPath>META-INF</targetPath>
-          </resource>
-      </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Propchange: tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/lang/jstl/Resources.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/lang/jstl/Resources.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/lang/jstl/Resources_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/lang/jstl/Resources_ja.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/resources/Resources.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/resources/Resources.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/resources/Resources_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/resources/Resources_ja.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org