[jboss-cvs] JBossAS SVN: r99946 - in trunk: aspects and 22 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jan 26 10:31:52 EST 2010


Author: pgier
Date: 2010-01-26 10:31:51 -0500 (Tue, 26 Jan 2010)
New Revision: 99946

Modified:
   trunk/aspects/pom.xml
   trunk/cluster/pom.xml
   trunk/connector/pom.xml
   trunk/console/pom.xml
   trunk/deployment/pom.xml
   trunk/ejb3/pom.xml
   trunk/hibernate-int/pom.xml
   trunk/iiop/pom.xml
   trunk/jbossas-jmx-remoting/pom.xml
   trunk/jbossas-remoting/pom.xml
   trunk/jmx-remoting/pom.xml
   trunk/main/pom.xml
   trunk/management/pom.xml
   trunk/messaging/pom.xml
   trunk/messaging/src/etc/examples/web-service/build.xml
   trunk/pom.xml
   trunk/profileservice/pom.xml
   trunk/security/pom.xml
   trunk/server/pom.xml
   trunk/system-jmx/pom.xml
   trunk/system/pom.xml
   trunk/tomcat/pom.xml
   trunk/varia/pom.xml
   trunk/webservices/pom.xml
Log:
Fix deprecated use of ${artifactId} in POMs.

Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/aspects/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -14,7 +14,7 @@
   <description>JBoss Application Server (aspects module)</description>
   
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: trunk/cluster/pom.xml
===================================================================
--- trunk/cluster/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/cluster/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -16,7 +16,7 @@
   <description>JBoss Application Server (cluster module)</description>
   
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

Modified: trunk/connector/pom.xml
===================================================================
--- trunk/connector/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/connector/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -16,7 +16,7 @@
   <description>JBoss Application Server (connector module)</description>
   
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/console/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -16,7 +16,7 @@
   <description>JBoss Application Server (console module)</description>
   
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: trunk/deployment/pom.xml
===================================================================
--- trunk/deployment/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/deployment/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -14,7 +14,7 @@
   <description>JBoss Application Server (deployment module)</description>
   
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/ejb3/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -16,7 +16,7 @@
   <description>JBoss Application Server (ejb3 module)</description>
   
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <resources>
       <resource>
         <directory>src/resources</directory>

Modified: trunk/hibernate-int/pom.xml
===================================================================
--- trunk/hibernate-int/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/hibernate-int/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -16,7 +16,7 @@
   <description>JBoss Application Server (hibernate-int module)</description>
   
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: trunk/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/iiop/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -16,7 +16,7 @@
   <description>JBoss Application Server (iiop module)</description>
   
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

Modified: trunk/jbossas-jmx-remoting/pom.xml
===================================================================
--- trunk/jbossas-jmx-remoting/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/jbossas-jmx-remoting/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -14,7 +14,7 @@
   <description>JBoss Application Server (jbossas-jmx-remoting module)</description>
 
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <resources>
       <resource>
         <directory>src/resources</directory>

Modified: trunk/jbossas-remoting/pom.xml
===================================================================
--- trunk/jbossas-remoting/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/jbossas-remoting/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -13,7 +13,7 @@
   <url>http://www.jboss.com/products/jbossas</url>
   <description>JBoss Application Server (jbossas-remoting module)</description>
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: trunk/jmx-remoting/pom.xml
===================================================================
--- trunk/jmx-remoting/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/jmx-remoting/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -13,7 +13,7 @@
   <url>http://www.jboss.org/jbossas</url>
   <description>JBoss Application Server (jmx-remoting module)</description>
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

Modified: trunk/main/pom.xml
===================================================================
--- trunk/main/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/main/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -14,7 +14,7 @@
   <url>http://www.jboss.org/jbossas</url>
   <description>JBoss Application Server (main module)</description>
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <resources>
       <resource>
         <directory>src/resources</directory>

Modified: trunk/management/pom.xml
===================================================================
--- trunk/management/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/management/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -16,7 +16,7 @@
   <description>JBoss Application Server (management module)</description>
   
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <resources>
       <resource>
         <directory>src/resources</directory>

Modified: trunk/messaging/pom.xml
===================================================================
--- trunk/messaging/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/messaging/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -16,7 +16,7 @@
   <description>JBoss Application Server (messaging module)</description>
   
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <resources>
       <resource>
         <directory>src/resources</directory>

Modified: trunk/messaging/src/etc/examples/web-service/build.xml
===================================================================
--- trunk/messaging/src/etc/examples/web-service/build.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/messaging/src/etc/examples/web-service/build.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -43,7 +43,7 @@
       <pathelement location="${jboss.client}/jbossws-client.jar"/>
       <pathelement location="${jboss.client}/log4j.jar"/>
       <pathelement location="${jboss.client}/mail.jar"/>
-      <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+      <pathelement location="${jboss.client}/jbossxb.jar"/>
       <pathelement location="${jboss.client}/jboss-jaxws.jar"/>
       <pathelement location="${jboss.client}/jboss-jaxrpc.jar"/>
       <pathelement location="${jboss.client}/jboss-saaj.jar"/>
@@ -66,7 +66,7 @@
       <pathelement location="${jboss.client}/jbossws-client.jar"/>
       <pathelement location="${jboss.client}/log4j.jar"/>
       <pathelement location="${jboss.client}/mail.jar"/>
-      <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+      <pathelement location="${jboss.client}/jbossxb.jar"/>
       <pathelement location="${jboss.client}/jboss-jaxws.jar"/>
       <pathelement location="${jboss.client}/jboss-jaxrpc.jar"/>
       <pathelement location="${jboss.client}/jboss-saaj.jar"/>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -68,7 +68,7 @@
                 </addDefaultImplementationEntries>
               </manifest>
               <manifestEntries>
-                <Implementation-URL>${pom.url}</Implementation-URL>
+                <Implementation-URL>${project.url}</Implementation-URL>
               </manifestEntries>
               <manifestSections>
                 <manifestSection>
@@ -104,7 +104,7 @@
                 </addDefaultImplementationEntries>
               </manifest>
               <manifestEntries>
-                <Implementation-URL>${pom.url}</Implementation-URL>
+                <Implementation-URL>${project.url}</Implementation-URL>
               </manifestEntries>
               <manifestSections>
                 <manifestSection>

Modified: trunk/profileservice/pom.xml
===================================================================
--- trunk/profileservice/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/profileservice/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -13,7 +13,7 @@
   <url>http://www.jboss.org/jbossas</url>
   <description>JBoss Application Server (profileservice module)</description>
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <resources>
       <resource>
         <directory>src/main/java</directory>

Modified: trunk/security/pom.xml
===================================================================
--- trunk/security/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/security/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -13,7 +13,7 @@
   <url>http://www.jboss.org/jbossas</url>
   <description>JBoss Application Server (security module)</description>
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <!-- TODO: This resource config is not being copied for some reason.
     <resources>
       <resource>

Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/server/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -14,7 +14,7 @@
   <description>JBoss Application Server (server module)</description>
   
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

Modified: trunk/system/pom.xml
===================================================================
--- trunk/system/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/system/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -14,7 +14,7 @@
   <description>JBoss Application Server (system module)</description>
   
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <resources>
       <resource>
         <directory>src/resources</directory>

Modified: trunk/system-jmx/pom.xml
===================================================================
--- trunk/system-jmx/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/system-jmx/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -13,7 +13,7 @@
   <url>http://www.jboss.org/jbossas</url>
   <description>JBoss Application Server (system-jmx module)</description>
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/tomcat/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -16,7 +16,7 @@
   <description>JBoss Application Server (tomcat module)</description>
   
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <resources>
       <resource>
         <directory>src/main/java</directory>

Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/varia/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -16,7 +16,7 @@
   <description>JBoss Application Server (varia module)</description>
   
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml	2010-01-26 15:28:44 UTC (rev 99945)
+++ trunk/webservices/pom.xml	2010-01-26 15:31:51 UTC (rev 99946)
@@ -16,7 +16,7 @@
   <description>JBoss Application Server (webservices module)</description>
   
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <resources>
       <resource>
         <directory>src/resources/jbossws-jboss.jar</directory>




More information about the jboss-cvs-commits mailing list