[jboss-cvs] JBossAS SVN: r103447 - in trunk: build and 20 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 1 12:10:15 EDT 2010
Author: thomas.diesler at jboss.com
Date: 2010-04-01 12:10:13 -0400 (Thu, 01 Apr 2010)
New Revision: 103447
Added:
trunk/osgi/
trunk/osgi/.project
trunk/osgi/.settings/
trunk/osgi/.settings/org.maven.ide.eclipse.prefs
trunk/osgi/jar/
trunk/osgi/jar/.classpath
trunk/osgi/jar/.project
trunk/osgi/jar/.settings/
trunk/osgi/jar/.settings/org.eclipse.jdt.core.prefs
trunk/osgi/jar/.settings/org.maven.ide.eclipse.prefs
trunk/osgi/jar/pom.xml
trunk/osgi/jar/src/
trunk/osgi/jar/src/main/
trunk/osgi/jar/src/main/java/
trunk/osgi/jar/src/main/java/org/
trunk/osgi/jar/src/main/java/org/jboss/
trunk/osgi/jar/src/main/java/org/jboss/osgi/
trunk/osgi/jar/src/main/java/org/jboss/osgi/integration/
trunk/osgi/jar/src/main/java/org/jboss/osgi/integration/jbossas/
trunk/osgi/jar/src/main/java/org/jboss/osgi/integration/jbossas/TransactionServiceBean.java
trunk/osgi/pom.xml
trunk/osgi/zip/
trunk/osgi/zip/.project
trunk/osgi/zip/.settings/
trunk/osgi/zip/.settings/org.maven.ide.eclipse.prefs
trunk/osgi/zip/pom.xml
trunk/osgi/zip/src/
trunk/osgi/zip/src/assembly/
trunk/osgi/zip/src/assembly/assembly.xml
trunk/osgi/zip/src/resources/
trunk/osgi/zip/src/resources/jboss-osgi-jboss-beans.xml
trunk/osgi/zip/src/resources/jta-service-jboss-beans.xml
Modified:
trunk/build/build-web.xml
trunk/build/build.xml
trunk/build/pom.xml
trunk/component-matrix/pom.xml
trunk/pom.xml
trunk/resteasy-int/pom.xml
trunk/resteasy-int/zip/pom.xml
Log:
[JBAS-7661] Integrate JBoss OSGi in AS distribution
After startup, point your browser to http://localhost:8090/jboss-osgi
Modified: trunk/build/build-web.xml
===================================================================
--- trunk/build/build-web.xml 2010-04-01 15:28:43 UTC (rev 103446)
+++ trunk/build/build-web.xml 2010-04-01 16:10:13 UTC (rev 103447)
@@ -171,7 +171,6 @@
<exclude name="common/deploy/admin-console.war/**" />
<exclude name="common/deploy/jbossws-console.war/**" />
<exclude name="lib/jaxb-xjc.jar" />
- <exclude name="lib/osgi_R4_core.jar" />
<exclude name="lib/xercesImpl.jar" />
<exclude name="server/**" />
<exclude name="docs/**" />
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-04-01 15:28:43 UTC (rev 103446)
+++ trunk/build/build.xml 2010-04-01 16:10:13 UTC (rev 103447)
@@ -197,6 +197,7 @@
module-tomcat,
module-webservices,
module-resteasy,
+ module-osgi,
module-hibernate-int,
module-hornetq-int,
module-console">
@@ -1660,6 +1661,17 @@
</target>
<!-- =========== -->
+ <!-- JBoss OSGi -->
+ <!-- =========== -->
+
+ <target name="module-osgi">
+ <property name="osgi.module.name" value="osgi"/>
+ <property name="osgi.module.output" value="${project.root}/${osgi.module.name}/zip/target"/>
+
+ <unzip dest="${install.all}" src="${osgi.module.output}/jboss-as-osgi-distribution-${pom.project.version}.zip"/>
+ </target>
+
+ <!-- =========== -->
<!-- Resteasy -->
<!-- =========== -->
@@ -2032,7 +2044,6 @@
<fileset refid="org.jboss.kernel:jboss-jmx-mc-int:jar"/>
<fileset refid="javax.inject:javax.inject:jar"/>
<fileset refid="org.jboss:jboss-vfs:jar"/>
- <fileset refid="org.osgi:osgi_R4_core:jar"/>
<fileset refid="trove:trove:jar"/>
<fileset refid="com.sun.xml.bind:jaxb-impl:jar"/>
<fileset refid="com.sun.xml.bind:jaxb-xjc:jar"/>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2010-04-01 15:28:43 UTC (rev 103446)
+++ trunk/build/pom.xml 2010-04-01 16:10:13 UTC (rev 103447)
@@ -820,11 +820,6 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>snmptrapappender</groupId>
<artifactId>snmpTrapAppender</artifactId>
<optional>true</optional>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-04-01 15:28:43 UTC (rev 103446)
+++ trunk/component-matrix/pom.xml 2010-04-01 16:10:13 UTC (rev 103447)
@@ -30,10 +30,14 @@
<!-- Properties -->
<properties>
+ <version.apache.aries.jmx>0.1-incubating-20100329</version.apache.aries.jmx>
+ <version.apache.aries.util>0.1-incubating-20100329</version.apache.aries.util>
+ <version.apache.felix.log>1.0.0</version.apache.felix.log>
<version.apache.xalan>2.7.1.patch01-brew</version.apache.xalan>
<version.beanvalidation.integration>1.0.0-Beta-1</version.beanvalidation.integration>
<version.commons.beanutils>1.8.0</version.commons.beanutils>
<version.fastinfoset>1.2.2</version.fastinfoset>
+ <version.hornetq>2.1.0.r9031</version.hornetq>
<version.inject.api>1</version.inject.api>
<version.jacorb>2.3.1jboss.patch01-brew</version.jacorb>
<version.javassist>3.11.0.GA</version.javassist>
@@ -48,11 +52,31 @@
<version.jboss.jbossws-framework>3.3.0.CR1.SP1</version.jboss.jbossws-framework>
<version.jboss.jbossws-spi>1.3.0.CR1.SP1</version.jboss.jbossws-spi>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
- <version.hornetq>2.1.0.r9031</version.hornetq>
+ <version.jboss.osgi.apache.xerces>2.9.1.SP4</version.jboss.osgi.apache.xerces>
+ <version.jboss.osgi.blueprint>1.0.0.Beta2</version.jboss.osgi.blueprint>
+ <version.jboss.osgi.common>1.0.4</version.jboss.osgi.common>
+ <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
+ <version.jboss.osgi.deployers>1.0.6</version.jboss.osgi.deployers>
+ <version.jboss.osgi.deployment>1.0.2</version.jboss.osgi.deployment>
+ <version.jboss.osgi.framework>1.0.0.Alpha4</version.jboss.osgi.framework>
+ <version.jboss.osgi.husky>1.0.4</version.jboss.osgi.husky>
+ <version.jboss.osgi.jaxb>2.1.10.SP4</version.jboss.osgi.jaxb>
+ <version.jboss.osgi.jbossas>1.0.3</version.jboss.osgi.jbossas>
+ <version.jboss.osgi.jmx>1.0.4</version.jboss.osgi.jmx>
+ <version.jboss.osgi.jndi>1.0.3</version.jboss.osgi.jndi>
+ <version.jboss.osgi.jta>1.0.1</version.jboss.osgi.jta>
+ <version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect>
+ <version.jboss.osgi.spi>1.0.5.SP1</version.jboss.osgi.spi>
+ <version.jboss.osgi.vfs>1.0.0</version.jboss.osgi.vfs>
+ <version.jboss.osgi.webapp>0.7.2.SP2</version.jboss.osgi.webapp>
+ <version.jboss.osgi.webconsole>1.0.3-SNAPSHOT</version.jboss.osgi.webconsole>
+ <version.jboss.osgi.xml.binding>2.0.2.Beta4.SP1</version.jboss.osgi.xml.binding>
+ <version.ops4j.pax.web>0.7.2</version.ops4j.pax.web>
<version.jboss.web>3.0.0-beta-4</version.jboss.web>
<version.jgroups>2.6.13.GA</version.jgroups>
<version.jsr181.api>1.0-MR1</version.jsr181.api>
<version.junit>3.8.2</version.junit>
+ <version.ops4j.pax.web>0.7.2</version.ops4j.pax.web>
<version.org.hibernate>3.5.0-CR-1</version.org.hibernate>
<version.org.hibernate.commons.annotations>3.2.0.Beta1</version.org.hibernate.commons.annotations>
<version.org.hibernate.entity.manager>3.5.0-CR-1</version.org.hibernate.entity.manager>
@@ -117,6 +141,7 @@
<version.org.jboss.vfs>3.0.0.CR5</version.org.jboss.vfs>
<version.org.jboss.xnio>2.1.0.CR2</version.org.jboss.xnio>
<version.org.jboss.xnio.metadata>2.1.0.CR4</version.org.jboss.xnio.metadata>
+ <version.org.osgi>4.2.0</version.org.osgi>
<version.org.slf4j>1.5.6</version.org.slf4j>
<version.org.springframework>2.5.6</version.org.springframework>
<version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
@@ -2379,18 +2404,6 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${version.org.springframework}</version>
Added: trunk/osgi/.project
===================================================================
--- trunk/osgi/.project (rev 0)
+++ trunk/osgi/.project 2010-04-01 16:10:13 UTC (rev 103447)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-osgi-integration-pom</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: trunk/osgi/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- trunk/osgi/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ trunk/osgi/.settings/org.maven.ide.eclipse.prefs 2010-04-01 16:10:13 UTC (rev 103447)
@@ -0,0 +1,9 @@
+#Wed Mar 31 17:53:20 CEST 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Property changes on: trunk/osgi/jar
___________________________________________________________________
Name: svn:ignore
+ target
Added: trunk/osgi/jar/.classpath
===================================================================
--- trunk/osgi/jar/.classpath (rev 0)
+++ trunk/osgi/jar/.classpath 2010-04-01 16:10:13 UTC (rev 103447)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: trunk/osgi/jar/.project
===================================================================
--- trunk/osgi/jar/.project (rev 0)
+++ trunk/osgi/jar/.project 2010-04-01 16:10:13 UTC (rev 103447)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-as-osgi-integration</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: trunk/osgi/jar/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/osgi/jar/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/osgi/jar/.settings/org.eclipse.jdt.core.prefs 2010-04-01 16:10:13 UTC (rev 103447)
@@ -0,0 +1,6 @@
+#Wed Mar 31 17:53:21 CEST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
Added: trunk/osgi/jar/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- trunk/osgi/jar/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ trunk/osgi/jar/.settings/org.maven.ide.eclipse.prefs 2010-04-01 16:10:13 UTC (rev 103447)
@@ -0,0 +1,9 @@
+#Wed Mar 31 17:53:20 CEST 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Added: trunk/osgi/jar/pom.xml
===================================================================
--- trunk/osgi/jar/pom.xml (rev 0)
+++ trunk/osgi/jar/pom.xml 2010-04-01 16:10:13 UTC (rev 103447)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Application Server OSGi Integration</name>
+ <groupId>org.jboss.jbossas.osgi</groupId>
+ <artifactId>jboss-as-osgi-integration</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.jbossas.osgi</groupId>
+ <artifactId>jboss-as-osgi-pom</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <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.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.org.osgi}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <!-- Build -->
+ <build>
+ <plugins>
+ </plugins>
+ </build>
+
+
+</project>
+
Added: trunk/osgi/jar/src/main/java/org/jboss/osgi/integration/jbossas/TransactionServiceBean.java
===================================================================
--- trunk/osgi/jar/src/main/java/org/jboss/osgi/integration/jbossas/TransactionServiceBean.java (rev 0)
+++ trunk/osgi/jar/src/main/java/org/jboss/osgi/integration/jbossas/TransactionServiceBean.java 2010-04-01 16:10:13 UTC (rev 103447)
@@ -0,0 +1,76 @@
+/*
+ * 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 javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+
+/**
+ * JBossAS intergration of the TransactionManager and UserTransaction service.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 31-Oct-2009
+ */
+public class TransactionServiceBean
+{
+ private BundleContext context;
+ private TransactionManager transactionManager;
+ private UserTransaction userTransaction;
+
+ private ServiceRegistration txManagerRegistration;
+ private ServiceRegistration userTxRegistration;
+
+ public void setBundleContext(BundleContext bundleContext)
+ {
+ this.context = bundleContext;
+ }
+
+ public void setTransactionManager(TransactionManager transactionManager)
+ {
+ this.transactionManager = transactionManager;
+ }
+
+ public void setUserTransaction(UserTransaction userTransaction)
+ {
+ this.userTransaction = userTransaction;
+ }
+
+ public void start() throws Exception
+ {
+ txManagerRegistration = context.registerService(TransactionManager.class.getName(), transactionManager, null);
+ userTxRegistration = context.registerService(UserTransaction.class.getName(), userTransaction, null);
+ }
+
+ void stop()
+ {
+ if (txManagerRegistration != null)
+ txManagerRegistration.unregister();
+
+ if (userTxRegistration != null)
+ userTxRegistration.unregister();
+ }
+}
\ No newline at end of file
Added: trunk/osgi/pom.xml
===================================================================
--- trunk/osgi/pom.xml (rev 0)
+++ trunk/osgi/pom.xml 2010-04-01 16:10:13 UTC (rev 103447)
@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-parent</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ </parent>
+
+ <name>JBoss Application Server OSGi</name>
+ <groupId>org.jboss.jbossas.osgi</groupId>
+ <artifactId>jboss-as-osgi-pom</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>jar</module>
+ <module>zip</module>
+ </modules>
+</project>
Property changes on: trunk/osgi/zip
___________________________________________________________________
Name: svn:ignore
+ target
Added: trunk/osgi/zip/.project
===================================================================
--- trunk/osgi/zip/.project (rev 0)
+++ trunk/osgi/zip/.project 2010-04-01 16:10:13 UTC (rev 103447)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-as-osgi-distribution</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: trunk/osgi/zip/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- trunk/osgi/zip/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ trunk/osgi/zip/.settings/org.maven.ide.eclipse.prefs 2010-04-01 16:10:13 UTC (rev 103447)
@@ -0,0 +1,9 @@
+#Wed Mar 31 19:04:31 CEST 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Added: trunk/osgi/zip/pom.xml
===================================================================
--- trunk/osgi/zip/pom.xml (rev 0)
+++ trunk/osgi/zip/pom.xml 2010-04-01 16:10:13 UTC (rev 103447)
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Application Server OSGi Distribution</name>
+ <groupId>org.jboss.jbossas.osgi</groupId>
+ <artifactId>jboss-as-osgi-distribution</artifactId>
+ <packaging>pom</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.jbossas.osgi</groupId>
+ <artifactId>jboss-as-osgi-pom</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossas.osgi</groupId>
+ <artifactId>jboss-as-osgi-integration</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.deployers</groupId>
+ <artifactId>jboss-osgi-deployers-vfs30</artifactId>
+ <version>${version.jboss.osgi.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-vfs30</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
+ </dependency>
+
+ <!-- Apache Aries -->
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx</artifactId>
+ <version>${version.apache.aries.jmx}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ <version>${version.apache.aries.util}</version>
+ </dependency>
+
+ <!-- Apache Felix -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <version>${version.apache.felix.log}</version>
+ </dependency>
+
+ <!-- Bundle Dependencies -->
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-apache-xerces</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ </exclusions>
+ <version>${version.jboss.osgi.apache.xerces}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-blueprint</artifactId>
+ <version>${version.jboss.osgi.blueprint}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common-core</artifactId>
+ <version>${version.jboss.osgi.common.core}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-husky</artifactId>
+ <version>${version.jboss.osgi.husky}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jaxb</artifactId>
+ <version>${version.jboss.osgi.jaxb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.jmx</groupId>
+ <artifactId>jboss-osgi-jmx</artifactId>
+ <version>${version.jboss.osgi.jmx}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi</artifactId>
+ <version>${version.jboss.osgi.jndi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jta</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ </exclusions>
+ <version>${version.jboss.osgi.jta}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-reflect</artifactId>
+ <version>${version.jboss.osgi.reflect}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-webapp</artifactId>
+ <version>${version.jboss.osgi.webapp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-webconsole</artifactId>
+ <version>${version.jboss.osgi.webconsole}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-xml-binding</artifactId>
+ <version>${version.jboss.osgi.xml.binding}</version>
+ </dependency>
+
+ <!-- OPS4J -->
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-jetty-bundle</artifactId>
+ <version>${version.ops4j.pax.web}</version>
+ </dependency>
+
+ <!-- OSGi -->
+ <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>
+ </dependencies>
+
+ <!-- Build -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Added: trunk/osgi/zip/src/assembly/assembly.xml
===================================================================
--- trunk/osgi/zip/src/assembly/assembly.xml (rev 0)
+++ trunk/osgi/zip/src/assembly/assembly.xml 2010-04-01 16:10:13 UTC (rev 103447)
@@ -0,0 +1,73 @@
+<assembly>
+ <id>all</id>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/resources</directory>
+ <includes>
+ <include>jboss-osgi-jboss-beans.xml</include>
+ </includes>
+ <outputDirectory>deployers/osgi.deployer/META-INF</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>src/resources</directory>
+ <includes>
+ <include>jta-service-jboss-beans.xml</include>
+ </includes>
+ <outputDirectory>deploy/osgi</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>*:jboss-as-osgi-integration:jar</include>
+ <include>*:jboss-osgi-deployers-vfs30:jar</include>
+ <include>*:jboss-osgi-deployment:jar</include>
+ <include>*:jboss-osgi-framework:jar</include>
+ <include>*:jboss-osgi-framework-core:jar</include>
+ <include>*:jboss-osgi-framework-metadata:jar</include>
+ <include>*:jboss-osgi-framework-vfs30:jar</include>
+ <include>*:jboss-osgi-spi:jar</include>
+ <include>*:jboss-osgi-vfs:jar</include>
+ <include>*:jboss-osgi-vfs30:jar</include>
+ <include>*:org.osgi.compendium:jar</include>
+ <include>*:org.osgi.core:jar</include>
+ <include>*:shrinkwrap-api:jar</include>
+ </includes>
+ <outputDirectory>deployers/osgi.deployer</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>false</unpack>
+ </dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>*:jboss-osgi-apache-xerces:jar</include>
+ <include>*:jboss-osgi-blueprint:jar</include>
+ <include>*:jboss-osgi-common:jar</include>
+ <include>*:jboss-osgi-common-core:jar</include>
+ <include>*:jboss-osgi-husky:jar</include>
+ <include>*:jboss-osgi-jaxb:jar</include>
+ <include>*:jboss-osgi-jmx:jar</include>
+ <include>*:jboss-osgi-jndi:jar</include>
+ <include>*:jboss-osgi-reflect:jar</include>
+ <include>*:jboss-osgi-webapp:jar</include>
+ <include>*:jboss-osgi-webconsole:jar</include>
+ <include>*:jboss-osgi-xml-binding:jar</include>
+ <include>*:org.apache.aries.jmx:jar</include>
+ <include>*:org.apache.aries.util:jar</include>
+ <include>*:org.apache.felix.log:jar</include>
+ <include>*:org.osgi.compendium:jar</include>
+ <include>*:pax-web-jetty-bundle:jar</include>
+ </includes>
+ <outputDirectory>deploy/osgi</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>false</unpack>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Added: trunk/osgi/zip/src/resources/jboss-osgi-jboss-beans.xml
===================================================================
--- trunk/osgi/zip/src/resources/jboss-osgi-jboss-beans.xml (rev 0)
+++ trunk/osgi/zip/src/resources/jboss-osgi-jboss-beans.xml 2010-04-01 16:10:13 UTC (rev 103447)
@@ -0,0 +1,229 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- $Id: $ -->
+
+ <!--
+ ********************************
+ * *
+ * OSGi Bundle Manager *
+ * *
+ ********************************
+ -->
+
+ <bean name="OSGiBundleManager" class="org.jboss.osgi.framework.bundle.OSGiBundleManager">
+ <constructor>
+ <parameter><inject bean="jboss.kernel:service=Kernel" /></parameter>
+ <parameter><inject bean="MainDeployer" /></parameter>
+ </constructor>
+ <property name="properties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>org.osgi.framework.storage</key><value>${jboss.server.data.dir}/osgi-store</value></entry>
+ <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
+ <entry><key>org.osgi.framework.system.packages.extra</key><value>
+
+ <!-- jnp naming -->
+ org.jnp.interfaces;version=5.0,
+
+ <!-- logging -->
+ org.apache.log4j;version=1.2,
+ org.jboss.logging;version=2.1,
+
+ <!-- jboss -->
+ org.jboss.beans.metadata.plugins;version=2.2,
+ org.jboss.beans.metadata.plugins.builder;version=2.2,
+ org.jboss.beans.metadata.spi;version=2.2,
+ org.jboss.beans.metadata.spi.builder;version=2.2,
+ org.jboss.dependency.spi;version=2.2,
+ org.jboss.kernel.spi.dependency;version=2.2,
+
+ <!-- jboss-osgi -->
+ org.jboss.osgi.spi;version=1.0,
+ org.jboss.osgi.spi.capability;version=1.0,
+ org.jboss.osgi.spi.framework;version=1.0,
+ org.jboss.osgi.spi.service;version=1.0,
+ org.jboss.osgi.spi.util;version=1.0,
+ org.jboss.osgi.testing;version=1.0,
+ org.jboss.osgi.vfs;version=1.0
+ </value></entry>
+ <!-- Husky socket connector properties -->
+ <entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry>
+ <entry><key>org.jboss.osgi.husky.runtime.connector.port</key><value>5401</value></entry>
+ <!-- HTTP Service Port -->
+ <entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
+ <!-- Config Admin Service -->
+ <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry>
+ <!-- JMX bundle properties -->
+ <entry><key>org.jboss.osgi.jmx.host</key><value>${jboss.bind.address}</value></entry>
+ <entry><key>org.jboss.osgi.jmx.port</key><value>1098</value></entry>
+ <!-- JNDI bundle properties -->
+ <entry><key>org.jboss.osgi.jndi.host</key><value>${jboss.bind.address}</value></entry>
+ <entry><key>org.jboss.osgi.jndi.rmi.port</key><value>1098</value></entry>
+ <entry><key>org.jboss.osgi.jndi.port</key><value>1099</value></entry>
+ <!-- JTA Object Store -->
+ <entry><key>com.arjuna.ats.arjuna.objectstore.objectStoreDir</key><value>${jboss.server.data.dir}/tx-object-store</value></entry>
+ </map>
+ </property>
+ <incallback method="addPlugin" />
+ <uncallback method="removePlugin" />
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * OSGi Manager Plugins *
+ * *
+ ********************************
+ -->
+
+ <!-- [JBOSGI-147] Autostart in JBossAS recycle the bundle
+ <bean name="OSGiAutoInstallPlugin" class="org.jboss.osgi.framework.plugins.internal.AutoInstallPluginImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ <property name="autoInstall">
+ <list elementClass="java.net.URL">
+ <value>${jboss.server.home.dir}/deploy/osgi/org.osgi.compendium.jar</value>
+ </list>
+ </property>
+ <property name="autoStart">
+ <list elementClass="java.net.URL">
+ <value>${jboss.server.home.dir}/deploy/osgi/org.apache.felix.log.jar</value>
+ <value>${jboss.server.home.dir}/deploy/osgi/jboss-osgi-common.jar</value>
+ </list>
+ </property>
+ </bean>
+ -->
+
+ <bean name="OSGiControllerContextPlugin" class="org.jboss.osgi.framework.bundle.ControllerContextPluginImpl">
+ <constructor>
+ <parameter><inject bean="OSGiBundleManager" /></parameter>
+ <parameter><inject bean="OSGiDeploymentRegistry" /></parameter>
+ </constructor>
+ </bean>
+ <bean name="OSGiBundleResolver" class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+ <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+ <bean name="OSGiServiceManager" class="org.jboss.osgi.framework.bundle.ServiceManagerPluginImpl">
+ <constructor>
+ <parameter><inject bean="OSGiBundleManager" /></parameter>
+ <parameter><inject bean="OSGiDeploymentRegistry" /></parameter>
+ </constructor>
+ <property name="enableMDRUsage">false</property>
+ </bean>
+ <bean name="OSGiStoragePlugin" class="org.jboss.osgi.framework.plugins.internal.BundleStoragePluginImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+ <bean name="OSGiSystemPackages" class="org.jboss.osgi.framework.plugins.internal.SystemPackagesPluginImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * OSGi Service Plugins *
+ * *
+ ********************************
+ -->
+
+ <bean name="MicrocontainerService" class="org.jboss.osgi.framework.service.internal.MicrocontainerServiceImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+ <bean name="StartLevelService" class="org.jboss.osgi.framework.service.internal.StartLevelImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+ <bean name="PackageAdminService" class="org.jboss.osgi.framework.packageadmin.PackageAdminImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+ <bean name="DeployerService" class="org.jboss.osgi.framework.service.internal.DeployerServiceImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+ <bean name="LifecycleInterceptorService" class="org.jboss.osgi.framework.service.internal.LifecycleInterceptorServiceImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * OSGi Interceptors *
+ * *
+ ********************************
+ -->
+
+ <bean name="WebXMLVerifier" class="org.jboss.osgi.framework.service.internal.WebXMLVerifierInterceptor">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * OSGi Deployment *
+ * *
+ ********************************
+ -->
+
+ <bean name="OSGiDeploymentRegistry" class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/>
+
+ <bean name="OSGiDeployersWrapper" class="org.jboss.osgi.framework.deployers.OSGiDeployersWrapper" >
+ <constructor>
+ <parameter><inject bean="MainDeployer"/></parameter>
+ <parameter><inject bean="OSGiBundleManager"/></parameter>
+ </constructor>
+ </bean>
+
+ <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleActivatorDeployer" />
+ <bean name="OSGiBundleStateCreateDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateCreateDeployer">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+ <bean name="OSGiBundleStateInstallDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateInstallDeployer"/>
+ <bean name="OSGiBundleStateResolveDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateResolveDeployer"/>
+ <bean name="OSGiBundleStructure" class="org.jboss.osgi.deployer.BundleStructureDeployer" />
+ <bean name="OSGiContextTrackerDeployer" class="org.jboss.osgi.framework.deployers.OSGiContextTrackerDeployer" />
+ <bean name="OSGiDeploymentMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiDeploymentMetaDataDeployer" />
+ <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" />
+ <bean name="OSGiNativeCodeMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiNativeCodeMetaDataDeployer" />
+
+ <!--
+ ********************************
+ * *
+ * OSGi Classloading *
+ * *
+ ********************************
+ -->
+
+ <bean name="OSGiClassLoading" class="org.jboss.osgi.framework.classloading.OSGiClassLoading"/>
+ <bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderSystem" />
+ <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderDomain" >
+ <constructor><parameter>OSGiClassLoaderDomain</parameter></constructor>
+ <property name="classLoaderSystem"><inject bean="OSGiClassLoaderSystem"/></property>
+ <property name="bundleManager"><inject bean="OSGiBundleManager" /></property>
+ </bean>
+ <bean name="OSGiClassLoaderFactory" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderFactory" >
+ <property name="system"><inject bean="OSGiClassLoaderSystem"/></property>
+ </bean>
+ <bean name="OSGiClassLoadingDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleClassLoadingDeployer">
+ <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>
+ <property name="factory"><inject bean="OSGiClassLoaderFactory"/></property>
+ </bean>
+ <bean name="OSGiFragmentClassLoadingDeployer" class="org.jboss.osgi.framework.deployers.OSGiFragmentClassLoadingDeployer">
+ <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>
+ <property name="factory"><inject bean="OSGiClassLoaderFactory"/></property>
+ </bean>
+ <bean name="OSGiFragmentAttachmentDeployer" class="org.jboss.osgi.framework.deployers.OSGiFragmentAttachmentDeployer"/>
+ <bean name="OSGiModuleDeployer" class="org.jboss.osgi.framework.deployers.OSGiModuleDeployerTempWorkaround">
+ <property name="classLoading"><inject bean="OSGiClassLoading" /></property>
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * Framework *
+ * *
+ ********************************
+ -->
+
+ <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.framework.launch.OSGiFramework">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+
+</deployment>
\ No newline at end of file
Added: trunk/osgi/zip/src/resources/jta-service-jboss-beans.xml
===================================================================
--- trunk/osgi/zip/src/resources/jta-service-jboss-beans.xml (rev 0)
+++ trunk/osgi/zip/src/resources/jta-service-jboss-beans.xml 2010-04-01 16:10:13 UTC (rev 103447)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ $Id$
+-->
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!--
+ A bean that registers
+
+ javax.transaction.TransactionManager
+ javax.transaction.UserTransaction
+
+ as OSGi services. Please see the OSGi Enterprise JTA spec for details.
+ -->
+ <bean name="jboss.osgi:service=Transaction" class="org.jboss.osgi.integration.jbossas.TransactionServiceBean">
+ <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
+ <property name="transactionManager"><inject bean="RealTransactionManager"/></property>
+ <property name="userTransaction"><inject bean="DefaultUserTransactionprovider"/></property>
+ </bean>
+
+</deployment>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-04-01 15:28:43 UTC (rev 103446)
+++ trunk/pom.xml 2010-04-01 16:10:13 UTC (rev 103447)
@@ -548,28 +548,30 @@
</property>
</activation>
<modules>
+ <module>aspects</module>
+ <module>cluster</module>
<module>component-matrix</module>
- <module>main</module>
- <module>system</module>
- <module>system-jmx</module>
- <module>security</module>
- <module>server</module>
+ <module>connector</module>
+ <module>console</module>
<module>deployment</module>
- <module>jbossas-remoting</module>
+ <module>ejb3</module>
+ <module>hibernate-int</module>
<module>hornetq-int</module>
- <module>cluster</module>
- <module>varia</module>
<module>iiop</module>
- <module>aspects</module>
+ <module>jbossas-remoting</module>
+ <module>main</module>
+ <module>management</module>
+ <module>osgi</module>
<module>profileservice</module>
- <module>connector</module>
- <module>management</module>
- <module>ejb3</module>
+ <module>resteasy-int</module>
+ <module>security</module>
+ <module>server</module>
+ <module>system-jmx</module>
+ <module>system</module>
<module>tomcat</module>
+ <module>varia</module>
<module>webservices</module>
- <module>resteasy-int</module>
- <module>hibernate-int</module>
- <module>console</module>
+ <!-- distro modules -->
<module>client</module>
<module>build</module>
<module>testsuite</module>
Modified: trunk/resteasy-int/pom.xml
===================================================================
--- trunk/resteasy-int/pom.xml 2010-04-01 15:28:43 UTC (rev 103446)
+++ trunk/resteasy-int/pom.xml 2010-04-01 16:10:13 UTC (rev 103447)
@@ -5,7 +5,7 @@
<artifactId>jboss-as-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>
- <name>RESTEasy JBoss AS Integration</name>
+ <name>JBoss Application Server Resteasy Integration</name>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
Modified: trunk/resteasy-int/zip/pom.xml
===================================================================
--- trunk/resteasy-int/zip/pom.xml 2010-04-01 15:28:43 UTC (rev 103446)
+++ trunk/resteasy-int/zip/pom.xml 2010-04-01 16:10:13 UTC (rev 103447)
@@ -9,7 +9,7 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>resteasy-int-dist</artifactId>
<packaging>pom</packaging>
- <name>RESTEasy JBoss AS Integration Distribution</name>
+ <name>JBoss Application Server Resteasy Distribution</name>
<dependencies>
More information about the jboss-cvs-commits
mailing list