User: d_jencks
Date: 01/11/11 22:52:16
Modified: src/main/org/jboss/deployment DeployerMBeanSupport.java
J2eeDeployer.java J2eeDeployerMBean.java
ServiceDeployer.java
Log:
Changes to move toward eliminating init and destroy from Service interface, and make
J2eeDeployer use mbean-refs. (2nd try at committing - is cvs acting weird?
Revision Changes Path
1.9 +5 -5 jboss/src/main/org/jboss/deployment/DeployerMBeanSupport.java
Index: DeployerMBeanSupport.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/deployment/DeployerMBeanSupport.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DeployerMBeanSupport.java 2001/11/10 21:38:06 1.8
+++ DeployerMBeanSupport.java 2001/11/12 06:52:15 1.9
@@ -37,7 +37,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Toby Allsopp</a>
* @author <a href="mailto:[EMAIL PROTECTED]">David Jencks</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*
* <p><b>Revisions:</b>
*
@@ -164,13 +164,13 @@
// ServiceMBeanSupport overrides ---------------------------------
/**
- * The <code>initService</code> method sets up a temporary directory
+ * The <code>startService</code> method sets up a temporary directory
* to hold the copies of deployed packages and possibly inflations
* of those copies. The format is
(jboss.system.home)/tmp/deploy/(deployername).
*
* @exception Exception if an error occurs
*/
- public void initService()
+ protected void startService()
throws Exception
{
// find the temp directory - referenced to jboss.system.home property
@@ -201,11 +201,11 @@
}
/**
- * The <code>destroyService</code> method tries to remove the
+ * The <code>stopService</code> method tries to remove the
* directory created in the initService method.
*
*/
- public void destroyService()
+ protected void stopService()
{
// Remove our temp directory
if (!recursiveDelete(deployDir))
1.44 +24 -48 jboss/src/main/org/jboss/deployment/J2eeDeployer.java
Index: J2eeDeployer.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/deployment/J2eeDeployer.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- J2eeDeployer.java 2001/10/08 07:03:49 1.43
+++ J2eeDeployer.java 2001/11/12 06:52:16 1.44
@@ -72,7 +72,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Toby Allsopp</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Scott Stark</a>.
* @author <a href="mailto:[EMAIL PROTECTED]">Christoph G. Jung</a>.
- * @version $Revision: 1.43 $
+ * @version $Revision: 1.44 $
*/
public class J2eeDeployer
@@ -105,39 +105,23 @@
protected ObjectName rarDeployer;
protected ObjectName javaDeployer;
- String jarDeployerName;
+ /*String jarDeployerName;
String warDeployerName;
String rarDeployerName;
- String javaDeployerName;
+ String javaDeployerName;*/
int classpathPolicy = EASY;
// <comment author="cgjung"> better be protected for subclassing </comment>
protected InstallerFactory installer;
- // Static --------------------------------------------------------
- /** only for testing...*/
- public static void main(String[] _args) throws Exception {
- new J2eeDeployer().deploy(_args[0]);
- }
// Constructors --------------------------------------------------
- public J2eeDeployer() {
- this(DEFAULT_NAME, DEFAULT_JAR_DEPLOYER_NAME,DEFAULT_WAR_DEPLOYER_NAME,
DEFAULT_RAR_DEPLOYER_NAME, DEFAULT_JAVA_DEPLOYER_NAME);
- }
- public J2eeDeployer(String _name, String jarDeployerName, String
warDeployerName) {
-
this(_name,jarDeployerName,warDeployerName,DEFAULT_RAR_DEPLOYER_NAME,DEFAULT_JAVA_DEPLOYER_NAME);
+ public J2eeDeployer() {
}
- public J2eeDeployer(String _name, String jarDeployerName, String
warDeployerName, String rarDeployerName, String javaDeployerName) {
- setDeployerName(_name);
- setJarDeployerName(jarDeployerName);
- setWarDeployerName(warDeployerName);
- setJavaDeployerName(javaDeployerName);
- setRarDeployerName(rarDeployerName);
- }
public void setDeployerName(String name) {
this.log = Logger.create(this.getClass().getName() + "#" + name);
@@ -150,36 +134,36 @@
return name.trim();
}
- public void setJarDeployerName(String jarDeployerName) {
- this.jarDeployerName = jarDeployerName;
+ public void setJarDeployer(ObjectName jarDeployer) {
+ this.jarDeployer = jarDeployer;
}
- public String getJarDeployerName() {
- return jarDeployerName;
+ public ObjectName getJarDeployer() {
+ return jarDeployer;
}
- public void setWarDeployerName(String warDeployerName) {
- this.warDeployerName = warDeployerName;
+ public void setWarDeployer(ObjectName warDeployer) {
+ this.warDeployer = warDeployer;
}
- public String getWarDeployerName() {
- return warDeployerName;
+ public ObjectName getWarDeployer() {
+ return warDeployer;
}
- public void setRarDeployerName(String rarDeployerName) {
- this.rarDeployerName = rarDeployerName;
+ public void setRarDeployer(ObjectName rarDeployer) {
+ this.rarDeployer = rarDeployer;
}
- public String getRarDeployerName() {
- return rarDeployerName;
+ public ObjectName getRarDeployer() {
+ return rarDeployer;
}
- public void setJavaDeployerName(String javaDeployerName) {
- this.javaDeployerName = javaDeployerName;
+ public void setServiceDeployer(ObjectName javaDeployer) {
+ this.javaDeployer = javaDeployer;
}
- public String getJavaDeployerName() {
- return javaDeployerName;
+ public ObjectName getServiceDeployer() {
+ return javaDeployer;
}
// Public --------------------------------------------------------
@@ -345,8 +329,9 @@
return name == null ? new ObjectName(OBJECT_NAME+this.name) : name;
}
+
/** */
- protected void initService()
+ protected void startService()
throws Exception {
@@ -363,17 +348,7 @@
installer = new InstallerFactory(dir, log);
- // Save JMX name of the deployers
- jarDeployer = new ObjectName(jarDeployerName);
- warDeployer= new ObjectName(warDeployerName);
- javaDeployer=new ObjectName(javaDeployerName);
- rarDeployer=new ObjectName(rarDeployerName);
- }
-
- /** */
- protected void startService()
- throws Exception {
- if (!warDeployerAvailable())
+ if (warDeployer == null)
log.info("No web container found - only EJB deployment available...");
// clean up the deployment directory since on some Windowz the file
removement
@@ -488,6 +463,7 @@
String[] jarUrls = new String[ tmp.size() ];
tmp.toArray( jarUrls );
// Call the ContainerFactory that is loaded in the JMX server
+ getLog().info("about to invoke deploy on jardeployer:" + jarDeployer);
server.invoke(jarDeployer, "deploy",
new Object[]{ _d.localUrl.toString(), jarUrls, moduleName },
new String[]{ String.class.getName(), String[].class.getName(),
String.class.getName() } );
1.9 +12 -11 jboss/src/main/org/jboss/deployment/J2eeDeployerMBean.java
Index: J2eeDeployerMBean.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/deployment/J2eeDeployerMBean.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- J2eeDeployerMBean.java 2001/10/07 20:12:52 1.8
+++ J2eeDeployerMBean.java 2001/11/12 06:52:16 1.9
@@ -6,16 +6,17 @@
*/
package org.jboss.deployment;
-import java.net.MalformedURLException;
-import java.io.IOException;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import javax.management.ObjectName;
import org.jboss.system.ServiceMBean;
/**
* @see
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel Schulze</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Toby Allsopp</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public interface J2eeDeployerMBean
extends DeployerMBean
@@ -27,16 +28,16 @@
public void setDeployerName(String name);
public String getDeployerName();
- public void setJarDeployerName(String jarDeployerName);
- public String getJarDeployerName();
+ public void setJarDeployer(ObjectName jarDeployer);
+ public ObjectName getJarDeployer();
- public void setWarDeployerName(String warDeployerName);
- public String getWarDeployerName();
+ public void setWarDeployer(ObjectName warDeployer);
+ public ObjectName getWarDeployer();
- public void setRarDeployerName(String rarDeployerName);
- public String getRarDeployerName();
+ public void setRarDeployer(ObjectName rarDeployer);
+ public ObjectName getRarDeployer();
- public void setJavaDeployerName(String javaDeployerName);
- public String getJavaDeployerName();
+ public void setServiceDeployer(ObjectName javaDeployer);
+ public ObjectName getServiceDeployer();
}
1.13 +12 -10 jboss/src/main/org/jboss/deployment/ServiceDeployer.java
Index: ServiceDeployer.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/deployment/ServiceDeployer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ServiceDeployer.java 2001/11/10 21:38:06 1.12
+++ ServiceDeployer.java 2001/11/12 06:52:16 1.13
@@ -58,7 +58,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]">David Maplesden</a>
* @author <a href="mailto:[EMAIL PROTECTED]">David Jencks</a>
- * @version $Revision: 1.12 $ <p>
+ * @version $Revision: 1.13 $ <p>
*
* <b>20010830 marc fleury:</b>
* <ul>initial import
@@ -91,6 +91,7 @@
implements ServiceDeployerMBean
{
// Attributes --------------------------------------------------------
+ private ObjectName objectName;
//Find all the deployment info for a url
private final Map urlToSarDeploymentInfoMap = new HashMap();
@@ -99,8 +100,6 @@
private final Map objectNameToSupplyingPackageMap = new HashMap();
- // JMX
- private MBeanServer server;
// Public --------------------------------------------------------
@@ -577,13 +576,11 @@
public ObjectName preRegister(MBeanServer server, ObjectName name)
throws java.lang.Exception
{
-
+ super.preRegister(server, name);
log.debug("ServiceDeployer preregistered with mbean server");
- this.server = server;
- super.initService();//set up the deploy temp directory
- super.startService();//why not?
+ objectName = name == null ? new ObjectName(OBJECT_NAME) : name;
- return name == null ? new ObjectName(OBJECT_NAME) : name;
+ return objectName;
}
@@ -599,7 +596,12 @@
{
try
{
-
+ super.postRegister(registrationDone);
+ //super.startService();//set up the deploy temp directory
+ getServer().invoke(getServiceControllerName(),
+ "registerAndStartService",
+ new Object[] {objectName, null},
+ new String[] {"javax.management.ObjectName",
"java.lang.String"});
//Initialize the libraries for the server by default we add the libraries
in lib/services
// and client
String urlString =
System.getProperty("jboss.system.configurationDirectory") + "jboss-service.xml";
@@ -763,7 +765,7 @@
{
try
{
- return server.invoke(name, method, args, sig);
+ return getServer().invoke(name, method, args, sig);
}
catch (MBeanException mbe)
{
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development