[jboss-cvs] JBossAS SVN: r94688 - in trunk: build and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 12 12:23:13 EDT 2009
Author: alesj
Date: 2009-10-12 12:23:12 -0400 (Mon, 12 Oct 2009)
New Revision: 94688
Removed:
trunk/spring-int/
Modified:
trunk/build/build.xml
trunk/build/pom.xml
trunk/component-matrix/pom.xml
trunk/pom.xml
trunk/server/src/main/java/org/jboss/deployment/LegacyWebXmlLessDeployer.java
trunk/testsuite/build.xml
trunk/testsuite/imports/server-config.xml
trunk/testsuite/pom.xml
Log:
[JBAS-7370]; remove spring-int.
[JBAS-7316]; update CL to 2.0.7.CR2 (JBCL-110 update).
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-10-12 16:07:28 UTC (rev 94687)
+++ trunk/build/build.xml 2009-10-12 16:23:12 UTC (rev 94688)
@@ -202,8 +202,7 @@
module-tomcat,
module-webservices,
module-hibernate-int,
- module-console,
- module-spring-int">
+ module-console">
</target>
<target name="install" depends="partition-build"
@@ -1927,32 +1926,6 @@
</target>
- <!-- ============ -->
- <!-- Spring -->
- <!-- ============ -->
-
- <target name="module-spring-int">
- <property name="spring-int.module.name" value="spring-int"/>
- <property name="spring-int.module.output"
- value="${project.root}/${spring-int.module.name}/output"/>
-
- <!-- Uncomment this if you want jboss-spring.deployer in all configration -->
- <!--
- <mkdir dir="${install.server}/all/deploy/jboss-spring.deployer"/>
- <unjar src="${_module.output}/lib/jboss-spring.deployer"
- dest="${install.server}/all/deploy/jboss-spring.deployer"/>
- -->
- </target>
-
- <target name="module-spring-int-all" depends="module-spring-int">
- <mkdir dir="${install.api}/${spring-int.module.name}"/>
- <copy todir="${install.api}/${spring-int.module.name}" filtering="no">
- <fileset dir="${spring-int.module.output}/api">
- <include name="**/*"/>
- </fileset>
- </copy>
- </target>
-
<!-- ========================================================================== -->
<!-- Thirdparty dependencies consumed directly from the local maven repository -->
<!-- ========================================================================== -->
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2009-10-12 16:07:28 UTC (rev 94687)
+++ trunk/build/pom.xml 2009-10-12 16:23:12 UTC (rev 94688)
@@ -164,10 +164,6 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-spring-int</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-system</artifactId>
</dependency>
<dependency>
@@ -201,6 +197,10 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-pojo</artifactId>
+ </dependency>
<!-- End module dependencies -->
<!-- Dependencies on additional artifacts not included by the modules -->
@@ -457,6 +457,11 @@
<type>zip</type>
</dependency>
<dependency>
+ <groupId>org.jboss.snowdrop</groupId>
+ <artifactId>snowdrop</artifactId>
+ <type>zip</type>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-client</artifactId>
</dependency>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2009-10-12 16:07:28 UTC (rev 94687)
+++ trunk/component-matrix/pom.xml 2009-10-12 16:23:12 UTC (rev 94688)
@@ -66,7 +66,7 @@
<version.org.jboss.bootstrap.spi.mc>2.0.0-alpha-1</version.org.jboss.bootstrap.spi.mc>
<version.org.jboss.cache.core>3.2.1.GA</version.org.jboss.cache.core>
<version.org.jboss.cache.pojo>3.0.0.GA</version.org.jboss.cache.pojo>
- <version.org.jboss.cl>2.0.6.GA</version.org.jboss.cl>
+ <version.org.jboss.cl>2.0.7.CR2</version.org.jboss.cl>
<version.org.jboss.cluster.cache.jbc>2.0.1.GA</version.org.jboss.cluster.cache.jbc>
<version.org.jboss.cluster.cache.spi>2.0.0.GA</version.org.jboss.cluster.cache.spi>
<version.org.jboss.cluster.client>1.1.1.GA</version.org.jboss.cluster.client>
@@ -94,7 +94,7 @@
<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.Alpha4</version.org.jboss.metadata.war>
- <version.org.jboss.microcontainer>2.0.8.GA</version.org.jboss.microcontainer>
+ <version.org.jboss.microcontainer>2.0.9.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>
<version.org.jboss.reflect>2.0.2.GA</version.org.jboss.reflect>
@@ -102,7 +102,7 @@
<version.org.jboss.security>2.1.0.20090318</version.org.jboss.security>
<version.org.jboss.service.binding>1.0.0.CR1</version.org.jboss.service.binding>
<version.org.jboss.threads>1.0.0.GA</version.org.jboss.threads>
- <version.org.jboss.vfs>2.1.2.GA</version.org.jboss.vfs>
+ <version.org.jboss.vfs>2.1.3.SP1</version.org.jboss.vfs>
<version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
<version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
<version.org.jboss.xnio.metadata>1.0.1.GA</version.org.jboss.xnio.metadata>
@@ -118,6 +118,7 @@
<version.sun.jaxb>2.1.9</version.sun.jaxb>
<version.webbeans.integration>5.2.0.Beta2</version.webbeans.integration>
<version.xdoclet>1.2.3</version.xdoclet>
+ <version.spring.integration>1.0.0.CR2</version.spring.integration>
</properties>
<!-- Build Configuration -->
@@ -164,10 +165,28 @@
<artifactId>webbeans-jboss-int-jboss-ejb</artifactId>
</exclusion>
</exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.snowdrop</groupId>
+ <artifactId>snowdrop</artifactId>
+ <version>${version.spring.integration}</version>
+ <type>zip</type>
</dependency>
<dependency>
+ <groupId>org.jboss.snowdrop</groupId>
+ <artifactId>snowdrop-deployers</artifactId>
+ <version>${version.spring.integration}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.snowdrop</groupId>
+ <artifactId>snowdrop-facade</artifactId>
+ <version>${version.spring.integration}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-10-12 16:07:28 UTC (rev 94687)
+++ trunk/pom.xml 2009-10-12 16:23:12 UTC (rev 94688)
@@ -410,11 +410,6 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-spring-int</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-system</artifactId>
<version>${project.version}</version>
</dependency>
@@ -563,7 +558,6 @@
<module>webservices</module>
<module>hibernate-int</module>
<module>console</module>
- <module>spring-int</module>
<module>client</module>
<module>build</module>
<module>testsuite</module>
Modified: trunk/server/src/main/java/org/jboss/deployment/LegacyWebXmlLessDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/LegacyWebXmlLessDeployer.java 2009-10-12 16:07:28 UTC (rev 94687)
+++ trunk/server/src/main/java/org/jboss/deployment/LegacyWebXmlLessDeployer.java 2009-10-12 16:23:12 UTC (rev 94688)
@@ -58,7 +58,7 @@
// Detect and ignore OSGi WAR deployments
// FIXME Use typed OSGiMetaData when we have it available at runtime
- String bundleSymbolicName = (String) unit.getAttachment("org.jboss.osgi.bundle.symbolic.name");
+ String bundleSymbolicName = unit.getAttachment("org.jboss.osgi.bundle.symbolic.name", String.class);
if (bundleSymbolicName != null)
{
log.debug("Ignore OSGi webapp: " + bundleSymbolicName);
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2009-10-12 16:07:28 UTC (rev 94687)
+++ trunk/testsuite/build.xml 2009-10-12 16:23:12 UTC (rev 94688)
@@ -315,6 +315,8 @@
<fileset refid="cglib:cglib:jar"/>
<!-- Need spring jar for spring-based tests -->
<path refid="org.springframework.classpath"/>
+ <fileset refid="org.jboss.snowdrop:snowdrop-deployers:jar"/>
+ <fileset refid="org.jboss.snowdrop:snowdrop-facade:jar"/>
<!-- xml binding -->
<fileset refid="xmlunit:xmlunit:jar"/>
@@ -430,7 +432,6 @@
<fileset refid="jboss.web:jbossweb:jar"/>
<fileset refid="jboss.web:jsp-api:jar"/>
<fileset refid="jboss.web:servlet-api:jar"/>
- <fileset refid="org.jboss.jbossas:jboss-as-spring-int:jar"/>
</path>
<!-- The combined thirdparty classpath -->
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2009-10-12 16:07:28 UTC (rev 94687)
+++ trunk/testsuite/imports/server-config.xml 2009-10-12 16:23:12 UTC (rev 94688)
@@ -1136,8 +1136,11 @@
<include name="deployers/**"/>
</fileset>
</copy>
- <copy file="${project.root}/spring-int/target/jboss-as-spring-int-jboss-spring-deployer.jar"
- tofile="${jboss.dist}/server/@{conf}/deployers/jboss-spring.deployer" overwrite="true"/>
+
+ <unzip dest="${jboss.dist}/server/@{conf}/deployers" overwrite="true">
+ <fileset refid="org.jboss.snowdrop:snowdrop:zip"/>
+ </unzip>
+
<!-- Overwrite any config content with that from the
resources/test-configs/@{conf}
-->
Modified: trunk/testsuite/pom.xml
===================================================================
--- trunk/testsuite/pom.xml 2009-10-12 16:07:28 UTC (rev 94687)
+++ trunk/testsuite/pom.xml 2009-10-12 16:23:12 UTC (rev 94688)
@@ -124,7 +124,15 @@
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.jboss.snowdrop</groupId>
+ <artifactId>snowdrop-deployers</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.snowdrop</groupId>
+ <artifactId>snowdrop-facade</artifactId>
+ </dependency>
+
</dependencies>
<profiles>
More information about the jboss-cvs-commits
mailing list