svn commit: r1392843 - in /cocoon/trunk: blocks/ blocks/cocoon-auth/cocoon-acegisecurity-sample/ blocks/cocoon-it/ blocks/cocoon-serializers/cocoon-serializers-impl/ core/cocoon-servlet-service/cocoon-servlet-service-components-sample/ tools/archetypes...

Author: thorsten
Date: Tue Oct  2 11:19:53 2012
New Revision: 1392843

URL: http://svn.apache.org/viewvc?rev=1392843&view=rev
Log:
The expression ${pom.artifactId} is deprecated. Please use ${project.artifactId} instead.

Modified:
    cocoon/trunk/blocks/cocoon-auth/cocoon-acegisecurity-sample/pom.xml
    cocoon/trunk/blocks/cocoon-it/pom.xml
    cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml
    cocoon/trunk/blocks/pom.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml
    cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin-demo/pom.xml

Modified: cocoon/trunk/blocks/cocoon-auth/cocoon-acegisecurity-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-acegisecurity-sample/pom.xml?rev=1392843&r1=1392842&r2=1392843&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-acegisecurity-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-acegisecurity-sample/pom.xml Tue Oct  2 11:19:53 2012
@@ -80,7 +80,7 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
+              <Cocoon-Block-Name>${project.artifactId}</Cocoon-Block-Name>
             </manifestEntries>
           </archive>
         </configuration>

Modified: cocoon/trunk/blocks/cocoon-it/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-it/pom.xml?rev=1392843&r1=1392842&r2=1392843&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-it/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-it/pom.xml Tue Oct  2 11:19:53 2012
@@ -122,7 +122,7 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
+              <Cocoon-Block-Name>${project.artifactId}</Cocoon-Block-Name>
             </manifestEntries>
           </archive>
         </configuration>

Modified: cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml?rev=1392843&r1=1392842&r2=1392843&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml Tue Oct  2 11:19:53 2012
@@ -56,7 +56,7 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
+              <Cocoon-Block-Name>${project.artifactId}</Cocoon-Block-Name>
             </manifestEntries>
           </archive>
         </configuration>

Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/pom.xml?rev=1392843&r1=1392842&r2=1392843&view=diff
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Tue Oct  2 11:19:53 2012
@@ -41,7 +41,7 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
+              <Cocoon-Block-Name>${project.artifactId}</Cocoon-Block-Name>
             </manifestEntries>
           </archive>
         </configuration>

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml?rev=1392843&r1=1392842&r2=1392843&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml Tue Oct  2 11:19:53 2012
@@ -40,7 +40,7 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
+              <Cocoon-Block-Name>${project.artifactId}</Cocoon-Block-Name>
             </manifestEntries>
           </archive>
         </configuration>

Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml?rev=1392843&r1=1392842&r2=1392843&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml Tue Oct  2 11:19:53 2012
@@ -108,7 +108,7 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
+              <Cocoon-Block-Name>${project.artifactId}</Cocoon-Block-Name>
             </manifestEntries>
           </archive>
         </configuration>

Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml?rev=1392843&r1=1392842&r2=1392843&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml Tue Oct  2 11:19:53 2012
@@ -41,7 +41,7 @@
               <maxIdleTime>30000</maxIdleTime>
             </connector>
           </connectors>
-          <webAppSourceDirectory>${project.build.directory}/${pom.artifactId}-${pom.version}</webAppSourceDirectory>
+          <webAppSourceDirectory>${project.build.directory}/${project.artifactId}-${pom.version}</webAppSourceDirectory>
           <contextPath>/</contextPath>
         </configuration>
       </plugin>

Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin-demo/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin-demo/pom.xml?rev=1392843&r1=1392842&r2=1392843&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin-demo/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin-demo/pom.xml Tue Oct  2 11:19:53 2012
@@ -73,7 +73,7 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
+              <Cocoon-Block-Name>${project.artifactId}</Cocoon-Block-Name>
             </manifestEntries>
           </archive>
         </configuration>