[jboss-cvs] JBossAS SVN: r83749 - in trunk/profileservice: src/main/org/jboss/profileservice/management and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Feb 1 09:48:03 EST 2009
Author: emuckenhuber
Date: 2009-02-01 09:48:03 -0500 (Sun, 01 Feb 2009)
New Revision: 83749
Modified:
trunk/profileservice/build.xml
trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
trunk/profileservice/src/main/org/jboss/profileservice/management/upload/remoting/DeployHandler.java
trunk/profileservice/src/resources/hdscanner-jboss-beans.xml
trunk/profileservice/src/resources/profileservice-jboss-beans.xml
Log:
update profileservice-spi and changes to use a ProfileDeployment instead of VFSDeployment
Modified: trunk/profileservice/build.xml
===================================================================
--- trunk/profileservice/build.xml 2009-02-01 14:47:55 UTC (rev 83748)
+++ trunk/profileservice/build.xml 2009-02-01 14:48:03 UTC (rev 83749)
@@ -90,6 +90,7 @@
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
+ <path refid="jboss.system.classpath"/>
</path>
<!-- ===== -->
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java 2009-02-01 14:47:55 UTC (rev 83748)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java 2009-02-01 14:48:03 UTC (rev 83749)
@@ -44,7 +44,6 @@
import org.jboss.aspects.remoting.MergeMetaDataInterceptor;
import org.jboss.aspects.remoting.Remoting;
import org.jboss.aspects.security.SecurityClientInterceptor;
-import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.client.spi.main.MainDeployer;
import org.jboss.deployers.spi.management.DeploymentTemplate;
import org.jboss.deployers.spi.management.ManagementView;
@@ -83,9 +82,11 @@
import org.jboss.profileservice.spi.NoSuchDeploymentException;
import org.jboss.profileservice.spi.NoSuchProfileException;
import org.jboss.profileservice.spi.Profile;
+import org.jboss.profileservice.spi.ProfileDeployment;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.remoting.InvokerLocator;
+import org.jboss.system.server.profileservice.repository.DefaultProfileDeploymentFactory;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
@@ -196,8 +197,8 @@
// Process the deployments
boolean trace = log.isTraceEnabled();
- Collection<VFSDeployment> deployments = activeProfile.getDeployments();
- for(VFSDeployment deployment : deployments)
+ Collection<ProfileDeployment> deployments = activeProfile.getDeployments();
+ for(ProfileDeployment deployment : deployments)
{
try
{
@@ -659,7 +660,7 @@
// Let the DeploymentRepository try to resolve the deployment (simpleName)
if(md == null)
{
- Deployment ctx = activeProfile.getDeployment(name);
+ ProfileDeployment ctx = activeProfile.getDeployment(name);
md = this.managedDeployments.get(ctx.getName());
}
@@ -684,7 +685,7 @@
HashSet<ManagedDeployment> mds = new HashSet<ManagedDeployment>();
for(String name : names)
{
- Deployment ctx = activeProfile.getDeployment(name);
+ ProfileDeployment ctx = activeProfile.getDeployment(name);
ManagedDeployment md = getManagedDeployment(ctx);
mds.add(md);
}
@@ -788,9 +789,15 @@
// Create a deployment base from the template
if( log.isTraceEnabled() )
log.trace("applyTemplate, profile="+activeProfile+", deploymentBaseName="+deploymentBaseName+", phase="+phase+", info="+info);
+
+ // FIXME this should not be done in this way!
VirtualFile vf = template.applyTemplate(templateRoot, deploymentBaseName, info);
VFSDeployment ctx = deploymentFactory.createVFSDeployment(vf);
- activeProfile.addDeployment(ctx);
+
+ // FIXME
+ ProfileDeployment d = DefaultProfileDeploymentFactory.getInstance().createProfileDeployment(vf);
+ activeProfile.addDeployment(d);
+
mainDeployer.addDeployment(ctx);
// Seems useless, what was the original point of this?
template.updateTemplateDeployment(ctx, info);
@@ -902,7 +909,7 @@
throws NoSuchProfileException, NoSuchDeploymentException, Exception
{
log.debug("removeDeployment, "+deploymentName+", phase: "+phase);
- Deployment ctx = activeProfile.removeDeployment(deploymentName);
+ ProfileDeployment ctx = activeProfile.removeDeployment(deploymentName);
if( ctx == null )
{
formatter.applyPattern(i18n.getString("ManagementView.NoSuchDeploymentException")); //$NON-NLS-1$
@@ -970,7 +977,7 @@
String name = md.getName();
DeploymentPhase phase = md.getDeploymentPhase();
- VFSDeployment compDeployment = activeProfile.getDeployment(name);
+ ProfileDeployment compDeployment = activeProfile.getDeployment(name);
if( compDeployment == null )
{
formatter.applyPattern(i18n.getString("ManagementView.NoSuchDeploymentException")); //$NON-NLS-1$
@@ -1190,7 +1197,7 @@
return opProxies;
}
- private ManagedDeployment getManagedDeployment(Deployment ctx)
+ private ManagedDeployment getManagedDeployment(ProfileDeployment ctx)
throws Exception
{
return mainDeployer.getManagedDeployment(ctx.getName());
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/upload/remoting/DeployHandler.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/upload/remoting/DeployHandler.java 2009-02-01 14:47:55 UTC (rev 83748)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/upload/remoting/DeployHandler.java 2009-02-01 14:48:03 UTC (rev 83749)
@@ -26,24 +26,25 @@
import java.net.URL;
import java.util.Arrays;
import java.util.Map;
+
import javax.management.MBeanServer;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.InvocationResponse;
import org.jboss.aspects.remoting.AOPRemotingInvocationHandler;
-import org.jboss.deployers.client.spi.main.MainDeployer;
import org.jboss.deployers.spi.management.deploy.DeploymentID;
import org.jboss.deployers.spi.management.deploy.DeploymentManager;
-import org.jboss.deployers.vfs.spi.client.VFSDeployment;
-import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.logging.Logger;
import org.jboss.managed.api.ManagedDeployment.DeploymentPhase;
import org.jboss.profileservice.management.upload.SerializableDeploymentID;
import org.jboss.profileservice.spi.DeploymentRepository;
+import org.jboss.profileservice.spi.ProfileDeployment;
import org.jboss.remoting.InvocationRequest;
import org.jboss.remoting.ServerInvoker;
import org.jboss.remoting.callback.InvokerCallbackHandler;
import org.jboss.remoting.stream.StreamInvocationHandler;
+import org.jboss.system.server.profileservice.repository.DefaultProfileDeploymentFactory;
+import org.jboss.system.server.profileservice.repository.MainDeployerAdapter;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
@@ -53,18 +54,23 @@
*
* @author Scott.Stark at jboss.org
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision:$
+ * @version $Revision$
*/
public class DeployHandler extends AOPRemotingInvocationHandler
implements StreamInvocationHandler
{
- static Logger log = Logger.getLogger(DeployHandler.class);
+ /** The logger. */
+ static final Logger log = Logger.getLogger(DeployHandler.class);
+
+ /** The deployment repository. */
private DeploymentRepository deploymentRepository;
- /** The deployment factory */
- private VFSDeploymentFactory deploymentFactory = VFSDeploymentFactory.getInstance();
- private MainDeployer mainDeployer;
+ /** The deployer. */
+ private MainDeployerAdapter deployer;
+ /** The deployment factory */
+ private static final DefaultProfileDeploymentFactory deploymentFactory = DefaultProfileDeploymentFactory.getInstance();
+
public DeploymentRepository getDeploymentRepository()
{
return deploymentRepository;
@@ -75,24 +81,14 @@
this.deploymentRepository = deploymentRepository;
}
-
- public VFSDeploymentFactory getDeploymentFactory()
+ public MainDeployerAdapter getDeployer()
{
- return deploymentFactory;
+ return deployer;
}
- public void setDeploymentFactory(VFSDeploymentFactory deploymentFactory)
+ public void setDeployer(MainDeployerAdapter deployer)
{
- this.deploymentFactory = deploymentFactory;
+ this.deployer = deployer;
}
-
- public MainDeployer getMainDeployer()
- {
- return mainDeployer;
- }
- public void setMainDeployer(MainDeployer mainDeployer)
- {
- this.mainDeployer = mainDeployer;
- }
/**
* Handle a DeploymentManager distribute invocation
* @see DeploymentManager#distribute(String, DeploymentPhase, java.net.URL)
@@ -103,7 +99,6 @@
SerializableDeploymentID deploymentTarget = (SerializableDeploymentID) request.getParameter();
log.info("Handle stream, deploymentTarget: " + deploymentTarget);
deploymentTarget.setContentIS(contentIS);
- DeploymentPhase phase = deploymentTarget.getPhase();
String[] names = deploymentTarget.getNames();
String repositoryName = deploymentRepository.addDeploymentContent(names[0], contentIS);
log.info("End handle stream, repositoryName: " + repositoryName);
@@ -176,7 +171,6 @@
protected String[] getRepositoryNames(String[] names, DeploymentPhase phase)
throws IOException
{
-// return deploymentRepository.getRepositoryNames(names, phase);
return names;
}
@@ -190,11 +184,11 @@
try
{
VirtualFile vf = VFS.getRoot(contentURL);
- VFSDeployment vfsd = createDeployment(vf);
+ ProfileDeployment vfsd = createDeployment(vf);
deploymentRepository.addDeployment(vfsd.getName(), vfsd);
- mainDeployer.addDeployment(vfsd);
- mainDeployer.process();
- mainDeployer.checkComplete();
+ deployer.addDeployment(vfsd);
+ deployer.process();
+ deployer.checkComplete();
String[] rnames = {vfsd.getName()};
log.info("End distribute, " + contentURL);
return rnames;
@@ -217,14 +211,14 @@
for(String name : names)
{
VirtualFile vf = deploymentRepository.getDeploymentContent(name);
- VFSDeployment vfsd = createDeployment(vf);
+ ProfileDeployment vfsd = createDeployment(vf);
deploymentRepository.addDeployment(vfsd.getName(), vfsd);
deploymentRepository.unlockDeploymentContent(vf.getPathName());
- mainDeployer.addDeployment(vfsd);
+ deployer.addDeployment(vfsd);
log.info("Scheduling start for: "+vfsd);
}
- mainDeployer.process();
- mainDeployer.checkComplete();
+ deployer.process();
+ deployer.checkComplete();
}
finally
{
@@ -243,15 +237,15 @@
for(String name : names)
{
// Obtain the
- VFSDeployment vfsd = deploymentRepository.getDeployment(name);
+ ProfileDeployment vfsd = deploymentRepository.getDeployment(name);
// Lock the content to make it unavailable to the deployment scanner
String path = vfsd.getRoot().getPathName();
deploymentRepository.lockDeploymentContent(path);
- mainDeployer.removeDeployment(vfsd);
+ deployer.removeDeployment(vfsd);
log.info("Scheduling stop for: "+vfsd);
}
- mainDeployer.process();
- mainDeployer.checkComplete();
+ deployer.process();
+ deployer.checkComplete();
}
finally
{
@@ -279,15 +273,16 @@
}
/**
- * Create a deployment
+ * Create a profile deployment.
*
* @param file the root file
* @return the deployment
*/
- protected VFSDeployment createDeployment(VirtualFile file)
+ protected ProfileDeployment createDeployment(VirtualFile file)
{
if (file == null)
throw new IllegalArgumentException("Null file");
- return deploymentFactory.createVFSDeployment(file);
+
+ return deploymentFactory.createProfileDeployment(file);
}
}
Modified: trunk/profileservice/src/resources/hdscanner-jboss-beans.xml
===================================================================
--- trunk/profileservice/src/resources/hdscanner-jboss-beans.xml 2009-02-01 14:47:55 UTC (rev 83748)
+++ trunk/profileservice/src/resources/hdscanner-jboss-beans.xml 2009-02-01 14:48:03 UTC (rev 83749)
@@ -10,7 +10,7 @@
<!-- Hotdeployment of applications -->
<bean name="HDScanner"
class="org.jboss.system.server.profileservice.hotdeploy.HDScanner">
- <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+ <property name="deployer"><inject bean="ProfileServiceDeployer"/></property>
<property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
<property name="profileService"><inject bean="ProfileService"/></property>
<property name="scanPeriod">5000</property>
Modified: trunk/profileservice/src/resources/profileservice-jboss-beans.xml
===================================================================
--- trunk/profileservice/src/resources/profileservice-jboss-beans.xml 2009-02-01 14:47:55 UTC (rev 83748)
+++ trunk/profileservice/src/resources/profileservice-jboss-beans.xml 2009-02-01 14:48:03 UTC (rev 83749)
@@ -87,7 +87,7 @@
<uninstall bean="ConnectorMBean" method="removeInvocationHandler">
<parameter>DeploymentManager</parameter>
</uninstall>
- <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+ <property name="deployer"><inject bean="ProfileServiceDeployer"/></property>
</bean>
<bean name="RuntimeComponentDispatcher" class="org.jboss.profileservice.management.KernelBusRuntimeComponentDispatcher">
More information about the jboss-cvs-commits
mailing list