diff --git a/jboss/.classpath b/jboss/.classpath
index 58fbfeb7d5..c0559fe568 100644
--- a/jboss/.classpath
+++ b/jboss/.classpath
@@ -1,12 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="lib" path="client/jboss-client.jar"/>
-	<classpathentry exported="true" kind="lib" path="client/jboss-common-client.jar"/>
-	<classpathentry exported="true" kind="lib" path="client/jboss-j2ee.jar"/>
-	<classpathentry exported="true" kind="lib" path="client/jbosssx-client.jar"/>
-	<classpathentry exported="true" kind="lib" path="client/jboss-transaction-client.jar"/>
-	<classpathentry exported="true" kind="lib" path="client/jnp-client.jar"/>
-	<classpathentry exported="true" kind="lib" path="client/jmx-invoker-adaptor-client.jar"/>
-	<classpathentry kind="output" path="lib"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="lib" path="client/jbossall-client.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry exported="true" kind="lib" path="client/jboss-client.jar"/>
+	<classpathentry exported="true" kind="lib" path="client/jboss-common-client.jar"/>
+	<classpathentry exported="true" kind="lib" path="client/jboss-j2ee.jar"/>
+	<classpathentry exported="true" kind="lib" path="client/jbosssx-client.jar"/>
+	<classpathentry exported="true" kind="lib" path="client/jboss-transaction-client.jar"/>
+	<classpathentry exported="true" kind="lib" path="client/jnp-client.jar"/>
+	<classpathentry exported="true" kind="lib" path="client/jmx-invoker-adaptor-client.jar"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="lib"/>
+</classpath>
diff --git a/jboss/.project b/jboss/.project
index d538ec80ef..ac83f0cff5 100644
--- a/jboss/.project
+++ b/jboss/.project
@@ -1,17 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>jboss</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>jboss</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/jboss/META-INF/MANIFEST.MF b/jboss/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..7af0dba21b
--- /dev/null
+++ b/jboss/META-INF/MANIFEST.MF
@@ -0,0 +1,114 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: jboss
+Bundle-SymbolicName: org.adempiere.jboss
+Bundle-Version: 0.0.0.1
+Bundle-ClassPath: client/jboss-client.jar,
+ client/jboss-common-client.jar,
+ client/jboss-j2ee.jar,
+ client/jbosssx-client.jar,
+ client/jboss-transaction-client.jar,
+ client/jnp-client.jar,
+ client/jmx-invoker-adaptor-client.jar,
+ client/jbossall-client.jar
+Export-Package: EDU.oswego.cs.dl.util.concurrent,
+ EDU.oswego.cs.dl.util.concurrent.misc,
+ javax.ejb,
+ javax.ejb.spi,
+ javax.enterprise.deploy.model,
+ javax.enterprise.deploy.model.exceptions,
+ javax.enterprise.deploy.shared,
+ javax.enterprise.deploy.shared.factories,
+ javax.enterprise.deploy.spi,
+ javax.enterprise.deploy.spi.exceptions,
+ javax.enterprise.deploy.spi.factories,
+ javax.enterprise.deploy.spi.status,
+ javax.jms,
+ javax.management,
+ javax.management.loading,
+ javax.management.modelmbean,
+ javax.management.monitor,
+ javax.management.openmbean,
+ javax.management.relation,
+ javax.management.timer,
+ javax.resource,
+ javax.resource.cci,
+ javax.resource.spi,
+ javax.resource.spi.endpoint,
+ javax.resource.spi.security,
+ javax.resource.spi.work,
+ javax.security.jacc,
+ javax.sql,
+ javax.transaction,
+ javax.transaction.xa,
+ javax.xml.registry,
+ javax.xml.registry.infomodel,
+ org.apache.xerces.impl.xs,
+ org.jboss.corba,
+ org.jboss.crypto,
+ org.jboss.crypto.digest,
+ org.jboss.ejb,
+ org.jboss.ejb.plugins.cmp.jdbc,
+ org.jboss.ejb.plugins.keygenerator,
+ org.jboss.invocation,
+ org.jboss.invocation.http.interfaces,
+ org.jboss.invocation.jrmp.interfaces,
+ org.jboss.invocation.jrmp.server,
+ org.jboss.invocation.pooled.interfaces,
+ org.jboss.invocation.unified.interfaces,
+ org.jboss.invocation.unified.marshall,
+ org.jboss.jmx.adaptor.rmi,
+ org.jboss.jmx.connector.invoker.client,
+ org.jboss.logging,
+ org.jboss.logging.appender,
+ org.jboss.logging.filter,
+ org.jboss.logging.layout,
+ org.jboss.logging.util,
+ org.jboss.monitor.client,
+ org.jboss.naming,
+ org.jboss.naming.client.java,
+ org.jboss.naming.interceptors,
+ org.jboss.net.protocol,
+ org.jboss.net.protocol.file,
+ org.jboss.net.protocol.http,
+ org.jboss.net.protocol.njar,
+ org.jboss.net.protocol.resource,
+ org.jboss.net.sockets,
+ org.jboss.net.ssl,
+ org.jboss.proxy,
+ org.jboss.proxy.compiler,
+ org.jboss.proxy.ejb,
+ org.jboss.proxy.ejb.handle,
+ org.jboss.security,
+ org.jboss.security.auth.callback,
+ org.jboss.security.auth.login,
+ org.jboss.security.jndi,
+ org.jboss.security.plugins,
+ org.jboss.security.ssl,
+ org.jboss.tm,
+ org.jboss.tm.integrity,
+ org.jboss.tm.usertx.client,
+ org.jboss.tm.usertx.interfaces,
+ org.jboss.tm.usertx.server,
+ org.jboss.util,
+ org.jboss.util.coerce,
+ org.jboss.util.collection,
+ org.jboss.util.deadlock,
+ org.jboss.util.file,
+ org.jboss.util.id,
+ org.jboss.util.loading,
+ org.jboss.util.naming,
+ org.jboss.util.platform,
+ org.jboss.util.property,
+ org.jboss.util.property.jmx,
+ org.jboss.util.propertyeditor,
+ org.jboss.util.state,
+ org.jboss.util.state.xml,
+ org.jboss.util.stream,
+ org.jboss.util.threadpool,
+ org.jboss.util.timeout,
+ org.jboss.util.xml,
+ org.jnp.interfaces,
+ org.jnp.interfaces.java,
+ org.jnp.interfaces.jnp,
+ org.jnp.server
diff --git a/jboss/build.properties b/jboss/build.properties
new file mode 100644
index 0000000000..94b04f62d7
--- /dev/null
+++ b/jboss/build.properties
@@ -0,0 +1,9 @@
+bin.includes = META-INF/,\
+               client/jboss-client.jar,\
+               client/jboss-common-client.jar,\
+               client/jboss-j2ee.jar,\
+               client/jbosssx-client.jar,\
+               client/jboss-transaction-client.jar,\
+               client/jnp-client.jar,\
+               client/jmx-invoker-adaptor-client.jar,\
+               client/jbossall-client.jar
diff --git a/jboss/build.xml b/jboss/build.xml
new file mode 100644
index 0000000000..9def206026
--- /dev/null
+++ b/jboss/build.xml
@@ -0,0 +1,22 @@
+<!-- ============================================= -->
+<!-- JBoss                                         -->
+<!-- ============================================= -->
+
+<project name="jboss" default="plugin" basedir="."
+    xmlns:ant4eclipse="antlib:org.ant4eclipse">
+
+	<description>
+  	</description>
+
+	<property name="dist.dir" value="../lib" />
+	
+	<import file="../utils_dev/properties.xml" />
+		
+	<target name="plugin">
+		<buildPlugin workspaceDirectory=".."
+		             projectName="jboss"
+		             targetPlatformId="target.platform"
+		             destination="${dist.dir}"
+		 			 buildSourceJar="false" />
+	</target>		
+</project>
diff --git a/jbossfacet/.classpath b/jbossfacet/.classpath
index b7d5653ef7..751c8f2e50 100644
--- a/jbossfacet/.classpath
+++ b/jbossfacet/.classpath
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/base"/>
-	<classpathentry kind="src" path="/jboss"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/jbossfacet/.project b/jbossfacet/.project
index 69df8d58d9..1a5341a63f 100644
--- a/jbossfacet/.project
+++ b/jbossfacet/.project
@@ -1,17 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>jbossfacet</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>jbossfacet</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/jbossfacet/META-INF/MANIFEST.MF b/jbossfacet/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..c9667bd0aa
--- /dev/null
+++ b/jbossfacet/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: jbossfacet
+Bundle-SymbolicName: org.adempiere.jbossfacet;singleton:=true
+Bundle-Version: 0.0.0.1
+Export-Package: org.adempiere.as.jboss
+Require-Bundle: org.adempiere.jboss;bundle-version="0.0.0"
+Import-Package: org.adempiere.as,
+ org.compiere.util
+
diff --git a/jbossfacet/build.properties b/jbossfacet/build.properties
new file mode 100644
index 0000000000..cc91072ece
--- /dev/null
+++ b/jbossfacet/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml
diff --git a/jbossfacet/build.xml b/jbossfacet/build.xml
new file mode 100644
index 0000000000..99afc190bb
--- /dev/null
+++ b/jbossfacet/build.xml
@@ -0,0 +1,17 @@
+<!-- ============================================= -->
+<!-- JBoss                                         -->
+<!-- ============================================= -->
+
+<project name="jboss" default="plugin" basedir="." xmlns:ant4eclipse="antlib:org.ant4eclipse">
+
+	<description>
+	</description>
+
+	<property name="dist.dir" value="../lib" />
+
+	<import file="../utils_dev/properties.xml" />
+
+	<target name="plugin">
+		<buildPlugin workspaceDirectory=".." projectName="jbossfacet" targetPlatformId="target.platform" destination="${dist.dir}" buildSourceJar="false" />
+	</target>
+</project>
diff --git a/jbossfacet/plugin.xml b/jbossfacet/plugin.xml
new file mode 100644
index 0000000000..b143c32bd0
--- /dev/null
+++ b/jbossfacet/plugin.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.adempiere.as.IApplicationServer">
+      <client
+            class="org.adempiere.as.jboss.JBoss">
+      </client>
+   </extension>
+
+</plugin>