Index: installer/.classpath
===================================================================
--- installer/.classpath	(revision 87473)
+++ installer/.classpath	(working copy)
@@ -1,7 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-  <classpathentry kind="output" path="eclipse-target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="eclipse-target/classes"/>
+</classpath>
Index: installer/src/main/java/org/jboss/ejb3/installer/Installer.java
===================================================================
--- installer/src/main/java/org/jboss/ejb3/installer/Installer.java	(revision 87473)
+++ installer/src/main/java/org/jboss/ejb3/installer/Installer.java	(working copy)
@@ -104,6 +104,11 @@
     * Location of the Configuration
     */
    private static final String FILENAME_CONF_DIRECTORY = "conf";
+   
+   /*
+    * Location of the Deployables
+    */
+   private static final String FILENAME_DEPLOY_DIRECTORY = "deploy";
 
    /*
     * Location of jbossall-client relative to JBOSS_HOME
@@ -236,6 +241,13 @@
          // Copy to the installer temp directory
          this.copyFileFromJarToDirectory(this.getInstallerJarFile(), conf, this.getInstallationDirectory());
       }
+      
+      // For each deployable file
+      for (JarEntry deployable : this.getAllDeployableFiles())
+      {
+         // Copy to the installer temp directory
+         this.copyFileFromJarToDirectory(this.getInstallerJarFile(), deployable, this.getInstallationDirectory());
+      }
 
       for (JarEntry pkg : getAllJarEntriesInDirectory("packages"))
       {
@@ -456,6 +468,14 @@
    {
       return this.getAllJarEntriesInDirectory(Installer.FILENAME_CONF_DIRECTORY);
    }
+   
+   /**
+    * Returns all deployable files as references
+    */
+   private List<JarEntry> getAllDeployableFiles()
+   {
+      return this.getAllJarEntriesInDirectory(Installer.FILENAME_DEPLOY_DIRECTORY);
+   }
 
    /**
     * Returns all references in the specified directory
Index: installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-commonlib.txt
===================================================================
--- installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-commonlib.txt	(revision 87473)
+++ installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-commonlib.txt	(working copy)
@@ -2,6 +2,7 @@
 jboss-ejb3-common.jar
 jboss-ejb3-core.jar
 jboss-ejb3-deployers.jar
+jboss-ejb3-endpoint.jar
 jboss-ejb3-ext-api.jar
 jboss-ejb3-ext-api-impl.jar
 jboss-ejb3-interceptors.jar
Index: installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-deploy-unclustered.txt
===================================================================
--- installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-deploy-unclustered.txt	(revision 87473)
+++ installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-deploy-unclustered.txt	(working copy)
@@ -1,3 +1,4 @@
 ejb3-connectors-service.xml
 ejb3-container-jboss-beans.xml
-ejb3-interceptors-aop.xml
\ No newline at end of file
+ejb3-interceptors-aop.xml
+jboss-ejb3-endpoint-deployer.jar
\ No newline at end of file
Index: as-int/pom.xml
===================================================================
--- as-int/pom.xml	(revision 87473)
+++ as-int/pom.xml	(working copy)
@@ -29,7 +29,9 @@
     into the AS
     
      -->
-    <version.org.jboss.ejb3_jboss.ejb3>1.1.4</version.org.jboss.ejb3_jboss.ejb3>
+    <version.org.jboss.ejb3_jboss.ejb3>1.1.5-SNAPSHOT</version.org.jboss.ejb3_jboss.ejb3>
+    <version.org.jboss.ejb3_jboss.ejb3.endpoint>0.1.0-SNAPSHOT</version.org.jboss.ejb3_jboss.ejb3.endpoint>
+    <version.org.jboss.ejb3_jboss.ejb3.endpoint.deployer>0.1.0-SNAPSHOT</version.org.jboss.ejb3_jboss.ejb3.endpoint.deployer>
     <version.org.jboss.ejb3_mc.int>1.0.1</version.org.jboss.ejb3_mc.int>
   
   </properties>
@@ -57,6 +59,20 @@
       <artifactId>jboss-ejb3-mc-int</artifactId>
       <version>${version.org.jboss.ejb3_mc.int}</version>
     </dependency>
+  
+    <!-- jboss-ejb3-endpoint -->
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-endpoint</artifactId>
+      <version>${version.org.jboss.ejb3_jboss.ejb3.endpoint}</version>
+    </dependency>
+    
+    <!-- jboss-ejb3-endpoint-deployer -->
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-endpoint-deployer</artifactId>
+      <version>${version.org.jboss.ejb3_jboss.ejb3.endpoint.deployer}</version>
+    </dependency>
 
     <!-- All other dependencies -->
   
Index: ejb3/pom.xml
===================================================================
--- ejb3/pom.xml	(revision 87473)
+++ ejb3/pom.xml	(working copy)
@@ -34,7 +34,7 @@
     into the AS
     
      -->
-    <version.org.jboss.ejb3_core>1.1.4</version.org.jboss.ejb3_core>
+    <version.org.jboss.ejb3_core>1.1.5-SNAPSHOT</version.org.jboss.ejb3_core>
     <version.org.jboss.ejb3_deployers>1.0.0</version.org.jboss.ejb3_deployers>
   
   </properties>
@@ -54,7 +54,7 @@
       <artifactId>jboss-ejb3-core</artifactId>
       <version>${version.org.jboss.ejb3_core}</version>
     </dependency>
-      
+   
     <!-- jboss-ejb3-deployers -->
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
Index: plugin/src/main/resources/installer.xml
===================================================================
--- plugin/src/main/resources/installer.xml	(revision 87473)
+++ plugin/src/main/resources/installer.xml	(working copy)
@@ -37,6 +37,7 @@
         <include>org.jboss.ejb3:jboss-ejb3-common:jar</include>
         <include>org.jboss.ejb3:jboss-ejb3-core:jar</include>
         <include>org.jboss.ejb3:jboss-ejb3-deployers:jar</include>
+        <include>org.jboss.ejb3:jboss-ejb3-endpoint:jar</include>
         <include>org.jboss.ejb3:jboss-ejb3-ext-api:jar</include>
         <include>org.jboss.ejb3:jboss-ejb3-ext-api-impl:jar</include>
         <include>org.jboss.ejb3:jboss-ejb3-interceptors:jar</include>
@@ -53,6 +54,13 @@
       <outputDirectory>lib</outputDirectory>
     </dependencySet>
     <dependencySet>
+      <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+      <includes>
+        <include>org.jboss.ejb3:jboss-ejb3-endpoint-deployer:jar</include>
+      </includes>
+      <outputDirectory>deploy</outputDirectory>
+    </dependencySet>
+    <dependencySet>
       <outputFileNameMapping>${artifactId}-${classifier}.${extension}</outputFileNameMapping>
       <includes>
         <include>org.jboss.ejb3:jboss-ejb3-common:jar:client</include>
Index: plugin/pom.xml
===================================================================
--- plugin/pom.xml	(revision 87473)
+++ plugin/pom.xml	(working copy)
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-installer</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4-SNAPSHOT</version>
       <optional>true</optional>
     </dependency>
 
@@ -63,14 +63,8 @@
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-as-int</artifactId>
-      <version>1.1.4</version>
+      <version>1.1.5-SNAPSHOT</version>
       <optional>true</optional>
-      <exclusions>
-      	<exclusion>
-	  <groupId>org.jboss.ejb3</groupId>
-	  <artifactId>jboss-ejb3-proxy</artifactId>
-	</exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>
@@ -85,7 +79,7 @@
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-core</artifactId>
       <classifier>client</classifier>
-      <version>1.1.4</version>
+      <version>1.1.5-SNAPSHOT</version>
       <optional>true</optional>
     </dependency>