You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2007/01/19 10:07:24 UTC
svn commit: r497747 - in /geronimo/server/trunk/modules:
geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/
geronimo-openejb/src/main/java/org/apache/geronimo/openejb/
geronimo-openejb/src/main/resources/META-INF/
Author: dain
Date: Fri Jan 19 01:07:23 2007
New Revision: 497747
URL: http://svn.apache.org/viewvc?view=rev&rev=497747
Log:
Fix some more ejb deployment issues
Modified:
geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
geronimo/server/trunk/modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml
Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?view=diff&rev=497747&r1=497746&r2=497747
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Fri Jan 19 01:07:23 2007
@@ -251,21 +251,27 @@
enterpriseBean.getEjbRef().clear();
for (EjbRef ref : enterpriseBean.getEjbRef()) {
ref.setMappedName(null);
+ ref.getInjectionTarget().clear();
}
for (EjbLocalRef ref : enterpriseBean.getEjbLocalRef()) {
ref.setMappedName(null);
+ ref.getInjectionTarget().clear();
}
for (MessageDestinationRef ref : enterpriseBean.getMessageDestinationRef()) {
ref.setMappedName(null);
+ ref.getInjectionTarget().clear();
}
for (PersistenceContextRef ref : enterpriseBean.getPersistenceContextRef()) {
ref.setMappedName(null);
+ ref.getInjectionTarget().clear();
}
for (PersistenceUnitRef ref : enterpriseBean.getPersistenceUnitRef()) {
ref.setMappedName(null);
+ ref.getInjectionTarget().clear();
}
for (ResourceRef ref : enterpriseBean.getResourceRef()) {
ref.setMappedName(null);
+ ref.getInjectionTarget().clear();
}
for (Iterator<ResourceEnvRef> iterator = enterpriseBean.getResourceEnvRef().iterator(); iterator.hasNext();) {
ResourceEnvRef ref = iterator.next();
@@ -276,10 +282,12 @@
} else {
ref.setMappedName(null);
}
+ ref.getInjectionTarget().clear();
}
for (ServiceRef ref : enterpriseBean.getServiceRef()) {
ref.setMappedName(null);
+ ref.getInjectionTarget().clear();
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java?view=diff&rev=497747&r1=497746&r2=497747
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java Fri Jan 19 01:07:23 2007
@@ -39,6 +39,7 @@
import org.apache.openejb.assembler.classic.EjbJarInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
+import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.dynamic.PassthroughFactory;
import org.apache.openejb.spi.ContainerSystem;
@@ -62,7 +63,6 @@
configurationFactory = new ConfigurationFactory(offline);
assembler = new Assembler();
-
// install transaction manager
transactionManager = getRawService(kernel, transactionManager);
TransactionServiceInfo transactionServiceInfo = new TransactionServiceInfo();
@@ -74,6 +74,10 @@
} finally {
PassthroughFactory.remove(transactionServiceInfo);
}
+
+ // install security service
+ SecurityServiceInfo securityServiceInfo = configurationFactory.configureService(SecurityServiceInfo.class);
+ assembler.createSecurityService(securityServiceInfo);
// install proxy factory
ProxyFactoryInfo proxyFactoryInfo = new ProxyFactoryInfo();
Modified: geronimo/server/trunk/modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml?view=diff&rev=497747&r1=497746&r2=497747
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml (original)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml Fri Jan 19 01:07:23 2007
@@ -31,6 +31,10 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
</dependency>
<dependency>