You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ch...@apache.org on 2003/11/16 07:36:03 UTC
cvs commit: incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router JMXRouter.java JMXTarget.java RouterTarget.java
chirino 2003/11/15 22:36:03
Modified: modules/remoting maven.xml project.xml
modules/remoting/src/deploy remoting-service.xml
modules/remoting/src/java/org/apache/geronimo/remoting/jmx
MBeanServerStub.java
modules/remoting/src/java/org/apache/geronimo/remoting/router
JMXRouter.java JMXTarget.java RouterTarget.java
Log:
Stopped using xdoclet...
Revision Changes Path
1.2 +2 -12 incubator-geronimo/modules/remoting/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/remoting/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 16 Nov 2003 05:27:26 -0000 1.1
+++ maven.xml 16 Nov 2003 06:36:02 -0000 1.2
@@ -9,17 +9,7 @@
xmlns:xdoclet="common:xdoclet"
>
-
- <preGoal name="test:compile">
- <attainGoal name="xdoclet:jmxdoclet:test-compile"/>
- </preGoal>
-
- <preGoal name="java:compile">
- <attainGoal name="xdoclet:jmxdoclet:compile"/>
- </preGoal>
-
-
- <!-- Set up the test files -->
+ <!-- Set up the test files -->
<postGoal name="test:test-resources">
<j:jelly xmlns="jelly:ant">
1.2 +1 -41 incubator-geronimo/modules/remoting/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/remoting/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 16 Nov 2003 05:27:26 -0000 1.1
+++ project.xml 16 Nov 2003 06:36:02 -0000 1.2
@@ -28,46 +28,6 @@
<dependencies>
<!-- Plugin Dependencies -->
- <dependency>
- <id>commons-collections</id>
- <version>2.1</version>
- <properties>
- <runtime>false</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>xdoclet</id>
- <version>1.2b2</version>
- <properties>
- <runtime>false</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>xdoclet+xdoclet-module</id>
- <version>1.2b2</version>
- <properties>
- <runtime>false</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>xdoclet+jmx-module</id>
- <version>1.2b2</version>
- <properties>
- <runtime>false</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>xdoclet+xjavadoc</id>
- <version>1.2b2</version>
- <properties>
- <runtime>false</runtime>
- </properties>
- </dependency>
-
<!-- Module Dependencies -->
<dependency>
1.2 +1 -1 incubator-geronimo/modules/remoting/src/deploy/remoting-service.xml
Index: remoting-service.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/remoting/src/deploy/remoting-service.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- remoting-service.xml 16 Nov 2003 05:27:27 -0000 1.1
+++ remoting-service.xml 16 Nov 2003 06:36:03 -0000 1.2
@@ -42,7 +42,7 @@
<!-- Expose the MBeanServer via remoting URI -->
<!-- async://localhost:3434/JMX#geronimo.jmx:target=MBeanServerStub -->
<!-- ============================================================ -->
- <mbean code="org.apache.geronimo.remoting.jmx.MBeanServerStub"
+ <mbean descriptor="org/apache/geronimo/remoting/jmx/MBeanServerStub.xml"
name="geronimo.remoting:target=MBeanServerStub">
</mbean>
1.2 +35 -11 incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/jmx/MBeanServerStub.java
Index: MBeanServerStub.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/jmx/MBeanServerStub.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MBeanServerStub.java 16 Nov 2003 05:27:27 -0000 1.1
+++ MBeanServerStub.java 16 Nov 2003 06:36:03 -0000 1.2
@@ -56,35 +56,32 @@
package org.apache.geronimo.remoting.jmx;
import org.apache.geronimo.core.service.Interceptor;
+import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
+import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
import org.apache.geronimo.proxy.ProxyContainer;
import org.apache.geronimo.proxy.ReflexiveInterceptor;
import org.apache.geronimo.remoting.DeMarshalingInterceptor;
-import org.apache.geronimo.kernel.service.AbstractManagedObject;
/**
- *
- * @jmx:mbean
- * extends="org.apache.geronimo.kernel.management.ManagedObject,org.apache.geronimo.kernel.management.StateManageable,org.apache.geronimo.remoting.router.JMXTargetMBean"
- *
* @version $Revision$ $Date$
*/
public class MBeanServerStub
- extends AbstractManagedObject
- implements MBeanServerStubMBean {
+ implements GeronimoMBeanTarget {
private ProxyContainer serverContainer;
private DeMarshalingInterceptor demarshaller;
+ private GeronimoMBeanContext geronimoMBeanContext;
/**
* @see org.apache.geronimo.kernel.service.AbstractManagedObject#doStart()
*/
- protected void doStart() throws Exception {
+ public void doStart() {
// Setup the server side contianer..
serverContainer = new ProxyContainer();
demarshaller = new DeMarshalingInterceptor();
serverContainer.addInterceptor(demarshaller);
- serverContainer.addInterceptor(new ReflexiveInterceptor(server));
+ serverContainer.addInterceptor(new ReflexiveInterceptor(geronimoMBeanContext.getServer()));
// Configure the server side interceptors.
demarshaller.setClassloader(getClass().getClassLoader());
@@ -93,7 +90,7 @@
/**
* @see org.apache.geronimo.kernel.service.AbstractManagedObject#doStop()
*/
- protected void doStop() throws Exception {
+ public void doStop() {
serverContainer = null;
demarshaller = null;
}
@@ -103,5 +100,32 @@
*/
public Interceptor getRemotingEndpointInterceptor() {
return demarshaller;
+ }
+
+ /**
+ * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#setMBeanContext(org.apache.geronimo.kernel.service.GeronimoMBeanContext)
+ */
+ public void setMBeanContext(GeronimoMBeanContext geronimoMBeanContext) {
+ this.geronimoMBeanContext = geronimoMBeanContext;
+ }
+
+ /**
+ * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#canStart()
+ */
+ public boolean canStart() {
+ return true;
+ }
+
+ /**
+ * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#canStop()
+ */
+ public boolean canStop() {
+ return true;
+ }
+
+ /**
+ * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#doFail()
+ */
+ public void doFail() {
}
}
1.2 +2 -2 incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router/JMXRouter.java
Index: JMXRouter.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/remoting/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 16 Nov 2003 05:27:27 -0000 1.1
+++ JMXRouter.java 16 Nov 2003 06:36:03 -0000 1.2
@@ -92,7 +92,7 @@
*/
protected Interceptor lookupInterceptorFrom(URI to) throws MalformedObjectNameException {
ObjectName on = new ObjectName(to.getFragment());
- JMXTargetMBean bean = (JMXTargetMBean) MBeanProxyFactory.getProxy(JMXTargetMBean.class, geronimoMBeanContext.getServer(), on);
+ JMXTarget bean = (JMXTarget) MBeanProxyFactory.getProxy(JMXTarget.class, geronimoMBeanContext.getServer(), on);
return bean.getRemotingEndpointInterceptor();
}
1.2 +1 -7 incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router/JMXTarget.java
Index: JMXTarget.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router/JMXTarget.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMXTarget.java 16 Nov 2003 05:27:27 -0000 1.1
+++ JMXTarget.java 16 Nov 2003 06:36:03 -0000 1.2
@@ -58,15 +58,9 @@
import org.apache.geronimo.core.service.Interceptor;
/**
- *
- * @jmx:mbean
- *
* @version $Revision$ $Date$
*/
public interface JMXTarget
{
- /**
- * @jmx:managed-attribute
- */
Interceptor getRemotingEndpointInterceptor();
}
1.2 +1 -5 incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router/RouterTarget.java
Index: RouterTarget.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router/RouterTarget.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RouterTarget.java 16 Nov 2003 05:27:27 -0000 1.1
+++ RouterTarget.java 16 Nov 2003 06:36:03 -0000 1.2
@@ -56,15 +56,11 @@
package org.apache.geronimo.remoting.router;
/**
- *
- * @jmx:mbean
- *
* @version $Revision$ $Date$
*/
public interface RouterTarget
{
/**
- * @jmx:managed-attribute
*/
Router getRouter();
}