Index: ejb3/.classpath
===================================================================
--- ejb3/.classpath	(revision 83839)
+++ ejb3/.classpath	(working copy)
@@ -24,5 +24,6 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-transactions/lib/jboss-ejb3-transactions.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-transactions/lib/jboss-ejb3-transactions-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-common/lib/jboss-ejb3-common.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-proxy/lib/jboss-ejb3-proxy.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-timerservice-spi/lib/jboss-ejb3-timerservice-spi.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-timerservice-spi/lib/jboss-ejb3-timerservice-spi-sources.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>
Index: ejb3/src/main/org/jboss/as/ejb3/timerservice/TimedObjectInvokerBridge.java
===================================================================
--- ejb3/src/main/org/jboss/as/ejb3/timerservice/TimedObjectInvokerBridge.java	(revision 0)
+++ ejb3/src/main/org/jboss/as/ejb3/timerservice/TimedObjectInvokerBridge.java	(working copy)
@@ -19,7 +19,7 @@
  * 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.ejb3.timerservice.as5;
+package org.jboss.as.ejb3.timerservice;
 
 import javax.ejb.Timer;
 
Index: ejb3/src/main/org/jboss/as/ejb3/timerservice/TimerServiceFacade.java
===================================================================
--- ejb3/src/main/org/jboss/as/ejb3/timerservice/TimerServiceFacade.java	(revision 0)
+++ ejb3/src/main/org/jboss/as/ejb3/timerservice/TimerServiceFacade.java	(working copy)
@@ -19,7 +19,7 @@
  * 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.ejb3.timerservice.as5;
+package org.jboss.as.ejb3.timerservice;
 
 import static org.jboss.ejb.AllowedOperationsFlags.IN_BUSINESS_METHOD;
 import static org.jboss.ejb.AllowedOperationsFlags.IN_EJB_TIMEOUT;
Index: ejb3/src/main/org/jboss/as/ejb3/timerservice/JBossTimerServiceFactory.java
===================================================================
--- ejb3/src/main/org/jboss/as/ejb3/timerservice/JBossTimerServiceFactory.java	(revision 0)
+++ ejb3/src/main/org/jboss/as/ejb3/timerservice/JBossTimerServiceFactory.java	(working copy)
@@ -19,7 +19,7 @@
  * 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.ejb3.timerservice.as5;
+package org.jboss.as.ejb3.timerservice;
 
 import javax.ejb.TimerService;
 import javax.management.ObjectName;
Index: ejb3/src/resources/ejb3-timerservice-jboss-beans.xml
===================================================================
--- ejb3/src/resources/ejb3-timerservice-jboss-beans.xml	(revision 83578)
+++ ejb3/src/resources/ejb3-timerservice-jboss-beans.xml	(working copy)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
-   <bean name="JBossTimerServiceFactory" class="org.jboss.ejb3.timerservice.as5.JBossTimerServiceFactory">
+   <bean name="JBossTimerServiceFactory" class="org.jboss.as.ejb3.timerservice.JBossTimerServiceFactory">
       <depends>jboss.ejb:service=EJBTimerService</depends>
    </bean>
 </deployment>
\ No newline at end of file
Index: ejb3/build.xml
===================================================================
--- ejb3/build.xml	(revision 83839)
+++ ejb3/build.xml	(working copy)
@@ -121,6 +121,7 @@
          <path refid="jboss.jboss.ejb3.interceptors.classpath" />
          <path refid="jboss.jboss.ejb3.metadata.classpath" />
          <path refid="jboss.jboss.ejb3.proxy.classpath" />
+         <path refid="jboss.jboss.ejb3.timerservice.spi.classpath" />
          <path refid="jboss.jboss.jpa.deployers.classpath"/>
          <path refid="jboss.jboss.mdr.classpath"/>
          <path refid="jboss.jboss.reflect.classpath" />
@@ -164,6 +165,7 @@
       <property name="source.java" value="${module.source}/main"/>
       <property name="source.etc" value="${module.source}/etc"/>
       <property name="resources" value="${module.source}/resources"/>
+      <property name="source.resources" value="${module.source}/resources"/>
 
       <!-- Where build generated files will go -->
       <property name="build.reports" value="${module.output}/reports"/>
@@ -171,6 +173,7 @@
       <property name="build.lib" value="${module.output}/lib"/>
       <property name="build.api" value="${module.output}/api"/>
       <property name="build.etc" value="${module.output}/etc"/>
+      <property name="build.resources" value="${module.output}/resources"/>
 
       <!-- Install/Release structure -->
       <property name="install.id" value="${module.name}-${module.version}"/>
@@ -236,7 +239,7 @@
 
    <target name="compile"
       description="Compile all source files."
-      depends="compile-etc, compile-classes"/>
+      depends="compile-etc, compile-classes, compile-resources"/>
 
    <!-- Compile all class files -->
    <target name="compile-classes" depends="init">
@@ -259,6 +262,16 @@
       </javac>
    </target>
 
+   <!-- Compile resource files -->
+   <target name="compile-resources" depends="init">
+     <mkdir dir="${build.resources}"/>
+     <copy todir="${build.resources}" filtering="yes">
+       <fileset dir="${source.resources}">
+         <include name="**/*"/>
+       </fileset>
+     </copy>
+   </target>
+
    <!-- Compile manifests -->
    <target name="compile-etc" depends="init">
       <mkdir dir="${build.etc}"/>
@@ -344,7 +357,6 @@
       <copy todir="${build.lib}">
          <fileset dir="output/resources">
             <include name="ejb3-container-jboss-beans.xml"/>
-            <include name="ejb3-timer-service.xml"/>
             <include name="ejb3-connectors-jboss-beans.xml"/>
             <include name="ejb3-interceptors-aop.xml"/>
          </fileset>
Index: thirdparty/pom.xml
===================================================================
--- thirdparty/pom.xml	(revision 83839)
+++ thirdparty/pom.xml	(working copy)
@@ -580,6 +580,13 @@
             </dependency>
             <dependency>
               <groupId>org.jboss.ejb3</groupId>
+              <artifactId>jboss-ejb3-timerservice-spi</artifactId>
+              <mapping>
+                <componentId>jboss.jboss-ejb3-timerservice-spi</componentId>
+              </mapping>
+            </dependency>
+            <dependency>
+              <groupId>org.jboss.ejb3</groupId>
               <artifactId>jboss-ejb3-transactions</artifactId>
               <mapping>
                 <componentId>jboss.jboss-ejb3-transactions</componentId>
Index: component-matrix/pom.xml
===================================================================
--- component-matrix/pom.xml	(revision 83839)
+++ component-matrix/pom.xml	(working copy)
@@ -51,9 +51,9 @@
     <version.org.jboss.aspects.security>1.0.0.GA</version.org.jboss.aspects.security>
     <version.org.jboss.aspects.transaction>1.0.0.GA</version.org.jboss.aspects.transaction>
     <version.org.jboss.common.core>2.2.10.GA</version.org.jboss.common.core>
-    <version.org.jboss.ejb3>1.0.0</version.org.jboss.ejb3>
+    <version.org.jboss.ejb3>1.1.0-SNAPSHOT</version.org.jboss.ejb3>
     <version.org.jboss.ejb3.common.client>1.0.0</version.org.jboss.ejb3.common.client>
-    <version.org.jboss.ejb3.core.client>1.0.0</version.org.jboss.ejb3.core.client>
+    <version.org.jboss.ejb3.core.client>1.1.0-SNAPSHOT</version.org.jboss.ejb3.core.client>
     <version.org.jboss.ejb3.proxy.client>1.0.0</version.org.jboss.ejb3.proxy.client>
     <version.org.jboss.ejb3.proxy.clustered.client>1.0.0</version.org.jboss.ejb3.proxy.clustered.client>
     <version.org.jboss.ejb3.security.client>1.0.0</version.org.jboss.ejb3.security.client>
Index: build/build-distr.xml
===================================================================
--- build/build-distr.xml	(revision 83839)
+++ build/build-distr.xml	(working copy)
@@ -138,17 +138,11 @@
     <property name="_module.name" value="ejb3" override="true"/>
     <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
 
-    <mkdir dir="${install.examples.ejb3}"/>
-    <copy todir="${install.examples.ejb3}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="ejb3-timer-service.xml"/>
-      </fileset>
-    </copy>
-    
     <copy todir="${install.server}/all/deploy" filtering="no">
-      <fileset dir="${_module.output}/lib">
+      <fileset dir="${_module.output}/resources">
         <include name="ejb3-container-jboss-beans.xml"/>
         <include name="ejb3-interceptors-aop.xml"/>
+        <include name="ejb3-timerservice-jboss-beans.xml"/>
       	<include name="ejb3-connectors-jboss-beans.xml"/>
       </fileset>
     </copy>
@@ -185,6 +179,8 @@
                excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
       <fileset dir="${jboss.jboss.ejb3.security.lib}" includes="*.jar"
                excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
+      <fileset dir="${jboss.jboss.ejb3.timerservice.spi.lib}" includes="*.jar"
+               excludes="*-sources.jar, *-javadoc.jar"/>
       <fileset dir="${jboss.jboss.ejb3.transactions.lib}" includes="*.jar"
                excludes="*-sources.jar, *-javadoc.jar"/>
       <fileset dir="${hibernate.commons.annotations.lib}" includes="*.jar"
Index: build/build.xml
===================================================================
--- build/build.xml	(revision 83839)
+++ build/build.xml	(working copy)
@@ -230,7 +230,6 @@
     <property name="install.jmx-api" value="${install.docs}/jmx-api"/>
     <property name="install.todo" value="${install.docs}/todo"/>
     <property name="install.examples" value="${install.docs}/examples"/>
-    <property name="install.examples.ejb3" value="${install.docs}/examples/ejb3"/>
     <property name="install.examples.jca" value="${install.docs}/examples/jca"/>
     <property name="install.examples.jms" value="${install.docs}/examples/jms"/>
     <property name="install.examples.jbossweb" value="${install.examples}/jbossweb"/>