From: <aft...@us...> - 2007-06-29 10:10:46
|
Revision: 4491 http://svn.sourceforge.net/smartfrog/?rev=4491&view=rev Author: aftereight Date: 2007-06-29 03:10:43 -0700 (Fri, 29 Jun 2007) Log Message: ----------- Began refactoring ComponentDeployer and friends Modified Paths: -------------- branches/core-branch-osgi/components/anubisdeployer/src/org/smartfrog/services/anubisdeployer/ClusterDeployerImpl.java branches/core-branch-osgi/components/asyndeployer/src/org/smartfrog/services/asyndeployer/AsynPrimDeployerImpl.java branches/core-branch-osgi/components/persistence/src/org/smartfrog/services/persistence/deployer/StorageOrDescriptionDeployerImpl.java branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/deployer/ComponentFactoryDeployerImpl.java branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/deployer/SFDeployer.java branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/prim/PrimDeployerImpl.java Added Paths: ----------- branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/deployer/ComponentDeployer.java Removed Paths: ------------- branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/componentdescription/ComponentDeployer.java Modified: branches/core-branch-osgi/components/anubisdeployer/src/org/smartfrog/services/anubisdeployer/ClusterDeployerImpl.java =================================================================== --- branches/core-branch-osgi/components/anubisdeployer/src/org/smartfrog/services/anubisdeployer/ClusterDeployerImpl.java 2007-06-29 10:00:39 UTC (rev 4490) +++ branches/core-branch-osgi/components/anubisdeployer/src/org/smartfrog/services/anubisdeployer/ClusterDeployerImpl.java 2007-06-29 10:10:43 UTC (rev 4491) @@ -46,7 +46,7 @@ public static final String CLUSTERCOMPOUNDCLASS = "org.smartfrog.services.anubisdeployer.ClusterCompoundImpl"; - static String uniqueNameBase; + private static String uniqueNameBase; public static final String ATTR_CLUSTER_NODE_MANAGEMENT = "clusterNodeManagement"; public static final String ATTR_CLUSTER_STATUS_MONITOR = "clusterStatusMonitor"; Modified: branches/core-branch-osgi/components/asyndeployer/src/org/smartfrog/services/asyndeployer/AsynPrimDeployerImpl.java =================================================================== --- branches/core-branch-osgi/components/asyndeployer/src/org/smartfrog/services/asyndeployer/AsynPrimDeployerImpl.java 2007-06-29 10:00:39 UTC (rev 4490) +++ branches/core-branch-osgi/components/asyndeployer/src/org/smartfrog/services/asyndeployer/AsynPrimDeployerImpl.java 2007-06-29 10:10:43 UTC (rev 4491) @@ -21,10 +21,9 @@ package org.smartfrog.services.asyndeployer; import java.io.IOException; -import java.util.HashMap; import org.smartfrog.sfcore.common.MessageKeys; -import org.smartfrog.sfcore.componentdescription.ComponentDeployer; +import org.smartfrog.sfcore.deployer.ComponentDeployer; import org.smartfrog.sfcore.componentdescription.ComponentDescription; import org.smartfrog.sfcore.logging.LogFactory; Modified: branches/core-branch-osgi/components/persistence/src/org/smartfrog/services/persistence/deployer/StorageOrDescriptionDeployerImpl.java =================================================================== --- branches/core-branch-osgi/components/persistence/src/org/smartfrog/services/persistence/deployer/StorageOrDescriptionDeployerImpl.java 2007-06-29 10:00:39 UTC (rev 4490) +++ branches/core-branch-osgi/components/persistence/src/org/smartfrog/services/persistence/deployer/StorageOrDescriptionDeployerImpl.java 2007-06-29 10:10:43 UTC (rev 4491) @@ -32,8 +32,7 @@ public class StorageOrDescriptionDeployerImpl extends PrimProcessDeployerImpl { public StorageOrDescriptionDeployerImpl(ComponentDescription descr) { - super(descr); - // TODO Auto-generated constructor stub + super(descr); } public Prim deploy(Reference name, Prim parent, Context params) Deleted: branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/componentdescription/ComponentDeployer.java =================================================================== --- branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/componentdescription/ComponentDeployer.java 2007-06-29 10:00:39 UTC (rev 4490) +++ branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/componentdescription/ComponentDeployer.java 2007-06-29 10:10:43 UTC (rev 4491) @@ -1,47 +0,0 @@ -/** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -For more information: www.smartfrog.org - -*/ - -package org.smartfrog.sfcore.componentdescription; - -import org.smartfrog.sfcore.common.Context; -import org.smartfrog.sfcore.common.SmartFrogDeploymentException; -import org.smartfrog.sfcore.prim.Prim; -import org.smartfrog.sfcore.reference.Reference; - -/** - * Defines the access point to deploy a component description. The class - * implementing this interface should have been parametrized with the - * description it is to work on - */ -public interface ComponentDeployer { - /** - * Deploys description for which this deployer was created. - * - * @param name name of embedded description to deploy (can be null) - * @param parent parent for deployed component - * @param params parameters to add before deployment (can be null) - * - * @return deployer component - * - * @exception SmartFrogDeploymentException failed to deploy - */ - public Prim deploy(Reference name, Prim parent, Context params) - throws SmartFrogDeploymentException; -} Copied: branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/deployer/ComponentDeployer.java (from rev 4471, branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/componentdescription/ComponentDeployer.java) =================================================================== --- branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/deployer/ComponentDeployer.java (rev 0) +++ branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/deployer/ComponentDeployer.java 2007-06-29 10:10:43 UTC (rev 4491) @@ -0,0 +1,47 @@ +/** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org + +*/ + +package org.smartfrog.sfcore.deployer; + +import org.smartfrog.sfcore.common.Context; +import org.smartfrog.sfcore.common.SmartFrogDeploymentException; +import org.smartfrog.sfcore.prim.Prim; +import org.smartfrog.sfcore.reference.Reference; + +/** + * Defines the access point to deploy a component description. The class + * implementing this interface should have been parametrized with the + * description it is to work on + */ +public interface ComponentDeployer { + /** + * Deploys description for which this deployer was created. + * + * @param name name of embedded description to deploy (can be null) + * @param parent parent for deployed component + * @param params parameters to add before deployment (can be null) + * + * @return deployer component + * + * @exception SmartFrogDeploymentException failed to deploy + */ + public Prim deploy(Reference name, Prim parent, Context params) + throws SmartFrogDeploymentException; +} Property changes on: branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/deployer/ComponentDeployer.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/deployer/ComponentFactoryDeployerImpl.java =================================================================== --- branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/deployer/ComponentFactoryDeployerImpl.java 2007-06-29 10:00:39 UTC (rev 4490) +++ branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/deployer/ComponentFactoryDeployerImpl.java 2007-06-29 10:10:43 UTC (rev 4491) @@ -4,7 +4,7 @@ import org.smartfrog.sfcore.common.SmartFrogCoreKeys; import org.smartfrog.sfcore.common.SmartFrogDeploymentException; import org.smartfrog.sfcore.common.SmartFrogResolutionException; -import org.smartfrog.sfcore.componentdescription.ComponentDeployer; +import org.smartfrog.sfcore.deployer.ComponentDeployer; import org.smartfrog.sfcore.componentdescription.ComponentDescription; import org.smartfrog.sfcore.logging.LogFactory; import org.smartfrog.sfcore.prim.Prim; Modified: branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/deployer/SFDeployer.java =================================================================== --- branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/deployer/SFDeployer.java 2007-06-29 10:00:39 UTC (rev 4490) +++ branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/deployer/SFDeployer.java 2007-06-29 10:10:43 UTC (rev 4491) @@ -31,7 +31,7 @@ import org.smartfrog.sfcore.common.SmartFrogResolutionException; import org.smartfrog.sfcore.common.SmartFrogDeploymentException; import org.smartfrog.sfcore.componentdescription.ComponentDescription; -import org.smartfrog.sfcore.componentdescription.ComponentDeployer; +import org.smartfrog.sfcore.deployer.ComponentDeployer; import org.smartfrog.sfcore.prim.Prim; import org.smartfrog.sfcore.reference.Reference; import org.smartfrog.sfcore.security.SFClassLoader; Modified: branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/prim/PrimDeployerImpl.java =================================================================== --- branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/prim/PrimDeployerImpl.java 2007-06-29 10:00:39 UTC (rev 4490) +++ branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/prim/PrimDeployerImpl.java 2007-06-29 10:10:43 UTC (rev 4491) @@ -30,7 +30,7 @@ import org.smartfrog.sfcore.common.SmartFrogException; import org.smartfrog.sfcore.common.SmartFrogResolutionException; import org.smartfrog.sfcore.common.SmartFrogRuntimeException; -import org.smartfrog.sfcore.componentdescription.ComponentDeployer; +import org.smartfrog.sfcore.deployer.ComponentDeployer; import org.smartfrog.sfcore.componentdescription.ComponentDescription; import org.smartfrog.sfcore.componentdescription.ComponentDescriptionImpl; import org.smartfrog.sfcore.common.ContextImpl; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |