[jboss-cvs] JBossAS SVN: r103695 - in trunk: component-matrix and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 8 08:31:10 EDT 2010
Author: thomas.diesler at jboss.com
Date: 2010-04-08 08:31:09 -0400 (Thu, 08 Apr 2010)
New Revision: 103695
Added:
trunk/osgi/jar/src/main/java/org/jboss/osgi/integration/jbossas/AOPClassLoaderDeployerJBAS7909.java
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/osgi/jar/pom.xml
trunk/server/src/etc/conf/all/bootstrap/deployers.xml
Log:
[JBAS-7909] AOPClassLoaderDeployer breaks OSGi integration
Overwite with AOPClassLoaderDeployerJBAS7909
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-04-08 12:29:12 UTC (rev 103694)
+++ trunk/build/build.xml 2010-04-08 12:31:09 UTC (rev 103695)
@@ -425,6 +425,10 @@
<include name="web.xml"/>
</fileset>
</copy>
+
+ <!-- [JBAS-7909] AOPClassLoaderDeployer breaks OSGi integration -->
+ <move file="${install.osgi.deployers}/osgi.deployer/jboss-as-osgi-integration.jar" todir="${install.lib}"/>
+ <move file="${install.osgi.deployers}/osgi.deployer/jboss-osgi-framework-metadata.jar" todir="${install.lib}"/>
<!-- Build standard config manually -->
<copy todir="${install.standard}">
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-04-08 12:29:12 UTC (rev 103694)
+++ trunk/component-matrix/pom.xml 2010-04-08 12:31:09 UTC (rev 103695)
@@ -2899,6 +2899,23 @@
</dependency>
<dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-metadata</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.org.osgi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${version.org.osgi}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${version.org.springframework}</version>
Modified: trunk/osgi/jar/pom.xml
===================================================================
--- trunk/osgi/jar/pom.xml 2010-04-08 12:29:12 UTC (rev 103694)
+++ trunk/osgi/jar/pom.xml 2010-04-08 12:31:09 UTC (rev 103695)
@@ -31,12 +31,18 @@
<dependency>
<groupId>org.jboss.spec.javax.transaction</groupId>
<artifactId>jboss-transaction-api_1.1_spec</artifactId>
- <version>${version.org.jboss.spec.javaee}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-deployers</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-metadata</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${version.org.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Added: trunk/osgi/jar/src/main/java/org/jboss/osgi/integration/jbossas/AOPClassLoaderDeployerJBAS7909.java
===================================================================
--- trunk/osgi/jar/src/main/java/org/jboss/osgi/integration/jbossas/AOPClassLoaderDeployerJBAS7909.java (rev 0)
+++ trunk/osgi/jar/src/main/java/org/jboss/osgi/integration/jbossas/AOPClassLoaderDeployerJBAS7909.java 2010-04-08 12:31:09 UTC (rev 103695)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.integration.jbossas;
+
+//$Id$
+
+import org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.osgi.framework.metadata.OSGiMetaData;
+
+/**
+ * [JBAS-7909] AOPClassLoaderDeployer breaks OSGi integration
+ *
+ * https://jira.jboss.org/jira/browse/JBAS-7909
+ *
+ * Remove when fixed.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 08-Apr-2010
+ */
+public class AOPClassLoaderDeployerJBAS7909 extends AOPClassLoaderDeployer
+{
+ @Override
+ protected void internalDeploy(DeploymentUnit unit) throws DeploymentException
+ {
+ // Do nothing if this is an OSGi deployment
+ if (unit.isAttachmentPresent(OSGiMetaData.class))
+ return;
+
+ super.internalDeploy(unit);
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/osgi/jar/src/main/java/org/jboss/osgi/integration/jbossas/AOPClassLoaderDeployerJBAS7909.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/server/src/etc/conf/all/bootstrap/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/deployers.xml 2010-04-08 12:29:12 UTC (rev 103694)
+++ trunk/server/src/etc/conf/all/bootstrap/deployers.xml 2010-04-08 12:31:09 UTC (rev 103695)
@@ -23,6 +23,10 @@
<root>${jboss.lib.url}jaxb-impl.jar</root>
<!-- STAX2 impl here, api is in endorsed -->
<root>${jboss.lib.url}wstx-lgpl.jar</root>
+
+ <!-- [JBAS-7909] AOPClassLoaderDeployer breaks OSGi integration -->
+ <root>${jboss.lib.url}jboss-as-osgi-integration.jar</root>
+ <root>${jboss.lib.url}jboss-osgi-framework-metadata.jar</root>
</classloader>
<!-- use legacy ordering -->
@@ -169,7 +173,8 @@
<bean name="AOPAnnotationMetaDataParserDeployer" class="org.jboss.aop.asintegration.jboss5.AOPAnnotationMetaDataParserDeployer">
<constructor><parameter>0</parameter></constructor>
</bean>
- <bean name="AOPClassLoaderDeployer" class="org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer">
+ <!-- bean name="AOPClassLoaderDeployer" class="org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer" -->
+ <bean name="AOPClassLoaderDeployer" class="org.jboss.osgi.integration.jbossas.AOPClassLoaderDeployerJBAS7909">
<property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
</bean>
<bean name="AOPDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.AOPDeploymentAopMetaDataDeployer">
More information about the jboss-cvs-commits
mailing list