Author: gnodet
Date: Tue Sep 26 04:25:09 2006
New Revision: 449990
URL: http://svn.apache.org/viewvc?view=rev&rev=449990
Log:
SM-600: Compilation error in Geronimo ServiceMixGBean
Modified:
incubator/servicemix/trunk/geronimo/servicemix-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixGBean.java
incubator/servicemix/trunk/geronimo/servicemix/src/plan/geronimo-service.xml
Modified:
incubator/servicemix/trunk/geronimo/servicemix-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixGBean.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo/servicemix-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixGBean.java?view=diff&rev=449990&r1=449989&r2=449990
==============================================================================
---
incubator/servicemix/trunk/geronimo/servicemix-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixGBean.java
(original)
+++
incubator/servicemix/trunk/geronimo/servicemix-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixGBean.java
Tue Sep 26 04:25:09 2006
@@ -20,7 +20,6 @@
import java.util.Collection;
import javax.jbi.JBIException;
-import javax.resource.spi.work.WorkManager;
import javax.transaction.TransactionManager;
import org.apache.commons.logging.Log;
@@ -47,7 +46,6 @@
private String name;
private String directory;
private TransactionContextManager transactionContextManager;
- private WorkManager workManager;
private Kernel kernel;
private Collection jndiResources;
@@ -59,9 +57,8 @@
infoFactory.addAttribute("name", String.class, true);
infoFactory.addAttribute("directory", String.class, true);
infoFactory.addReference("transactionContextManager",
TransactionContextManager.class);
- infoFactory.addReference("workManager", WorkManager.class);
infoFactory.addAttribute("kernel", Kernel.class, false);
- infoFactory.setConstructor(new String[]{"name", "directory",
"transactionContextManager", "workManager", "kernel"});
+ infoFactory.setConstructor(new String[]{"name", "directory",
"transactionContextManager", "kernel"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
@@ -72,12 +69,10 @@
public ServiceMixGBean(String name,
String directory,
TransactionContextManager
transactionContextManager,
- WorkManager workManager,
Kernel kernel) {
this.name = name;
this.directory = directory;
this.transactionContextManager = transactionContextManager;
- this.workManager = workManager;
this.kernel = kernel;
if (log.isDebugEnabled()) {
log.debug("ServiceMixGBean created");
@@ -162,7 +157,6 @@
container.setTransactionManager(getTransactionManager());
container.setMonitorInstallationDirectory(false);
container.setMonitorDeploymentDirectory(false);
- container.setWorkManager(workManager);
return container;
}
Modified:
incubator/servicemix/trunk/geronimo/servicemix/src/plan/geronimo-service.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo/servicemix/src/plan/geronimo-service.xml?view=diff&rev=449990&r1=449989&r2=449990
==============================================================================
---
incubator/servicemix/trunk/geronimo/servicemix/src/plan/geronimo-service.xml
(original)
+++
incubator/servicemix/trunk/geronimo/servicemix/src/plan/geronimo-service.xml
Tue Sep 26 04:25:09 2006
@@ -117,35 +117,11 @@
</dependencies>
</environment>
- <gbean name="ServiceMixThreadPool"
class="org.apache.geronimo.pool.ThreadPool">
- <attribute name="keepAliveTime">5000</attribute>
- <attribute name="poolSize">30</attribute>
- <attribute name="poolName">ServiceMixThreadPool</attribute>
- </gbean>
-
- <gbean name="ServiceMixWorkManager"
class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
- <reference name="SyncPool">
- <name>ConnectorThreadPool</name>
- </reference>
- <reference name="StartPool">
- <name>ConnectorThreadPool</name>
- </reference>
- <reference name="ScheduledPool">
- <name>ConnectorThreadPool</name>
- </reference>
- <reference name="TransactionContextManager">
- <name>TransactionContextManager</name>
- </reference>
- </gbean>
-
<gbean name="ServiceMixJBIContainer"
class="org.apache.servicemix.geronimo.ServiceMixGBean">
<attribute name="name">servicemix</attribute>
<attribute name="directory">var/servicemix</attribute>
<reference name="transactionContextManager">
<name>TransactionContextManager</name>
- </reference>
- <reference name="workManager">
- <name>ServiceMixWorkManager</name>
</reference>
</gbean>
