geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject cvs commit: incubator-geronimo/modules/core/src/test/org/apache/geronimo/test/protocol/mockproto MockInputStream.java
Date Mon, 01 Sep 2003 20:38:50 GMT
jdillon     2003/09/01 13:38:50

  Modified:    modules/core maven.xml
               modules/core/src/java/org/apache/geronimo/client
                        AppClientContainer.java
                        ClientDeploymentPlanner.java
               modules/core/src/java/org/apache/geronimo/deployment
                        DeploymentController.java DeploymentInfo.java
                        DeploymentPlanner.java
               modules/core/src/java/org/apache/geronimo/deployment/dependency
                        DependencyService.java
               modules/core/src/java/org/apache/geronimo/deployment/loader
                        ClassSpace.java
               modules/core/src/java/org/apache/geronimo/deployment/repository
                        ComponentRepository.java
               modules/core/src/java/org/apache/geronimo/deployment/scanner
                        DeploymentScanner.java
               modules/core/src/java/org/apache/geronimo/deployment/service
                        ServiceDeployment.java
                        ServiceDeploymentPlanner.java
               modules/core/src/java/org/apache/geronimo/jmx
                        MBeanServerStub.java Relationship.java
               modules/core/src/java/org/apache/geronimo/remoting/router
                        AbstractInterceptorRouter.java
                        AbstractRouterRouter.java
                        InterceptorRegistryRouter.java JMXRouter.java
                        SubsystemRouter.java
               modules/core/src/java/org/apache/geronimo/remoting/transport
                        TransportLoader.java
               modules/core/src/test/org/apache/geronimo/deployment/dependency
                        Person.java
               modules/core/src/test/org/apache/geronimo/deployment/goal
                        DeployURLTest.java
               modules/core/src/test/org/apache/geronimo/test/protocol/mockproto
                        MockInputStream.java
  Removed:     modules/core/src/java/org/apache/geronimo/client
                        AppClientContainerMBean.java
                        ClientDeploymentPlannerMBean.java
               modules/core/src/java/org/apache/geronimo/deployment
                        DeployerMBean.java DeploymentControllerMBean.java
                        DeploymentInfoMBean.java
                        DeploymentPlannerMBean.java
               modules/core/src/java/org/apache/geronimo/deployment/dependency
                        DependencyServiceMBean.java
               modules/core/src/java/org/apache/geronimo/deployment/loader
                        ClassSpaceMBean.java
               modules/core/src/java/org/apache/geronimo/deployment/repository
                        ComponentRepositoryMBean.java
               modules/core/src/java/org/apache/geronimo/deployment/scanner
                        DeploymentScannerMBean.java
               modules/core/src/java/org/apache/geronimo/deployment/service
                        ServiceDeploymentMBean.java
                        ServiceDeploymentPlannerMBean.java
               modules/core/src/java/org/apache/geronimo/jmx
                        MBeanServerStubMBean.java RelationshipMBean.java
               modules/core/src/java/org/apache/geronimo/remoting/router
                        AbstractInterceptorRouterMBean.java
                        AbstractRouterRouterMBean.java
                        InterceptorRegistryRouterMBean.java
                        JMXRouterMBean.java JMXTargetMBean.java
                        RouterTargetMBean.java SubsystemRouterMBean.java
               modules/core/src/java/org/apache/geronimo/remoting/transport
                        TransportLoaderMBean.java
               modules/core/src/test/org/apache/geronimo/deployment/dependency
                        PersonMBean.java
  Log:
   o Using XDoclet to generate all MBean interfaces
  
  Revision  Changes    Path
  1.17      +5 -1      incubator-geronimo/modules/core/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/maven.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- maven.xml	1 Sep 2003 19:47:39 -0000	1.16
  +++ maven.xml	1 Sep 2003 20:38:48 -0000	1.17
  @@ -13,6 +13,10 @@
       <attainGoal name="html2xdoc"/>
     </preGoal>
     
  +  <preGoal name="test:compile">
  +    <attainGoal name="xdoclet:jmxdoclet:test-compile"/>
  +  </preGoal>
  +  
     <preGoal name="java:compile">
       <attainGoal name="xdoclet:jmxdoclet:compile"/>
     </preGoal>
  
  
  
  1.2       +19 -5     incubator-geronimo/modules/core/src/java/org/apache/geronimo/client/AppClientContainer.java
  
  Index: AppClientContainer.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/client/AppClientContainer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AppClientContainer.java	23 Aug 2003 22:14:20 -0000	1.1
  +++ AppClientContainer.java	1 Sep 2003 20:38:48 -0000	1.2
  @@ -65,6 +65,8 @@
   
   /**
    *
  + * @jmx:mbean
  + *      extends="org.apache.geronimo.common.RPCContainer,org.apache.geronimo.management.StateManageable"
    *
    * @version $Revision$ $Date$
    */
  @@ -76,19 +78,31 @@
   
       public AppClientContainer() throws DeploymentException {
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public void setMainClassName(String className) {
           mainClassName = className;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public String getMainClassName() {
           return mainClassName;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public URL getClientURL() {
           return clientURL;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public void setClientURL(URL clientURL) {
           this.clientURL = clientURL;
       }
  
  
  
  1.3       +3 -1      incubator-geronimo/modules/core/src/java/org/apache/geronimo/client/ClientDeploymentPlanner.java
  
  Index: ClientDeploymentPlanner.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/client/ClientDeploymentPlanner.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ClientDeploymentPlanner.java	27 Aug 2003 03:43:36 -0000	1.2
  +++ ClientDeploymentPlanner.java	1 Sep 2003 20:38:49 -0000	1.3
  @@ -61,6 +61,8 @@
   
   /**
    *
  + * @jmx:mbean
  + *      extends="org.apache.geronimo.deployment.DeploymentPlanner"
    *
    * @version $Revision$ $Date$
    */
  
  
  
  1.7       +22 -8     incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/DeploymentController.java
  
  Index: DeploymentController.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/DeploymentController.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DeploymentController.java	16 Aug 2003 19:03:09 -0000	1.6
  +++ DeploymentController.java	1 Sep 2003 20:38:49 -0000	1.7
  @@ -87,11 +87,13 @@
   
   /**
    *
  - *
  + * @jmx:mbean
    *
    * @version $Revision$ $Date$
    */
  -public class DeploymentController implements MBeanRegistration, DeploymentControllerMBean {
  +public class DeploymentController
  +    implements MBeanRegistration, DeploymentControllerMBean
  +{
       private static final ObjectName DEFAULT_NAME = JMXUtil.getObjectName("geronimo.deployment:role=DeploymentController");
   
       private static final Log log = LogFactory.getLog(DeploymentController.class);
  @@ -144,7 +146,10 @@
   
       public void postDeregister() {
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public synchronized void planDeployment(ObjectName source, Set urlInfos) {
           // find new and existing urlInfos
           for (Iterator i = urlInfos.iterator(); i.hasNext();) {
  @@ -184,8 +189,11 @@
               return;
           }
       }
  -
  -    private boolean isDeployed(URL url) {
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
  +    public boolean isDeployed(URL url) {
           try {
               ObjectName pattern = new ObjectName("*:role=DeploymentUnit,url=" + ObjectName.quote(url.toString()) + ",*");
               return !server.queryNames(pattern, null).isEmpty();
  @@ -193,7 +201,10 @@
               throw new AssertionError();
           }
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public synchronized void deploy(URL url) throws DeploymentException {
           if (isDeployed(url)) {
               return;
  @@ -216,7 +227,10 @@
               throw e;
           }
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public synchronized void undeploy(URL url) {
           if (!isDeployed(url)) {
               return;
  
  
  
  1.5       +33 -8     incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/DeploymentInfo.java
  
  Index: DeploymentInfo.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/DeploymentInfo.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DeploymentInfo.java	21 Aug 2003 04:32:41 -0000	1.4
  +++ DeploymentInfo.java	1 Sep 2003 20:38:49 -0000	1.5
  @@ -66,15 +66,22 @@
   
   /**
    *
  + * @jmx:mbean
  + *      extends="org.apache.geronimo.management.StateManageable,org.apache.geronimo.management.ManagedObject"
    *
    * @version $Revision$ $Date$
    */
  -public class DeploymentInfo extends AbstractManagedObject implements DeploymentInfoMBean {
  +public class DeploymentInfo
  +    extends AbstractManagedObject implements DeploymentInfoMBean
  +{
       private final URL url;
       private final ObjectName name;
       private final ObjectName parent;
       private final Set children = new HashSet();
  -
  +    
  +    /**
  +     * @jmx:managed-constructor
  +     */
       public DeploymentInfo(ObjectName name, ObjectName parent, URL url) {
           this.name = name;
           this.parent = parent;
  @@ -87,26 +94,44 @@
       protected void doStop() throws Exception {
       }
   
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public URL getURL() {
           return url;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public ObjectName getName() {
           return name;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public ObjectName getParent() {
           return parent;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public Collection getChildren() {
           return Collections.unmodifiableCollection(children);
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public synchronized void addChild(ObjectName childName) {
           children.add(childName);
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public synchronized void removeChild(ObjectName childName) {
           children.remove(childName);
       }
  
  
  
  1.2       +7 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/DeploymentPlanner.java
  
  Index: DeploymentPlanner.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/DeploymentPlanner.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DeploymentPlanner.java	16 Aug 2003 19:03:09 -0000	1.1
  +++ DeploymentPlanner.java	1 Sep 2003 20:38:49 -0000	1.2
  @@ -59,10 +59,14 @@
   
   /**
    *
  - *
  + * @jmx:mbean
    *
    * @version $Revision$ $Date$
    */
  -public interface DeploymentPlanner {
  +public interface DeploymentPlanner
  +{
  +    /**
  +     * @jmx:managed-operation
  +     */
       boolean plan(Set goals, Set plans) throws DeploymentException;
   }
  
  
  
  1.5       +47 -12    incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/dependency/DependencyService.java
  
  Index: DependencyService.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/dependency/DependencyService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DependencyService.java	20 Aug 2003 07:13:26 -0000	1.4
  +++ DependencyService.java	1 Sep 2003 20:38:49 -0000	1.5
  @@ -76,6 +76,7 @@
   
   /**
    *
  + * @jmx:mbean
    *
    * @version $Revision$ $Date$
    */
  @@ -106,7 +107,10 @@
   
       public void postDeregister() {
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public synchronized void addStartDependency(ObjectName startChild, ObjectName startParent) {
           Set startParents = (Set) startChildToParentMap.get(startChild);
           if (startParents == null) {
  @@ -122,7 +126,10 @@
           }
           startChildren.add(startChild);
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public synchronized void removeStartDependency(ObjectName startChild, ObjectName startParent) {
           Set startParents = (Set) startChildToParentMap.get(startChild);
           if (startParents != null) {
  @@ -134,7 +141,10 @@
               startChildren.remove(startChild);
           }
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public synchronized void addStartDependencies(ObjectName startChild, Set startParents) {
           Set existingStartParents = (Set) startChildToParentMap.get(startChild);
           if (existingStartParents == null) {
  @@ -154,7 +164,10 @@
               startChildren.add(startChild);
           }
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public synchronized Set getStartParents(ObjectName startChild) {
           Set startParents = (Set) startChildToParentMap.get(startChild);
           if (startParents == null) {
  @@ -165,6 +178,8 @@
   
       /**
        * Gets all of the MBeans that have a dependency on the specificed startParent.
  +     * 
  +     * @jmx:managed-operation
        */
       public synchronized Set getStartChildren(ObjectName startParent) {
           Set startChildren = (Set) startParentToChildMap.get(startParent);
  @@ -174,7 +189,9 @@
           return startChildren;
       }
   
  -
  +    /**
  +     * @jmx:managed-operation
  +     */
       public synchronized void addRelationships(ObjectName child, Set relationships) {
           Set existingRelationships = (Set) relationshipMap.get(child);
           if (existingRelationships == null) {
  @@ -204,7 +221,10 @@
               }
           }
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public synchronized Set getRelationships(ObjectName child) {
           Set relationships = (Set) relationshipMap.get(child);
           if (relationships == null) {
  @@ -212,7 +232,10 @@
           }
           return relationships;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public synchronized Set getCreateParents(ObjectName createChild) {
           Set createParents = (Set) createChildToParentMap.get(createChild);
           if (createParents == null) {
  @@ -220,7 +243,10 @@
           }
           return createParents;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public synchronized Set getCreateChildren(ObjectName createParent) {
           Set createChildren = (Set) createParentToChildMap.get(createParent);
           if (createChildren == null) {
  @@ -228,7 +254,10 @@
           }
           return createChildren;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public boolean canStart(ObjectName child) {
           Set createParents = null;
           synchronized (this) {
  @@ -283,7 +312,10 @@
           }
           return true;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public boolean canStop(ObjectName dependency) {
           Set dependents;
           synchronized (this) {
  @@ -319,7 +351,10 @@
           }
           return true;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public State shouldChangeState(ObjectName child) {
           Set relationships = null;
           synchronized (this) {
  
  
  
  1.3       +20 -5     incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/loader/ClassSpace.java
  
  Index: ClassSpace.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/loader/ClassSpace.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ClassSpace.java	20 Aug 2003 22:36:35 -0000	1.2
  +++ ClassSpace.java	1 Sep 2003 20:38:49 -0000	1.3
  @@ -65,12 +65,21 @@
   
   /**
    *
  + * @jmx:mbean
    *
    * @version $Revision$ $Date$
    */
  -public class ClassSpace extends URLClassLoader implements ClassSpaceMBean {
  -    private final Log log = LogFactory.getLog(getClass());
  +public class ClassSpace
  +    extends URLClassLoader
  +    implements ClassSpaceMBean
  +{
  +    private final static Log log = LogFactory.getLog(ClassSpace.class);
  +    
       private final String name;
  +    
  +    /**
  +     * @jmx:managed-constructor
  +     */
       public ClassSpace(String name, URL[] urls) {
           super(urls);
           this.name = name;
  @@ -79,14 +88,20 @@
               log.debug("Added url to class-space: name=" + name + " url=" +url);
           }
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public void addURLs(List urls) {
           for (Iterator i = urls.iterator(); i.hasNext();) {
               URL url = (URL) i.next();
               addURL(url);
           }
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public String getName() {
           return name;
       }
  
  
  
  1.3       +51 -13    incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/repository/ComponentRepository.java
  
  Index: ComponentRepository.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/repository/ComponentRepository.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ComponentRepository.java	14 Aug 2003 08:41:10 -0000	1.2
  +++ ComponentRepository.java	1 Sep 2003 20:38:49 -0000	1.3
  @@ -83,10 +83,15 @@
    * A proxy for a repository of components that can accessed remotely and
    * downloaded to the local machine.
    *
  + * @jmx:mbean
  + *
    * @version $Revision$ $Date$
    */
  -public class ComponentRepository implements ComponentRepositoryMBean,MBeanRegistration {
  -    private final Log log = LogFactory.getLog(getClass().getName());
  +public class ComponentRepository
  +    implements ComponentRepositoryMBean,MBeanRegistration
  +{
  +    private final static Log log = LogFactory.getLog(ComponentRepository.class);
  +    
       private final File localRoot;
       private MBeanServer server;
       private Set remoteRoots = new HashSet();
  @@ -94,6 +99,9 @@
       /**
        * Construct a repository using the specified local directory as root.
        * It will be created if it does not exists
  +     *
  +     * @jmx:managed-constructor
  +     *
        * @param localRoot the local root directory
        */
       public ComponentRepository(File localRoot) {
  @@ -118,29 +126,47 @@
   
       public void postDeregister() {
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public File getLocalRoot() {
           return localRoot;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public Set getRemoteRoots() {
           return Collections.unmodifiableSet(remoteRoots);
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public void addRemoteRoot(URL root) {
           remoteRoots.add(root);
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public void removeRemoteRoot(URL root) {
           remoteRoots.remove(root);
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public void ensureLocal(String name, String version, String location) {
           // @todo get rid of this and use a property editor
           ComponentDescription desc = new ComponentDescription(name, version, location);
           ensureLocal(desc);
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public boolean ensureLocal(ComponentDescription desc) {
           String location = desc.getLocation();
           File localFile = new File(localRoot, location);
  @@ -204,13 +230,19 @@
           }
           return false;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public void removeLocal(String name, String version, String location) {
           // @todo get rid of this and use a property editor
           ComponentDescription desc = new ComponentDescription(name, version, location);
           removeLocal(desc);
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public void removeLocal(ComponentDescription desc) {
           String location = desc.getLocation();
           File localFile = new File(localRoot, location);
  @@ -218,13 +250,19 @@
               localFile.delete();
           }
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public void deploy(String name, String version, String location) throws DeploymentException {
           // @todo get rid of this and use a property editor
           ComponentDescription desc = new ComponentDescription(name, version, location);
           deploy(desc);
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public void deploy(ComponentDescription desc) throws DeploymentException {
           if (!ensureLocal(desc)) {
               throw new DeploymentException("Could not obtain local copy of "+desc.getName()+" "+desc.getVersion());
  
  
  
  1.14      +51 -14    incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner/DeploymentScanner.java
  
  Index: DeploymentScanner.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner/DeploymentScanner.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DeploymentScanner.java	28 Aug 2003 11:19:17 -0000	1.13
  +++ DeploymentScanner.java	1 Sep 2003 20:38:49 -0000	1.14
  @@ -84,19 +84,32 @@
    * An MBean that maintains a list of URLs and periodically invokes a Scanner
    * to search them for deployments.
    *
  + * @jmx:mbean
  + *      extends="org.apache.geronimo.management.StateManageable,org.apache.geronimo.management.ManagedObject"
  + *
    * @version $Revision$ $Date$
    */
  -public class DeploymentScanner extends AbstractManagedObject implements DeploymentScannerMBean {
  +public class DeploymentScanner
  +    extends AbstractManagedObject
  +    implements DeploymentScannerMBean
  +{
       private static final Log log = LogFactory.getLog(DeploymentScanner.class);
  +
       private RelationServiceMBean relationService;
       private final Map scanners = new HashMap();
       private long scanInterval;
       private boolean run;
       private Thread scanThread;
   
  +    /**
  +     * @jmx:managed-constructor
  +     */
       public DeploymentScanner() {
       }
       
  +    /**
  +     * @jmx:managed-constructor
  +     */
       public DeploymentScanner(final URL[] urls, final boolean recurse) 
       {
           for (int i=0; i<urls.length; i++ ) {
  @@ -108,30 +121,45 @@
           relationService = JMXUtil.getRelationService(server);
           return super.preRegister(server, objectName);
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public synchronized long getScanInterval() {
           return scanInterval;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public synchronized void setScanInterval(long scanInterval) {
           this.scanInterval = scanInterval;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public synchronized Set getWatchedURLs() {
           return Collections.unmodifiableSet(new HashSet(scanners.keySet()));
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public void addURL(String url, boolean recurse) throws MalformedURLException {
           addURL(Strings.toURL(url), recurse);
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public synchronized void addURL(URL url, boolean recurse) {
           if (!scanners.containsKey(url)) {
               Scanner scanner = getScannerForURL(url, recurse);
               scanners.put(url, scanner);
           }
       }
  -
  +    
       private Scanner getScannerForURL(URL url, boolean recurse) {
           String protocol = url.getProtocol();
           if ("file".equals(protocol)) {
  @@ -142,20 +170,26 @@
               throw new IllegalArgumentException("Unknown protocol " + protocol);
           }
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public void removeURL(String url) throws MalformedURLException {
           removeURL(new URL(url));
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public synchronized void removeURL(URL url) {
           scanners.remove(url);
       }
  -
  +    
       private synchronized boolean shouldScannerThreadRun() {
           return run;
       }
   
  -    public synchronized void doStart() throws Exception {
  +    protected synchronized void doStart() throws Exception {
           if (scanThread == null) {
               run = true;
               scanThread = new Thread("DeploymentScanner: ObjectName=" + objectName) {
  @@ -173,14 +207,17 @@
           }
       }
   
  -    public synchronized void doStop() throws Exception {
  +    protected synchronized void doStop() throws Exception {
           run = false;
           if (scanThread != null) {
               scanThread.interrupt();
               scanThread = null;
           }
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public void scanNow() {
           boolean logTrace = log.isTraceEnabled();
   
  
  
  
  1.2       +7 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/service/ServiceDeployment.java
  
  Index: ServiceDeployment.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/service/ServiceDeployment.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServiceDeployment.java	11 Aug 2003 17:59:11 -0000	1.1
  +++ ServiceDeployment.java	1 Sep 2003 20:38:49 -0000	1.2
  @@ -62,10 +62,15 @@
   
   /**
    *
  + * @jmx:mbean
  + *      extends="org.apache.geronimo.deployment.DeploymentInfoMBean"
    *
    * @version $Revision$ $Date$
    */
  -public class ServiceDeployment extends DeploymentInfo implements ServiceDeploymentMBean {
  +public class ServiceDeployment
  +    extends DeploymentInfo
  +    implements ServiceDeploymentMBean
  +{
       public ServiceDeployment(ObjectName name, ObjectName parent, URL url) {
           super(name, parent, url);
       }
  
  
  
  1.10      +8 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/service/ServiceDeploymentPlanner.java
  
  Index: ServiceDeploymentPlanner.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/service/ServiceDeploymentPlanner.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ServiceDeploymentPlanner.java	27 Aug 2003 03:43:36 -0000	1.9
  +++ ServiceDeploymentPlanner.java	1 Sep 2003 20:38:49 -0000	1.10
  @@ -102,11 +102,16 @@
   
   /**
    *
  + * @jmx:mbean
  + *      extends="org.apache.geronimo.deployment.DeploymentPlanner"
    *
    * @version $Revision$ $Date$
    */
  -public class ServiceDeploymentPlanner implements ServiceDeploymentPlannerMBean, MBeanRegistration {
  -    private Log log = LogFactory.getLog(getClass());
  +public class ServiceDeploymentPlanner
  +    implements ServiceDeploymentPlannerMBean, MBeanRegistration
  +{
  +    private static final Log log = LogFactory.getLog(ServiceDeploymentPlanner.class);
  +    
       private MBeanServer server;
       private ObjectName objectName;
       private RelationServiceMBean relationService;
  
  
  
  1.2       +9 -4      incubator-geronimo/modules/core/src/java/org/apache/geronimo/jmx/MBeanServerStub.java
  
  Index: MBeanServerStub.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/jmx/MBeanServerStub.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MBeanServerStub.java	29 Aug 2003 19:16:54 -0000	1.1
  +++ MBeanServerStub.java	1 Sep 2003 20:38:49 -0000	1.2
  @@ -62,9 +62,16 @@
   import org.apache.geronimo.remoting.DeMarshalingInterceptor;
   
   /**
  + *
  + * @jmx:mbean
  + *      extends="org.apache.geronimo.management.ManagedObject,org.apache.geronimo.management.StateManageable,org.apache.geronimo.remoting.router.JMXTargetMBean"
  + *
    * @version $Revision$ $Date$
    */
  -public class MBeanServerStub extends AbstractManagedObject implements MBeanServerStubMBean  {
  +public class MBeanServerStub
  +    extends AbstractManagedObject
  +    implements MBeanServerStubMBean
  +{
       
       private ProxyContainer serverContainer;
       private DeMarshalingInterceptor demarshaller;
  @@ -82,7 +89,6 @@
           
           // Configure the server side interceptors.
           demarshaller.setClassloader(getClass().getClassLoader());
  -        
       }
       
       /**
  @@ -99,5 +105,4 @@
       public Interceptor getRemotingEndpointInterceptor() {
           return demarshaller;
       }
  -
   }
  
  
  
  1.6       +71 -19    incubator-geronimo/modules/core/src/java/org/apache/geronimo/jmx/Relationship.java
  
  Index: Relationship.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/jmx/Relationship.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Relationship.java	18 Aug 2003 22:19:28 -0000	1.5
  +++ Relationship.java	1 Sep 2003 20:38:49 -0000	1.6
  @@ -73,11 +73,15 @@
   
   /**
    *
  + * @jmx:mbean
    *
    * @version $Revision$ $Date$
    */
  -public class Relationship implements MBeanRegistration, RelationshipMBean {
  -    private final Log log = LogFactory.getLog(getClass());
  +public class Relationship
  +    implements MBeanRegistration, RelationshipMBean
  +{
  +    private static final Log log = LogFactory.getLog(Relationship.class);
  +    
       private RelationServiceMBean relationService;
   
       private final String name;
  @@ -99,7 +103,10 @@
       private final int rightRoleMinimum;
       private final int rightRoleMaximum;
       private final String rightRoleDescription;
  -
  +    
  +    /**
  +     * @jmx:managed-constructor
  +     */
       public Relationship(String propertiesString) {
           Properties properties = new Properties();
           try {
  @@ -189,63 +196,108 @@
               return Collections.EMPTY_LIST;
           }
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public String getName() {
           return name;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public String getLeftRoleName() {
           return leftRoleName;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public String getLeftRoleClass() {
           return leftRoleClass;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public boolean isLeftRoleReadable() {
           return leftRoleReadable;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public boolean isLeftRoleWritable() {
           return leftRoleWritable;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public int getLeftRoleMinimum() {
           return leftRoleMinimum;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public int getLeftRoleMaximum() {
           return leftRoleMaximum;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public String getLeftRoleDescription() {
           return leftRoleDescription;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public String getRightRoleName() {
           return rightRoleName;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public String getRightRoleClass() {
           return rightRoleClass;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public boolean isRightRoleReadable() {
           return rightRoleReadable;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public boolean isRightRoleWritable() {
           return rightRoleWritable;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public int getRightRoleMinimum() {
           return rightRoleMinimum;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public int getRightRoleMaximum() {
           return rightRoleMaximum;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public String getRightRoleDescription() {
           return rightRoleDescription;
       }
  
  
  
  1.2       +16 -5     incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/AbstractInterceptorRouter.java
  
  Index: AbstractInterceptorRouter.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/AbstractInterceptorRouter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractInterceptorRouter.java	29 Aug 2003 19:16:54 -0000	1.1
  +++ AbstractInterceptorRouter.java	1 Sep 2003 20:38:49 -0000	1.2
  @@ -71,10 +71,16 @@
   import EDU.oswego.cs.dl.util.concurrent.TimeoutSync;
   
   /**
  + *
  + * @jmx:mbean
  + *      extends="org.apache.geronimo.management.ManagedObject,org.apache.geronimo.management.StateManageable"
  + *
    * @version $Revision$ $Date$
    */
  -abstract public class AbstractInterceptorRouter extends AbstractManagedObject implements Router, AbstractInterceptorRouterMBean {
  -
  +public abstract class AbstractInterceptorRouter
  +    extends AbstractManagedObject
  +    implements Router, AbstractInterceptorRouterMBean
  +{
       private long stoppedRoutingTimeout = 1000*60; // 1 min.
       
       /** 
  @@ -83,6 +89,9 @@
       private Sync routerLock = createNewRouterLock();
       
       /**
  +     *
  +     * @jmx:managed-attribute
  +     *
        * @return
        */
       public long getStoppedRoutingTimeout() {
  @@ -90,6 +99,9 @@
       }
   
       /**
  +     *
  +     * @jmx:managed-attribute
  +     *
        * @param stoppedRoutingTimeout
        */
       public void setStoppedRoutingTimeout(long stoppedRoutingTimeout) {
  @@ -106,7 +118,6 @@
       
       /**
        *
  -     *
        * @see org.apache.geronimo.remoting.transport.Router#sendRequest(java.net.URI, org.apache.geronimo.remoting.transport.Msg)
        */
       public Msg sendRequest(URI to, Msg msg) throws TransportException {
  @@ -132,6 +143,7 @@
       }
   
       /**
  +     *
        * @see org.apache.geronimo.remoting.transport.Router#sendDatagram(java.net.URI, org.apache.geronimo.remoting.transport.Msg)
        */
       public void sendDatagram(URI to, Msg msg) throws TransportException {
  @@ -169,5 +181,4 @@
       protected void doStop() throws Exception {
           routerLock = createNewRouterLock();
       }
  -
   }
  
  
  
  1.2       +13 -2     incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/AbstractRouterRouter.java
  
  Index: AbstractRouterRouter.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/AbstractRouterRouter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractRouterRouter.java	29 Aug 2003 19:16:54 -0000	1.1
  +++ AbstractRouterRouter.java	1 Sep 2003 20:38:49 -0000	1.2
  @@ -66,11 +66,16 @@
   import EDU.oswego.cs.dl.util.concurrent.TimeoutSync;
   
   /**
  + *
  + * @jmx:mbean
  + *      extends="org.apache.geronimo.management.ManagedObject,org.apache.geronimo.management.StateManageable"
  + *
    * @version $Revision$ $Date$
    */
   abstract public class AbstractRouterRouter
       extends AbstractManagedObject
  -    implements Router, AbstractInterceptorRouterMBean {
  +    implements Router, AbstractInterceptorRouterMBean
  +{
   
       private long stoppedRoutingTimeout = 1000 * 60; // 1 min.
   
  @@ -80,6 +85,9 @@
       private Sync routerLock = createNewRouterLock();
   
       /**
  +     *
  +     * @jmx:managed-attribute
  +     *
        * @return
        */
       public long getStoppedRoutingTimeout() {
  @@ -87,6 +95,9 @@
       }
   
       /**
  +     *
  +     * @jmx:managed-attribute
  +     *
        * @param stoppedRoutingTimeout
        */
       public void setStoppedRoutingTimeout(long stoppedRoutingTimeout) {
  
  
  
  1.2       +9 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/InterceptorRegistryRouter.java
  
  Index: InterceptorRegistryRouter.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/InterceptorRegistryRouter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InterceptorRegistryRouter.java	29 Aug 2003 19:16:54 -0000	1.1
  +++ InterceptorRegistryRouter.java	1 Sep 2003 20:38:49 -0000	1.2
  @@ -61,9 +61,16 @@
   import org.apache.geronimo.remoting.InterceptorRegistry;
   
   /**
  + *
  + * @jmx:mbean
  + *      extends="org.apache.geronimo.remoting.router.AbstractInterceptorRouterMBean,org.apache.geronimo.remoting.router.RouterTargetMBean"
  + *
    * @version $Revision$ $Date$
    */
  -public class InterceptorRegistryRouter extends AbstractInterceptorRouter implements Router, InterceptorRegistryRouterMBean {
  +public class InterceptorRegistryRouter
  +    extends AbstractInterceptorRouter
  +    implements Router, InterceptorRegistryRouterMBean
  +{
   
       /**
        * @see org.apache.geronimo.remoting.router.AbstractInterceptorRouter#lookupInterceptorFrom(java.net.URI)
  
  
  
  1.2       +8 -5      incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/JMXRouter.java
  
  Index: JMXRouter.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/JMXRouter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JMXRouter.java	29 Aug 2003 19:16:54 -0000	1.1
  +++ JMXRouter.java	1 Sep 2003 20:38:49 -0000	1.2
  @@ -68,10 +68,15 @@
    * Uses JMX Object names to route the request to a JMX object that implements the 
    * JMXTargetMBean interface.
    * 
  + * @jmx:mbean
  + *      extends="org.apache.geronimo.remoting.router.AbstractInterceptorRouterMBean,org.apache.geronimo.remoting.router.RouterTargetMBean"
  + *
    * @version $Revision$ $Date$
    */
  -public class JMXRouter extends AbstractInterceptorRouter implements JMXRouterMBean {
  -
  +public class JMXRouter
  +    extends AbstractInterceptorRouter
  +    implements JMXRouterMBean
  +{
       /**
        * @see org.apache.geronimo.remoting.router.AbstractInterceptorRouter#lookupInterceptorFrom(java.net.URI)
        */
  @@ -87,6 +92,4 @@
       public Router getRouter() {
           return this;
       }
  -
  -
   }
  
  
  
  1.2       +13 -4     incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/SubsystemRouter.java
  
  Index: SubsystemRouter.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/SubsystemRouter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SubsystemRouter.java	29 Aug 2003 19:16:54 -0000	1.1
  +++ SubsystemRouter.java	1 Sep 2003 20:38:49 -0000	1.2
  @@ -71,10 +71,16 @@
   import org.apache.geronimo.jmx.MBeanProxyFactory;
   
   /**
  + *
  + * @jmx:mbean
  + *      extends="org.apache.geronimo.remoting.router.AbstractRouterRouterMBean,org.apache.geronimo.remoting.router.RouterTargetMBean"
  + *
    * @version $Revision$ $Date$
    */
  -public class SubsystemRouter extends AbstractRouterRouter implements SubsystemRouterMBean {
  -
  +public class SubsystemRouter
  +    extends AbstractRouterRouter
  +    implements SubsystemRouterMBean
  +{
       String relationshipID = "Route";
       Map currentRoutingMap = new HashMap();
   
  @@ -127,7 +133,10 @@
               }
           }
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public void restart() throws Exception {
           doStop();
           doStart();
  
  
  
  1.4       +27 -3     incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/transport/TransportLoader.java
  
  Index: TransportLoader.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/transport/TransportLoader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TransportLoader.java	29 Aug 2003 19:16:53 -0000	1.3
  +++ TransportLoader.java	1 Sep 2003 20:38:49 -0000	1.4
  @@ -65,10 +65,16 @@
   import org.apache.geronimo.remoting.router.*;
   
   /**
  + *
  + * @jmx:mbean
  + *      extends="org.apache.geronimo.management.ManagedObject,org.apache.geronimo.management.StateManageable"
  + *
    * @version $Revision$ $Date$
    */
  -public class TransportLoader extends AbstractManagedObject implements TransportLoaderMBean {
  -
  +public class TransportLoader
  +    extends AbstractManagedObject
  +    implements TransportLoaderMBean
  +{
       URI bindURI;
       TransportServer transportServer;
       Router dispatchingRouter;
  @@ -107,6 +113,9 @@
   
       }
       /**
  +     *
  +     * @jmx:managed-attribute
  +     *
        * @return
        */
       public URI getBindURI() {
  @@ -114,6 +123,9 @@
       }
   
       /**
  +     *
  +     * @jmx:managed-attribute
  +     *
        * @param bindURI
        */
       public void setBindURI(URI bindURI) {
  @@ -121,6 +133,9 @@
       }
   
       /**
  +     *
  +     * @jmx:managed-attribute
  +     *
        * @return
        */
       public Router getDispatchingRouter() {
  @@ -128,6 +143,9 @@
       }
   
       /**
  +     *
  +     * @jmx:managed-attribute
  +     *
        * @param dispatchingRouter
        */
       public void setDispatchingRouter(Router dispatchingRouter) {
  @@ -135,6 +153,9 @@
       }
   
       /**
  +     *
  +     * @jmx:managed-attribute
  +     *
        * @param dispatchingRouter
        */
       public void setRouterTarget(String ob) throws MalformedObjectNameException {
  @@ -142,6 +163,9 @@
       }
   
       /**
  +     *
  +     * @jmx:managed-attribute
  +     *
        * @return
        */
       public URI getClientConnectURI() {
  
  
  
  1.3       +26 -6     incubator-geronimo/modules/core/src/test/org/apache/geronimo/deployment/dependency/Person.java
  
  Index: Person.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/test/org/apache/geronimo/deployment/dependency/Person.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Person.java	21 Aug 2003 04:33:32 -0000	1.2
  +++ Person.java	1 Sep 2003 20:38:49 -0000	1.3
  @@ -59,30 +59,50 @@
   
   /**
    *
  + * @jmx:mbean
  + *      extends="org.apache.geronimo.management.StateManageable,org.apache.geronimo.management.ManagedObject"
    *
    * @version $Revision$ $Date$
    */
  -public class Person extends AbstractManagedObject implements PersonMBean {
  +public class Person
  +    extends AbstractManagedObject
  +    implements PersonMBean
  +{
       private String name;
       private boolean doStartCalled = false;
       private boolean doStopCalled = false;
   
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public String getName() {
           return name;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public void setName(String name) {
           this.name = name;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public boolean isDoStartCalled() {
           return doStartCalled;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-attribute
  +     */
       public boolean isDoStopCalled() {
           return doStopCalled;
       }
  -
  +    
  +    /**
  +     * @jmx:managed-operation
  +     */
       public void reset() {
           doStartCalled = false;
           doStopCalled = false;
  
  
  
  1.2       +84 -84    incubator-geronimo/modules/core/src/test/org/apache/geronimo/deployment/goal/DeployURLTest.java
  
  Index: DeployURLTest.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/test/org/apache/geronimo/deployment/goal/DeployURLTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DeployURLTest.java	27 Aug 2003 11:40:01 -0000	1.1
  +++ DeployURLTest.java	1 Sep 2003 20:38:49 -0000	1.2
  @@ -1,84 +1,84 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 2003 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *       "This product includes software developed by the
  - *        Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software itself,
  - *    if and wherever such third-party acknowledgments normally appear.
  - *
  - * 4. The names "Apache" and "Apache Software Foundation" and
  - *    "Apache Geronimo" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    "Apache Geronimo", nor may "Apache" appear in their name, without
  - *    prior written permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - *
  - * ====================================================================
  - */
  -
  -package org.apache.geronimo.deployment.goal;
  -
  -import java.net.MalformedURLException;
  -import java.net.URI;
  -import java.net.URL;
  -
  -import org.apache.geronimo.deployment.scanner.URLType;
  -
  -import junit.framework.TestCase;
  -
  -/**
  - * Unit tests for {@link DeployURL} class.
  - *
  - * @version $Revision$ $Date$
  - */
  -public class DeployURLTest
  -    extends TestCase
  -{
  -    public void testFileUrlWithSpace() {
  -        try {
  -            DeployURL goal = new DeployURL(new URL("file:///C:/Program Files/Apache Group/Geronimo"), URLType.UNPACKED_ARCHIVE);
  -            URL url = goal.getUrl();
  -            URI baseURI = URI.create(url.toString()).normalize();;        
  -        } catch (MalformedURLException e){
  -            fail(e.getMessage());
  -        }
  -    }
  -}
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2003 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Geronimo" must not be used to endorse or promote products
  + *    derived from this software without prior written permission. For
  + *    written permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    "Apache Geronimo", nor may "Apache" appear in their name, without
  + *    prior written permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + * ====================================================================
  + */
  +
  +package org.apache.geronimo.deployment.goal;
  +
  +import java.net.MalformedURLException;
  +import java.net.URI;
  +import java.net.URL;
  +
  +import org.apache.geronimo.deployment.scanner.URLType;
  +
  +import junit.framework.TestCase;
  +
  +/**
  + * Unit tests for {@link DeployURL} class.
  + *
  + * @version $Revision$ $Date$
  + */
  +public class DeployURLTest
  +    extends TestCase
  +{
  +    public void testFileUrlWithSpace() {
  +        try {
  +            DeployURL goal = new DeployURL(new URL("file:///C:/Program Files/Apache Group/Geronimo"), URLType.UNPACKED_ARCHIVE);
  +            URL url = goal.getUrl();
  +            URI baseURI = URI.create(url.toString()).normalize();;        
  +        } catch (MalformedURLException e){
  +            fail(e.getMessage());
  +        }
  +    }
  +}
  
  
  
  1.2       +2 -2      incubator-geronimo/modules/core/src/test/org/apache/geronimo/test/protocol/mockproto/MockInputStream.java
  
  Index: MockInputStream.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/test/org/apache/geronimo/test/protocol/mockproto/MockInputStream.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MockInputStream.java	30 Aug 2003 12:32:32 -0000	1.1
  +++ MockInputStream.java	1 Sep 2003 20:38:49 -0000	1.2
  @@ -77,4 +77,4 @@
       public void close() throws IOException {
           conn.close();
       }
  -}
  \ No newline at end of file
  +}
  
  
  

Mime
View raw message