Author: dain
Date: Thu Aug 14 11:04:55 2008
New Revision: 685980
URL: http://svn.apache.org/viewvc?rev=685980&view=rev
Log:
Fixed typo in LazyEjbReference
Added:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/DurationEditor.java
openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/Application.java
openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/EJB.java
openejb/trunk/openejb3/container/openejb-spring/src/test/java/org/apache/openejb/spring/Echo.java
openejb/trunk/openejb3/container/openejb-spring/src/test/java/org/apache/openejb/spring/EchoBean.java
openejb/trunk/openejb3/container/openejb-spring/src/test/resources/META-INF/
openejb/trunk/openejb3/container/openejb-spring/src/test/resources/META-INF/ejb-jar.xml
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java
openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/OpenEJB.java
openejb/trunk/openejb3/container/openejb-spring/src/test/java/org/apache/openejb/spring/SpringTest.java
openejb/trunk/openejb3/container/openejb-spring/src/test/resources/org/apache/openejb/spring/spring.xml
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=685980&r1=685979&r2=685980&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Thu Aug 14 11:04:55 2008
@@ -429,6 +429,10 @@
}
public void createApplication(AppInfo appInfo, ClassLoader classLoader)
throws OpenEJBException, IOException, NamingException {
+ createApplication(appInfo, classLoader, true);
+ }
+
+ public List<DeploymentInfo> createApplication(AppInfo appInfo, ClassLoader
classLoader, boolean start) throws OpenEJBException, IOException,
NamingException {
logger.info("createApplication.start", appInfo.jarPath);
@@ -560,13 +564,15 @@
allDeployments = sort(allDeployments);
// now that everything is configured, deploy to the container
- for (DeploymentInfo deployment : allDeployments) {
- try {
- Container container = deployment.getContainer();
- container.deploy(deployment);
- logger.info("createApplication.createdEjb",
deployment.getDeploymentID(), deployment.getEjbName(),
container.getContainerID());
- } catch (Throwable t) {
- throw new OpenEJBException("Error deploying
'"+deployment.getEjbName()+"'. Exception: "+t.getClass()+": "+t.getMessage(),
t);
+ if (start) {
+ for (DeploymentInfo deployment : allDeployments) {
+ try {
+ Container container = deployment.getContainer();
+ container.deploy(deployment);
+ logger.info("createApplication.createdEjb",
deployment.getDeploymentID(), deployment.getEjbName(),
container.getContainerID());
+ } catch (Throwable t) {
+ throw new OpenEJBException("Error deploying
'"+deployment.getEjbName()+"'. Exception: "+t.getClass()+": "+t.getMessage(),
t);
+ }
}
}
@@ -603,13 +609,17 @@
webAppBuilder.deployWebApps(appInfo, classLoader);
}
- EjbResolver globalEjbResolver =
systemInstance.getComponent(EjbResolver.class);
- globalEjbResolver.addAll(appInfo.ejbJars);
+ if (start) {
+ EjbResolver globalEjbResolver =
systemInstance.getComponent(EjbResolver.class);
+ globalEjbResolver.addAll(appInfo.ejbJars);
+ }
logger.info("createApplication.success", appInfo.jarPath);
deployedApplications.put(appInfo.jarPath, appInfo);
fireAfterApplicationCreated(appInfo);
+
+ return allDeployments;
} catch (Throwable t) {
try {
destroyApplication(appInfo);
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java?rev=685980&r1=685979&r2=685980&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java
Thu Aug 14 11:04:55 2008
@@ -75,7 +75,7 @@
DeploymentInfo deploymentInfo =
containerSystem.getDeploymentInfo(deploymentId);
- if (deploymentId == null) {
+ if (deploymentInfo == null) {
String message = messages.format("deploymentNotFound",
info.getName(), deploymentId);
throw new NameNotFoundException(message);
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java?rev=685980&r1=685979&r2=685980&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java
Thu Aug 14 11:04:55 2008
@@ -221,14 +221,7 @@
static {
- PropertyEditorManager.registerEditor(Duration.class, Editor.class);
- }
-
- public static class Editor extends java.beans.PropertyEditorSupport {
- public void setAsText(String text) {
- Duration d = parse(text);
- setValue(d);
- }
+ PropertyEditorManager.registerEditor(Duration.class,
DurationEditor.class);
}
public static enum Unit {
Added:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/DurationEditor.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/DurationEditor.java?rev=685980&view=auto
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/DurationEditor.java
(added)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/DurationEditor.java
Thu Aug 14 11:04:55 2008
@@ -0,0 +1,25 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.util;
+
+public class DurationEditor extends java.beans.PropertyEditorSupport {
+ public void setAsText(String text) {
+ Duration d = Duration.parse(text);
+ setValue(d);
+ }
+}
Added:
openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/Application.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/Application.java?rev=685980&view=auto
==============================================================================
---
openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/Application.java
(added)
+++
openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/Application.java
Thu Aug 14 11:04:55 2008
@@ -0,0 +1,182 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.spring;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+import org.apache.openejb.Container;
+import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.assembler.classic.AppInfo;
+import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.ClientInfo;
+import org.apache.openejb.assembler.classic.ConnectorInfo;
+import org.apache.openejb.assembler.classic.EjbJarInfo;
+import org.apache.openejb.assembler.classic.WebAppInfo;
+import org.apache.openejb.config.ConfigurationFactory;
+import org.apache.openejb.config.DeploymentsResolver;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
+
+public class Application {
+ private static final Logger logger =
Logger.getInstance(LogCategory.OPENEJB_STARTUP, Application.class);
+ private final ConfigurationFactory configurationFactory = new
ConfigurationFactory();
+ private final List<AppInfo> applications = new ArrayList<AppInfo>();
+ private final Map<Object, DeploymentInfo> deployments = new
LinkedHashMap<Object, DeploymentInfo>();
+
+ private OpenEJB openEJB;
+ private boolean classpathAsEar = true;
+
+ public OpenEJB getOpenEJB() {
+ return openEJB;
+ }
+
+ public void setOpenEJB(OpenEJB openEJB) {
+ this.openEJB = openEJB;
+ }
+
+ public boolean isClasspathAsEar() {
+ return classpathAsEar;
+ }
+
+ public void setClasspathAsEar(boolean classpathAsEar) {
+ this.classpathAsEar = classpathAsEar;
+ }
+
+ @PostConstruct
+ public void start() throws Exception {
+ System.out.println();
+ System.out.println();
+ System.out.println();
+
+ Set<String> declaredApplications = getDeployedApplications();
+
+ List<String> classpathApps = new ArrayList<String>();
+ ClassLoader classLoader =
Thread.currentThread().getContextClassLoader();
+
+ DeploymentsResolver.loadFromClasspath(SystemInstance.get().getBase(),
classpathApps, classLoader);
+
+ ArrayList<File> jarFiles = new ArrayList<File>();
+ for (String path : classpathApps) {
+ if (declaredApplications.contains(path)) continue;
+ // todo hack to avoid picking up application.xml in openejb-core
module
+ if (path.indexOf("openejb-core/target/test-classes") > 0) continue;
+
+ jarFiles.add(new File(path));
+ }
+
+ Assembler assembler = getAssembler();
+ if (classpathAsEar) {
+ AppInfo appInfo =
configurationFactory.configureApplication(classLoader, "classpath.ear",
jarFiles);
+ List<DeploymentInfo> deployments =
assembler.createApplication(appInfo, assembler.createAppClassLoader(appInfo),
false);
+ for (DeploymentInfo deployment : deployments) {
+ this.deployments.put(deployment.getDeploymentID(), deployment);
+ }
+ applications.add(appInfo);
+ } else {
+ for (File jarFile : jarFiles) {
+ AppInfo appInfo =
configurationFactory.configureApplication(jarFile);
+ List<DeploymentInfo> deployments =
assembler.createApplication(appInfo, assembler.createAppClassLoader(appInfo),
false);
+ for (DeploymentInfo deployment : deployments) {
+ this.deployments.put(deployment.getDeploymentID(),
deployment);
+ }
+ applications.add(appInfo);
+ }
+ }
+ }
+
+ @PreDestroy
+ public void stop() {
+ for (AppInfo application : applications) {
+ try {
+ getAssembler().destroyApplication(application.jarPath);
+ } catch (Exception e) {
+ logger.error("Error stopping application " +
application.jarPath, e);
+ }
+ }
+ }
+
+ public void startEjb(Object deploymentId) throws OpenEJBException {
+ if (deploymentId == null) throw new NullPointerException("deploymentId
is null");
+ DeploymentInfo deployment = deployments.get(deploymentId);
+ if (deployment == null) throw new IllegalArgumentException("Unknown
deployment " + deploymentId);
+
+ Container container = deployment.getContainer();
+ container.deploy(deployment);
+ logger.info("createApplication.createdEjb",
deployment.getDeploymentID(), deployment.getEjbName(),
container.getContainerID());
+ }
+
+ private Assembler getAssembler() {
+ if (openEJB != null) {
+ return openEJB.getAssembler();
+ } else {
+ return SystemInstance.get().getComponent(Assembler.class);
+ }
+ }
+
+ private Set<String> getDeployedApplications() {
+ Set<String> declaredApps = new TreeSet<String>();
+ Collection<AppInfo> applications =
getAssembler().getDeployedApplications();
+ for (AppInfo application : applications) {
+ declaredApps.add(application.jarPath);
+ for (EjbJarInfo ejbJar : application.ejbJars) {
+ declaredApps.add(ejbJar.jarPath);
+ }
+ for (ConnectorInfo connector : application.connectors) {
+ declaredApps.add(connector.codebase);
+ }
+ for (WebAppInfo webApp : application.webApps) {
+ declaredApps.add(webApp.codebase);
+ }
+ for (ClientInfo client : application.clients) {
+ declaredApps.add(client.codebase);
+ }
+ }
+ return declaredApps;
+ }
+
+ private static class ApplicationData {
+ private final AppInfo appInfo;
+ private final Map<Object, DeploymentInfo> deployments = new
LinkedHashMap<Object, DeploymentInfo>();
+
+ private ApplicationData(AppInfo appInfo, List<DeploymentInfo>
deployments) {
+ this.appInfo = appInfo;
+ for (DeploymentInfo deployment : deployments) {
+ this.deployments.put(deployment.getDeploymentID(), deployment);
+ }
+ }
+
+ public DeploymentInfo getDeploymentInfo(Object deploymentId) {
+ return deployments.get(deploymentId);
+ }
+
+ public DeploymentInfo removeDeploymentInfo(Object deploymentId) {
+ return deployments.remove(deploymentId);
+ }
+ }
+}
Added:
openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/EJB.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/EJB.java?rev=685980&view=auto
==============================================================================
---
openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/EJB.java
(added)
+++
openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/EJB.java
Thu Aug 14 11:04:55 2008
@@ -0,0 +1,60 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.spring;
+
+import javax.annotation.PostConstruct;
+
+import org.springframework.beans.factory.annotation.Required;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.spi.ContainerSystem;
+
+public class EJB {
+ private Application application;
+ private Object deploymentId;
+
+ public Application getApplication() {
+ return application;
+ }
+
+ @Required
+ public void setApplication(Application application) {
+ this.application = application;
+ }
+
+ public Object getDeploymentId() {
+ return deploymentId;
+ }
+
+ @Required
+ public void setDeploymentId(Object deploymentId) {
+ this.deploymentId = deploymentId;
+ }
+
+ @PostConstruct
+ public void start() throws OpenEJBException {
+ if (application == null) throw new NullPointerException("application
is null");
+ if (deploymentId == null) throw new NullPointerException("deploymentId
is null");
+
+ application.startEjb(deploymentId);
+
+ ContainerSystem containerSystem =
SystemInstance.get().getComponent(ContainerSystem.class);
+ DeploymentInfo deploymentInfo =
containerSystem.getDeploymentInfo(deploymentId);
+ }
+}
Modified:
openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/OpenEJB.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/OpenEJB.java?rev=685980&r1=685979&r2=685980&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/OpenEJB.java
(original)
+++
openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/OpenEJB.java
Thu Aug 14 11:04:55 2008
@@ -82,6 +82,10 @@
private Throwable initialized;
private ApplicationContext applicationContext;
+ public SpringAssembler getAssembler() {
+ return assembler;
+ }
+
public ApplicationContext getApplicationContext() {
return applicationContext;
}
Added:
openejb/trunk/openejb3/container/openejb-spring/src/test/java/org/apache/openejb/spring/Echo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-spring/src/test/java/org/apache/openejb/spring/Echo.java?rev=685980&view=auto
==============================================================================
---
openejb/trunk/openejb3/container/openejb-spring/src/test/java/org/apache/openejb/spring/Echo.java
(added)
+++
openejb/trunk/openejb3/container/openejb-spring/src/test/java/org/apache/openejb/spring/Echo.java
Thu Aug 14 11:04:55 2008
@@ -0,0 +1,25 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.spring;
+
+import javax.ejb.Local;
+
[EMAIL PROTECTED]
+public interface Echo {
+ String echo(String s);
+}
Added:
openejb/trunk/openejb3/container/openejb-spring/src/test/java/org/apache/openejb/spring/EchoBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-spring/src/test/java/org/apache/openejb/spring/EchoBean.java?rev=685980&view=auto
==============================================================================
---
openejb/trunk/openejb3/container/openejb-spring/src/test/java/org/apache/openejb/spring/EchoBean.java
(added)
+++
openejb/trunk/openejb3/container/openejb-spring/src/test/java/org/apache/openejb/spring/EchoBean.java
Thu Aug 14 11:04:55 2008
@@ -0,0 +1,28 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.spring;
+
+import javax.ejb.Stateless;
+
[EMAIL PROTECTED]
+public class EchoBean implements Echo {
+ public String echo(String s) {
+ System.out.println(s);
+ return new StringBuilder(s).reverse().toString();
+ }
+}
Modified:
openejb/trunk/openejb3/container/openejb-spring/src/test/java/org/apache/openejb/spring/SpringTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-spring/src/test/java/org/apache/openejb/spring/SpringTest.java?rev=685980&r1=685979&r2=685980&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-spring/src/test/java/org/apache/openejb/spring/SpringTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-spring/src/test/java/org/apache/openejb/spring/SpringTest.java
Thu Aug 14 11:04:55 2008
@@ -109,6 +109,16 @@
Container cmpContainer = containerSystem.getContainer("Spring Defined
CmpContainer");
assertTrue("cmpContainer should be an instance of CmpContainer",
cmpContainer instanceof org.apache.openejb.core.cmp.CmpContainer);
+ //
+ // ClassPath Application
+ //
+ Application application = (Application)
context.getBean("classPathApplication");
+
+ //
+ // EJB
+ //
+ EJB ejb = (EJB) context.getBean("EchoBean");
+
System.out.println();
System.out.println();
Debug.printContext(initialContext);
Added:
openejb/trunk/openejb3/container/openejb-spring/src/test/resources/META-INF/ejb-jar.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-spring/src/test/resources/META-INF/ejb-jar.xml?rev=685980&view=auto
==============================================================================
---
openejb/trunk/openejb3/container/openejb-spring/src/test/resources/META-INF/ejb-jar.xml
(added)
+++
openejb/trunk/openejb3/container/openejb-spring/src/test/resources/META-INF/ejb-jar.xml
Thu Aug 14 11:04:55 2008
@@ -0,0 +1,2 @@
+<!-- this is here so the ejbs in the test code are discovered and deployed -->
+<ejb-jar/>
\ No newline at end of file
Modified:
openejb/trunk/openejb3/container/openejb-spring/src/test/resources/org/apache/openejb/spring/spring.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-spring/src/test/resources/org/apache/openejb/spring/spring.xml?rev=685980&r1=685979&r2=685980&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-spring/src/test/resources/org/apache/openejb/spring/spring.xml
(original)
+++
openejb/trunk/openejb3/container/openejb-spring/src/test/resources/org/apache/openejb/spring/spring.xml
Thu Aug 14 11:04:55 2008
@@ -81,6 +81,15 @@
<property name="username" value="sa"/>
</bean>
+ <bean name="classPathApplication"
class="org.apache.openejb.spring.Application">
+ <property name="openEJB" ref="OpenEJB"/>
+ </bean>
+
+ <bean name="EchoBean" class="org.apache.openejb.spring.EJB">
+ <property name="application" ref="classPathApplication"/>
+ <property name="deploymentId" value="EchoBean"/>
+ </bean>
+
<bean id="openejbDS" class="org.apache.openejb.spring.OpenEJBDataSource"
depends-on="OpenEJB">
<property name="resourceId" value="ds"/>
</bean>
