Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r807 - in trunk/forge/portal-extensions: forge-blog/src/java/org/jboss forge-service/src/java/org/jboss/forge/service jboss-as-binaries/to-copy/server/all/deploy jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer jboss-as-binaries/to-copy/server/all/lib
Author: adamw
Date: 2005-08-10 15:07:45 -0400 (Wed, 10 Aug 2005)
New Revision: 807
Removed:
trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/forge/
Modified:
trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java
trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-clustered-sfsbcache-service.xml
trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-entity-cache-service.xml
trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-interceptors-aop.xml
trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/jboss-service.xml
trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/persistence.properties
trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/ejb3-persistence.jar
trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-annotations.jar
trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-entitymanager.jar
trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate3.jar
trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3.jar
trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3x.jar
trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar
trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar
trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/lib/jboss-xb.jar
Log:
EJB3 RC1 in build
Modified: trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java
===================================================================
--- trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java 2005-08-10 18:38:02 UTC (rev 806)
+++ trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java 2005-08-10 19:07:45 UTC (rev 807)
@@ -128,7 +128,6 @@
public void create() throws Exception {
}
- // TODO
@EJB
private ForgeTimerLocal timer;
@@ -160,7 +159,6 @@
timerInterval = DEFAULT_TIMER_INTERVAL;
// And starting the timer.
- //TODO
timer.scheduleTimer(DEFAULT_TIMER_INTERVAL);
}
Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-clustered-sfsbcache-service.xml
===================================================================
--- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-clustered-sfsbcache-service.xml 2005-08-10 18:38:02 UTC (rev 806)
+++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-clustered-sfsbcache-service.xml 2005-08-10 19:07:45 UTC (rev 807)
@@ -27,7 +27,7 @@
being broken with multicast (even after disabling media sense)
set the loopback attribute to true
-->
- <UDP mcast_addr="228.1.2.3" mcast_port="45551" ip_ttl="64" ip_mcast="true"
+ <UDP mcast_addr="${jboss.partition.udpGroup:228.1.2.3}" mcast_port="45551" ip_ttl="64" ip_mcast="true"
mcast_send_buf_size="150000" mcast_recv_buf_size="80000" ucast_send_buf_size="150000"
ucast_recv_buf_size="80000" loopback="false"/>
<PING timeout="2000" num_initial_members="3" up_thread="false" down_thread="false"/>
Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-entity-cache-service.xml
===================================================================
--- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-entity-cache-service.xml 2005-08-10 18:38:02 UTC (rev 806)
+++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-entity-cache-service.xml 2005-08-10 19:07:45 UTC (rev 807)
@@ -39,7 +39,7 @@
being broken with multicast (even after disabling media sense)
set the loopback attribute to true
-->
- <UDP mcast_addr="228.1.2.3" mcast_port="43333" ip_ttl="2" ip_mcast="true"
+ <UDP mcast_addr="${jboss.partition.udpGroup:228.1.2.3}" mcast_port="43333" ip_ttl="2" ip_mcast="true"
mcast_send_buf_size="150000" mcast_recv_buf_size="80000" ucast_send_buf_size="150000"
ucast_recv_buf_size="80000" loopback="false" />
<PING timeout="2000" num_initial_members="3" up_thread="false" down_thread="false" />
Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-interceptors-aop.xml
===================================================================
--- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-interceptors-aop.xml 2005-08-10 18:38:02 UTC (rev 806)
+++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-interceptors-aop.xml 2005-08-10 19:07:45 UTC (rev 807)
@@ -7,38 +7,66 @@
<interceptor class="org.jboss.aspects.remoting.InvokeRemoteInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.aspects.security.SecurityClientInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.aspects.tx.ClientTxPropagationInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.aspects.remoting.IsLocalInterceptor" scope="PER_VM"/>
+ <interceptor class="org.jboss.ejb3.remoting.IsLocalInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.aspects.remoting.ClusterChooserInterceptor" scope="PER_VM"/>
-
<interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/>
- <stack name="AsynchronousSessionBeanClientInterceptors">
- <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/>
+ <stack name="ServiceClientInterceptors">
+ <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
<interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
<interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
<interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
</stack>
- <stack name="SessionBeanClientInterceptors">
- <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/>
+ <stack name="AsynchronousStatelessSessionClientInterceptors">
+ <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
<interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
<interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
<interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
</stack>
- <stack name="ClusteredSessionBeanClientInterceptors">
- <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/>
+ <stack name="AsynchronousStatefulSessionClientInterceptors">
+ <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
<interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
<interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+ </stack>
+
+ <stack name="StatelessSessionClientInterceptors">
+ <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+ </stack>
+
+ <stack name="StatefulSessionClientInterceptors">
+ <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+ </stack>
+
+ <stack name="ClusteredStatelessSessionClientInterceptors">
+ <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
<interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
<interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
</stack>
+ <stack name="ClusteredStatefulSessionClientInterceptors">
+ <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+ </stack>
+
<interceptor class="org.jboss.ejb3.asynchronous.AsynchronousInterceptor" scope="PER_CLASS"/>
<interceptor factory="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory" scope="PER_CLASS"/>
<interceptor factory="org.jboss.ejb3.security.AuthenticationInterceptorFactory" scope="PER_CLASS"/>
- <interceptor class="org.jboss.ejb3.security.RunAsSecurityInterceptor" scope="PER_VM"/>
+ <interceptor factory="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory" scope="PER_CLASS"/>
<interceptor class="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.ejb3.stateless.StatelessInstanceInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.ejb3.stateful.StatefulInstanceInterceptor" scope="PER_VM"/>
@@ -63,7 +91,7 @@
<interceptor-ref name="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory"/>
</bind>
<bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
<bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
@@ -88,7 +116,7 @@
</annotation>
</domain>
- <domain name="Stateful Bean">
+ <domain name="Base Stateful Bean">
<bind pointcut="execution(* *->*(..))">
<interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
@@ -97,7 +125,7 @@
<interceptor-ref name="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory"/>
</bind>
<bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
<bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
@@ -130,7 +158,9 @@
<annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
@org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
</annotation>
+ </domain>
+ <domain name="Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
<!-- NON Clustered cache configuration -->
<annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
@@ -151,9 +181,17 @@
</annotation>
</domain>
+ <domain name="Embedded Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
+ <!-- NON Clustered cache configuration -->
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache)">
+ @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.NoPassivationCache.class)
+ </annotation>
+
+ </domain>
+
<domain name="Message Driven Bean">
<bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
<bind pointcut="execution(* *->*(..))">
<interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
@@ -177,7 +215,7 @@
<interceptor-ref name="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory"/>
</bind>
<bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
<bind pointcut="execution(* *->@javax.persistence.FlushMode(..))">
<interceptor-ref name="org.jboss.ejb3.entity.BeforeTxFlushModeInterceptor"/>
Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/jboss-service.xml
===================================================================
--- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/jboss-service.xml 2005-08-10 18:38:02 UTC (rev 806)
+++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/jboss-service.xml 2005-08-10 19:07:45 UTC (rev 807)
@@ -1,153 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <mbean code="org.jboss.ejb3.EJB3Deployer" name="jboss.ejb3:service=EJB3Deployer"
- xmbean-dd="">
-
- <!-- Inline XMBean Descriptor BEGIN -->
- <xmbean>
- <description>The EJB3Deployer responsible for ejb3 deployment</description>
- <descriptors>
- <interceptors>
- <!-- <interceptor code="org.jboss.webservice.WebServiceInterceptor" webServiceDeployer="jboss.ws:service=WebServiceDeployerEJB3"/> -->
- </interceptors>
- </descriptors>
- <class>org.jboss.ejb3.EJB3Deployer</class>
-
- <!-- ServiceMBean attributes -->
- <attribute access="read-only" getMethod="getName">
- <description>The class name of the MBean</description>
- <name>Name</name>
- <type>java.lang.String</type>
- </attribute>
-
- <attribute access="read-only" getMethod="getState">
- <description>The status of the MBean</description>
- <name>State</name>
- <type>int</type>
- </attribute>
-
- <attribute access="read-only" getMethod="getStateString">
- <description>The status of the MBean in text form</description>
- <name>StateString</name>
- <type>java.lang.String</type>
- </attribute>
-
- <!-- SubDeployerMBean attributes -->
- <attribute access="read-only" getMethod="getServiceName">
- <description>The ObjectName of the Subdeployer</description>
- <name>ServiceName</name>
- <type>javax.management.ObjectName</type>
- </attribute>
-
- <attribute access="read-write" getMethod="getSuffixes" setMethod="setSuffixes">
- <description>The suffixes of interest to this deployer</description>
- <name>Suffixes</name>
- <type>[Ljava.lang.String;</type>
- </attribute>
-
- <attribute access="read-write" getMethod="getRelativeOrder" setMethod="setRelativeOrder">
- <description>The relative order of the suffixes in the global suffixes list</description>
- <name>RelativeOrder</name>
- <type>int</type>
- </attribute>
-
- <!-- EJB3DeployerMBean attributes -->
- <attribute access="read-only" getMethod="getDefaultProperties">
- <name>DefaultProperties</name>
- <type>java.util.Properties</type>
- </attribute>
-
- <!-- ServiceMBean operations -->
- <operation>
- <description>Standard MBean lifecycle method</description>
- <name>create</name>
- </operation>
-
- <operation>
- <description>The start lifecycle operation</description>
- <name>start</name>
- </operation>
-
- <operation>
- <description>The stop lifecycle operation</description>
- <name>stop</name>
- </operation>
-
- <operation>
- <description>The destroy lifecycle operation</description>
- <name>destroy</name>
- </operation>
-
- <operation>
- <description>The detyped lifecycle operation (for internal use only)</description>
- <name>jbossInternalLifecycle</name>
- <parameter>
- <description>The lifecycle operation</description>
- <name>method</name>
- <type>java.lang.String</type>
- </parameter>
- <return-type>void</return-type>
- </operation>
-
- <!-- SubDeployerMBean operations -->
- <operation>
- <description>Accept a module for deployment</description>
- <name>accepts</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- <return-type>boolean</return-type>
- </operation>
-
- <operation>
- <description>Initialize deployment step</description>
- <name>init</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Create deployment step</description>
- <name>create</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Start deployment step</description>
- <name>start</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Stop deployment step</description>
- <name>stop</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Destroy deployment step</description>
- <name>destroy</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
- </xmbean>
- <!-- Inline XMBean Descriptor END -->
-
+ <mbean code="org.jboss.ejb3.EJB3Deployer" name="jboss.ejb3:service=EJB3Deployer">
<depends>jboss.aop:service=AspectDeployer</depends>
</mbean>
Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/persistence.properties
===================================================================
--- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/persistence.properties 2005-08-10 18:38:02 UTC (rev 806)
+++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/persistence.properties 2005-08-10 19:07:45 UTC (rev 807)
@@ -11,4 +11,5 @@
#hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache
hibernate.connection.datasource=java:/DefaultDS
hibernate.dialect=org.hibernate.dialect.HSQLDialect
-javax.persistence.provider=org.hibernate.ejb.HibernatePersistence
+hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/ejb3-persistence.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-annotations.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-entitymanager.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate3.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3x.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/lib/jboss-xb.jar
===================================================================
(Binary files differ)
|
