[jboss-cvs] JBossAS SVN: r92967 - in trunk: component-matrix and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 28 11:32:06 EDT 2009
Author: alex.loubyansky at jboss.com
Date: 2009-08-28 11:32:05 -0400 (Fri, 28 Aug 2009)
New Revision: 92967
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/connector/pom.xml
trunk/deployment/pom.xml
trunk/iiop/pom.xml
trunk/messaging/pom.xml
trunk/server/pom.xml
trunk/testsuite/build.xml
trunk/tomcat/pom.xml
trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
trunk/webservices/pom.xml
Log:
JBAS-7216 upgrade to the split metadata, currently 2.0.0.Alpha
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-08-28 15:30:29 UTC (rev 92966)
+++ trunk/build/build.xml 2009-08-28 15:32:05 UTC (rev 92967)
@@ -1972,7 +1972,12 @@
<fileset refid="org.jboss.cluster:jboss-ha-server-cache-spi:jar"/>
<fileset refid="org.jboss.cluster:jboss-ha-server-cache-jbc:jar"/>
<fileset refid="org.jboss.integration:jboss-integration:jar"/>
- <fileset refid="org.jboss.metadata:jboss-metadata:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-common:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-client:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-ear:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-ejb:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-rar:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-war:jar"/>
<fileset refid="org.jboss.javaee:jboss-jaspi-api:jar"/>
<fileset refid="org.jboss.javaee:jboss-javaee:jar"/>
<fileset refid="org.jboss.naming:jnpserver:jar"/>
@@ -2124,7 +2129,12 @@
<fileset refid="org.jboss.security:jbosssx-client:jar"/>
<fileset refid="org.jboss.mx:jboss-j2se:jar"/>
<fileset refid="org.jboss.mx:jboss-jmx:jar"/>
- <fileset refid="org.jboss.metadata:jboss-metadata:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-common:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-client:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-ear:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-ejb:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-rar:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-war:jar"/>
<fileset refid="org.jboss:jboss-mdr:jar"/>
<fileset refid="org.jboss.deployers:jboss-deployers-client:jar"/>
<fileset refid="org.jboss.deployers:jboss-deployers-client-spi:jar"/>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2009-08-28 15:30:29 UTC (rev 92966)
+++ trunk/component-matrix/pom.xml 2009-08-28 15:32:05 UTC (rev 92967)
@@ -80,13 +80,18 @@
<version.org.jboss.ejb3.security.client>1.0.0</version.org.jboss.ejb3.security.client>
<version.org.jboss.ejb3>1.1.13</version.org.jboss.ejb3>
<version.org.jboss.integration>5.1.0.SP1</version.org.jboss.integration>
- <version.org.jboss.jbossxb>2.0.1.GA</version.org.jboss.jbossxb>
+ <version.org.jboss.jbossxb>2.0.2.Beta1</version.org.jboss.jbossxb>
<version.org.jboss.jpa>1.0.0</version.org.jboss.jpa>
<version.org.jboss.logging>2.2.0.CR1</version.org.jboss.logging>
<version.org.jboss.logmanager>1.1.0.CR6</version.org.jboss.logmanager>
<version.org.jboss.man>2.1.1.GA</version.org.jboss.man>
<version.org.jboss.mdr>2.0.2.GA</version.org.jboss.mdr>
- <version.org.jboss.metadata>1.0.1.GA</version.org.jboss.metadata>
+ <version.org.jboss.metadata.common>2.0.0.Alpha</version.org.jboss.metadata.common>
+ <version.org.jboss.metadata.client>2.0.0.Alpha</version.org.jboss.metadata.client>
+ <version.org.jboss.metadata.ear>2.0.0.Alpha</version.org.jboss.metadata.ear>
+ <version.org.jboss.metadata.ejb>2.0.0.Alpha</version.org.jboss.metadata.ejb>
+ <version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>
+ <version.org.jboss.metadata.war>2.0.0.Alpha</version.org.jboss.metadata.war>
<version.org.jboss.microcontainer>2.0.8.GA</version.org.jboss.microcontainer>
<version.org.jboss.mx>6.0.0.Beta1</version.org.jboss.mx>
<version.org.jboss.naming>5.0.3.GA</version.org.jboss.naming>
@@ -1252,8 +1257,8 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
- <version>${version.org.jboss.metadata}</version>
+ <artifactId>jboss-metadata-common</artifactId>
+ <version>${version.org.jboss.metadata.common}</version>
<exclusions>
<exclusion>
<groupId>org.jboss</groupId>
@@ -1261,6 +1266,31 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-client</artifactId>
+ <version>${version.org.jboss.metadata.client}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-ear</artifactId>
+ <version>${version.org.jboss.metadata.ear}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-ejb</artifactId>
+ <version>${version.org.jboss.metadata.ejb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-rar</artifactId>
+ <version>${version.org.jboss.metadata.rar}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-war</artifactId>
+ <version>${version.org.jboss.metadata.war}</version>
+ </dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified: trunk/connector/pom.xml
===================================================================
--- trunk/connector/pom.xml 2009-08-28 15:30:29 UTC (rev 92966)
+++ trunk/connector/pom.xml 2009-08-28 15:32:05 UTC (rev 92967)
@@ -221,9 +221,13 @@
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
+ <artifactId>jboss-metadata-common</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-rar</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
</dependency>
Modified: trunk/deployment/pom.xml
===================================================================
--- trunk/deployment/pom.xml 2009-08-28 15:30:29 UTC (rev 92966)
+++ trunk/deployment/pom.xml 2009-08-28 15:32:05 UTC (rev 92967)
@@ -126,8 +126,28 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
+ <artifactId>jboss-metadata-common</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-ear</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-ejb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-rar</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-war</artifactId>
+ </dependency>
<dependency>
<groupId>org.jboss.integration</groupId>
Modified: trunk/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml 2009-08-28 15:30:29 UTC (rev 92966)
+++ trunk/iiop/pom.xml 2009-08-28 15:32:05 UTC (rev 92967)
@@ -244,7 +244,7 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
+ <artifactId>jboss-metadata-common</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.javaee</groupId>
@@ -252,6 +252,26 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-ear</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-ejb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-rar</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-war</artifactId>
+ </dependency>
<dependency>
<groupId>org.jboss.security</groupId>
Modified: trunk/messaging/pom.xml
===================================================================
--- trunk/messaging/pom.xml 2009-08-28 15:30:29 UTC (rev 92966)
+++ trunk/messaging/pom.xml 2009-08-28 15:32:05 UTC (rev 92967)
@@ -68,9 +68,29 @@
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
+ <artifactId>jboss-metadata-common</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-ejb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-ear</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-rar</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-war</artifactId>
+ </dependency>
+ <dependency>
<groupId>jboss.messaging</groupId>
<artifactId>jboss-messaging</artifactId>
</dependency>
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2009-08-28 15:30:29 UTC (rev 92966)
+++ trunk/server/pom.xml 2009-08-28 15:32:05 UTC (rev 92967)
@@ -286,8 +286,28 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
+ <artifactId>jboss-metadata-common</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-ear</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-ejb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-rar</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-war</artifactId>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2009-08-28 15:30:29 UTC (rev 92966)
+++ trunk/testsuite/build.xml 2009-08-28 15:32:05 UTC (rev 92967)
@@ -282,7 +282,12 @@
<fileset refid="org.jboss.ws.native:jbossws-native-resources:jar"/>
<fileset refid="org.jboss.ws.native:jbossws-native-saaj:jar"/>
<fileset refid="org.jboss:jbossxb:jar"/>
- <fileset refid="org.jboss.metadata:jboss-metadata:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-common:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-client:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-ear:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-ejb:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-rar:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata-war:jar"/>
<fileset refid="org.jboss.integration:jboss-classloading-spi:jar"/>
<fileset refid="org.jboss.integration:jboss-corba-ots-spi:jar"/>
<fileset refid="org.jboss.integration:jboss-deployment-spi:jar"/>
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2009-08-28 15:30:29 UTC (rev 92966)
+++ trunk/tomcat/pom.xml 2009-08-28 15:32:05 UTC (rev 92967)
@@ -232,9 +232,13 @@
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
+ <artifactId>jboss-metadata-common</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-war</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
<exclusions>
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java 2009-08-28 15:30:29 UTC (rev 92966)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java 2009-08-28 15:32:05 UTC (rev 92967)
@@ -62,7 +62,7 @@
import org.jboss.metadata.web.spec.FilterMetaData;
import org.jboss.metadata.web.spec.FiltersMetaData;
import org.jboss.metadata.web.spec.JspConfigMetaData;
-import org.jboss.metadata.web.spec.JspPropertyGroup;
+import org.jboss.metadata.web.spec.JspPropertyGroupMetaData;
import org.jboss.metadata.web.spec.ListenerMetaData;
import org.jboss.metadata.web.spec.LocaleEncodingMetaData;
import org.jboss.metadata.web.spec.LocaleEncodingsMetaData;
@@ -393,10 +393,10 @@
JspConfigMetaData config = metaData.getJspConfig();
if (config != null)
{
- List<JspPropertyGroup> groups = config.getPropertyGroups();
+ List<JspPropertyGroupMetaData> groups = config.getPropertyGroups();
if (groups != null)
{
- for (JspPropertyGroup group : groups)
+ for (JspPropertyGroupMetaData group : groups)
{
for (String pattern : group.getUrlPatterns())
{
Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml 2009-08-28 15:30:29 UTC (rev 92966)
+++ trunk/webservices/pom.xml 2009-08-28 15:32:05 UTC (rev 92967)
@@ -158,7 +158,7 @@
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
+ <artifactId>jboss-metadata-common</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss</groupId>
More information about the jboss-cvs-commits
mailing list