From: <ju...@us...> - 2007-02-22 00:47:55
|
Revision: 3910 http://svn.sourceforge.net/smartfrog/?rev=3910&view=rev Author: julgui Date: 2007-02-21 16:47:54 -0800 (Wed, 21 Feb 2007) Log Message: ----------- Modified to use MX4J. Modified Paths: -------------- trunk/core/components/jmx/bin/sfMBeanBrowser.bat trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/SFJMXAgentImpl.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/Communicator.sf trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/html/HtmlAdaptor.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/html/HtmlAdaptorMBean.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiConnectorClient.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployer/MBeanDeployer.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/arithNetManager/launchArithExample.sf trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/cascading.sf trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/deployment.sf trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/dynamicmbean.sf trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/mbeanDeployer/simpleMBeanDeployerExample.sf trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/modelmbean.sf trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/sfmbean.sf trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbean/mbean.sf trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MBeanBrowser.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MBeanBrowser.sf trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MainFrame.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/TreePanel.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/TreePopupMenu.java trunk/core/components/jmx/src/org/smartfrog/services/jmx/modelmbean/SFModelMBean.java Added Paths: ----------- trunk/core/components/jmx/bin/sfStartJMXAgent trunk/core/components/jmx/bin/sfStartJMXAgent.bat trunk/core/components/jmx/bin/sfStopJMXAgent trunk/core/components/jmx/bin/sfStopJMXAgent.bat trunk/core/components/jmx/build_old.xml Modified: trunk/core/components/jmx/bin/sfMBeanBrowser.bat =================================================================== --- trunk/core/components/jmx/bin/sfMBeanBrowser.bat 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/bin/sfMBeanBrowser.bat 2007-02-22 00:47:54 UTC (rev 3910) @@ -1,4 +1,4 @@ -@echo off +@echo on setlocal if defined SFHOME goto continue1 @@ -7,10 +7,11 @@ cd bin :continue1 -call %SFHOME%\bin\setClassPath +call "%SFHOME%\bin\setSFProperties" +rem call %SFHOME%\bin\setClassPath.bat echo %CLASSPATH% rem java org.smartfrog.services.jmx.mbeanbrowser.MBeanBrowser rmi://localhost:3800/RMIConnectorServer java org.smartfrog.services.jmx.mbeanbrowser.MBeanBrowser %1 %2 %3 %4 %5 %6 %7 %8 -endlocal \ No newline at end of file +endlocal Added: trunk/core/components/jmx/bin/sfStartJMXAgent =================================================================== --- trunk/core/components/jmx/bin/sfStartJMXAgent (rev 0) +++ trunk/core/components/jmx/bin/sfStartJMXAgent 2007-02-22 00:47:54 UTC (rev 3910) @@ -0,0 +1,5 @@ +if ! test $SFHOME; then export SFHOME=$PWD; fi + +for i in $SFHOME/lib/*.jar; do CLASSPATH=$i:$CLASSPATH; done +export CLASSPATH +java com.hp.SmartFrog.SFSystem -h localhost -n sfJMXAgent $SFHOME/bin/sfJMXAgent.sf -e Added: trunk/core/components/jmx/bin/sfStartJMXAgent.bat =================================================================== --- trunk/core/components/jmx/bin/sfStartJMXAgent.bat (rev 0) +++ trunk/core/components/jmx/bin/sfStartJMXAgent.bat 2007-02-22 00:47:54 UTC (rev 3910) @@ -0,0 +1,12 @@ +@echo off +setlocal + +if defined SFHOME goto continue1 + if exist "%cd%\sfStartJMXAgent.bat" cd .. + set SFHOME=%cd% +:continue1 + +call %SFHOME%\bin\setClassPath + +java com.hp.SmartFrog.SFSystem -h localhost -n sfJMXAgent %SFHOME%/bin/sfJMXAgent.sf -e +endlocal Added: trunk/core/components/jmx/bin/sfStopJMXAgent =================================================================== --- trunk/core/components/jmx/bin/sfStopJMXAgent (rev 0) +++ trunk/core/components/jmx/bin/sfStopJMXAgent 2007-02-22 00:47:54 UTC (rev 3910) @@ -0,0 +1,5 @@ +if ! test $SFHOME; then export SFHOME=$PWD; fi + +for i in $SFHOME/lib/*.jar; do CLASSPATH=$i:$CLASSPATH; done +export CLASSPATH +java com.hp.SmartFrog.SFSystem -h localhost -t sfJMXAgent -e Added: trunk/core/components/jmx/bin/sfStopJMXAgent.bat =================================================================== --- trunk/core/components/jmx/bin/sfStopJMXAgent.bat (rev 0) +++ trunk/core/components/jmx/bin/sfStopJMXAgent.bat 2007-02-22 00:47:54 UTC (rev 3910) @@ -0,0 +1,12 @@ +@echo off +setlocal + +if defined SFHOME goto continue1 + if exist "%cd%\sfStopJMXAgent.bat" cd .. + set SFHOME=%cd% + cd bin +:continue1 + +call %SFHOME%\bin\setClassPath +java com.hp.SmartFrog.SFSystem -h localhost -t sfJMXAgent -e +endlocal Added: trunk/core/components/jmx/build_old.xml =================================================================== --- trunk/core/components/jmx/build_old.xml (rev 0) +++ trunk/core/components/jmx/build_old.xml 2007-02-22 00:47:54 UTC (rev 3910) @@ -0,0 +1,469 @@ +<?xml version="1.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 + */ +--> + +<project name="sfJMX" default="all" basedir="."> + <description> + Introduction + ============ + The build script for SmartFrog sfJMX components. + To run the build script ant must be installed + and ant executable should be in the system path. + + Installing the build tools + ========================== + Please go though the installation guide and install ant 1.6.5 or later. + Reference URL:http://ant.apache.org +</description> + <!-- =================================================================== --> + <!-- Initialization target --> + <!-- =================================================================== --> + <target name="init"> + <tstamp/> + <property name="Name.System" value="sfJMX"/> + <property name="Name.Company" value="(C) Copyright 1998-2005 Hewlett-Packard Development Company, LP"/> + <property name="version" value="CORE"/> + <property name="year" value="2005"/> + <echo level="verbose"> + =================================================================== + = ${Name.System} ${version} + " + + = ${Name.Company} + =================================================================== + (${ant.version}) + </echo> + <available property="nice.task.present" classname="org.apache.tools.ant.taskdefs.Nice"/> + </target> + <!-- =================================================================== --> + <!-- Help on usage --> + <!-- =================================================================== --> + <target name="help" depends="init" description="Help"> + <echo message=""/> + <echo message="-------------------------------------------------------------"/> + <echo message="${Name.System} ${version} Build file"/> + <echo message="-------------------------------------------------------------"/> + <echo message="* General: "/> + <echo message=" build --> recompiles and creates all packages"/> + <echo message=" dist --> prepares distribution package (Default)"/> + <echo message=" compile --> compiles the contributed source code"/> + <echo message=" sfParseTest --> runs sfParser for 'parsertargets' file"/> + <echo message=" jdocs --> generates the Java Docs API documentation"/> + <echo message=" clean --> restores the distribution to its clean state"/> + <echo message=" release --> clean, dist, jdocs"/> + <echo message=" all --> builds all the packages"/> + <echo message=" "/> + <echo message=" help --> this help"/> + <echo message="See the comments inside the build.xml file for more details."/> + <echo message="-------------------------------------------------------------"/> + <echo message=""/> + </target> + + <!-- =================================================================== --> + <!-- Global properties --> + <!-- =================================================================== --> + <property environment="env"/> + <property name="smartfrog.home" location="${env.SFHOME}" /> + + <!-- override point --> + <property file="build.properties"/> + + <!-- properties file to modify version.sf --> + <property file="${smartfrog.home}/smartfrog-version.properties"/> + <property file="sf-build-version.properties"/> + + <property name="Version" value="${sf.majorRelease}.${sf.minorRelease}.${sf.build}${sf.status}"/> + <echo level="verbose">sfJMX version=${Version}. Using SmartFrog core version=${sf.build.version} </echo> + <!-- =================================================================== --> + <!-- Initialization path (Libs needed for compiling) --> + <!-- =================================================================== --> + <path id="smartfrog.class.path"> + <pathelement location="${smartfrog.home}/lib/smartfrog-${sf.build.version}.jar"/> + <pathelement location="${smartfrog.home}/lib/sfServices-${sf.build.version}.jar"/> + <pathelement location="${smartfrog.home}/lib/sfExamples-${sf.build.version}.jar"/> + <pathelement location="lib/mx4j.jar"/> + <pathelement location="lib/mx4j-jmx.jar"/> + <pathelement location="lib/mx4j-tools.jar"/> + <pathelement location="lib/mx4j-examples.jar"/> + <pathelement location="lib/mx4j-impl.jar"/> + <pathelement location="lib/mx4j-remote.jar"/> + <pathelement location="lib/mx4j-rimpl.jar"/> + <pathelement location="lib/mx4j-rjmx.jar"/> + <pathelement location="lib/sf-scripting.jar"/> + </path> + + <!-- Release Directories --> + <property name="src" value="src"/> + <!-- where the source is --> + <property name="src.dir" location="src"/> + <!-- where the source is --> + <property name="build" location="build"/> + <!-- where the files for the jar file go --> + <!-- where the files for the jar file go --> + <property name="build.classes.dir" location="${build}"/> + <property name="dist.dir" location="dist"/> + <!-- where the files to zip go --> + <property name="releases.dir" location="releases"/> + <!-- where the dated zips go, don't clean --> + <property name="bin" value="bin"/> + <!-- where all the executables go --> + <property name="lib" value="lib"/> + <!-- where all the jar files go --> + <property name="signedLib" value="signedLib"/> + <!-- all protected files --> + <property name="docs" value="docs"/> + <property name="jdocs" value="${docs}/jdocs"/> + <property name="SFjdocs" value="${docs}/SFjdocs"/> + <property name="dist.lib.dir" location="${dist.dir}/${lib}"/> + <property name="dist.bin.dir" location="${dist.dir}/${bin}"/> + <property name="dist.src.dir" location="${dist.dir}/${src}"/> + <property name="dist.docs.dir" location="${dist.dir}/${docs}"/> + <property name="dist.jdocs.dir" location="${dist.dir}/${jdocs}"/> + <property name="dist.SFjdocs.dir" location="${dist.dir}/${SFjdocs}"/> + <property name="java.class.path" location="${dist.dir}/${SFjdocs}"/> + <!--property name="redist" value="redist"/ --> + <property name="examplesFiles" value="org/smartfrog/examples/**/*"/> + <!-- a list of files for rmic --> + <property name="rmitargets" value="${basedir}/rmitargets"/> + <!-- assume the sun compiler --> + <property name="rmic.compiler" value="sun"/> + <!-- Compile options for Smartfrog Release --> + <property name="javac.debug.mode" value="on"/> + <!-- turn on compile -g --> + <property name="javac.debug.level" value="lines,vars,source"/> + <property name="javac.java.version" value="1.4"/> + <property name="build.compiler" value="modern"/> + <property name="javac.compiler" value="${build.compiler}"/> + <!-- override point for javacc --> + <property name="javacc.dir" location="javacc"/> + <property name="private" value="private"/> + <!--property name="manifestName" value="${smartfrog.home}/${private}/sealManifest.mf"/--> + <property name="manifestName" location="sealManifest.mf"/> + <!-- ================================================================== --> + <!-- running Version.java to generate version information --> + <!-- ================================================================== --> + + <target name="generateversion" depends="initbuild"> + <echo level="verbose">version=${Version}</echo> + </target> + <!-- =================================================================== --> + <!-- Release --> + <!-- =================================================================== --> + <target name="release" depends="clean, dist,jdocs" description="Creates clean new release"> </target> + <!-- =================================================================== --> + <!-- --> + <!-- =================================================================== --> + <target name="initbuild" depends="init"> + <mkdir dir="${build}"/> + <mkdir dir="${build.classes.dir}"/> + </target> + <!-- =================================================================== --> + <!-- --> + <!-- =================================================================== --> + <target name="initdist" depends="init"> + <mkdir dir="${dist.dir}"/> + <delete dir="${dist.lib.dir}" failonerror="false"/> + <mkdir dir="${dist.lib.dir}"/> + <mkdir dir="${dist.bin.dir}"/> + <mkdir dir="${dist.docs.dir}"/> + <mkdir dir="${dist.src.dir}"/> + </target> + <!-- =================================================================== --> + <!-- FixCRLF for different platforms only inside DIST! --> + <!-- =================================================================== --> + <target name="fixCRLF" depends="copybins" description="adapts CRLF for different OS"> </target> + <!-- =================================================================== --> + <!-- --> + <!-- =================================================================== --> + <target name="initrelease" depends="init"> + <!-- Create the time stamp --> + <tstamp/> + <mkdir dir="${releases.dir}"/> + </target> + <!-- =================================================================== --> + <!-- Compiles source directory --> + <!-- =================================================================== --> + <target name="compile-source" depends="initbuild" description="Compiles the source code"> + <!-- use better dependency logic --> + <!-- + <depend srcdir="${src.dir}" + destdir="${build.classes.dir}" + cache="${build}/testdepends" + closure="yes"/> + --> + <!-- Compile the java code --> + <echo>${javac.java.version} build.compiler=${build.compiler} javac.compiler=${javac.compiler}</echo> + <javac compiler="${javac.compiler}" srcdir="${src.dir}" includes="**/*.java" destdir="${build.classes.dir}" debug="${javac.debug.mode}" debuglevel="${javac.debug.level}" includeAntRuntime="false" source="${javac.java.version}" target="${javac.java.version}"> + <classpath refid="smartfrog.class.path"/> + </javac> + </target> + <target name="compile-rmi" depends="compile-source"> + <!-- + the RMI compile is split in two, as the compiler could not + handle it otherwise. + It is tempting to run these in parallel, to get speedup on multiway + CPUs, but as the SunRmic adapter runs rmic in-VM, that is too dangerous. + We'd need to fork rmic to get decent isolation. + --> + <rmic includesfile="${rmitargets}" compiler="${rmic.compiler}" stubversion="1.2" base="${build.classes.dir}"> + <classpath refid="smartfrog.class.path"/> + </rmic> + </target> + <target name="compile" depends="compile-rmi" description="Compiles the source code"/> + <!-- =================================================================== --> + <!-- Copy default.sf and default.ini files to "src/org/smartfrog" directory --> + <!-- so that they can be used with security on --> + <!-- =================================================================== --> + <target name="copyDefault" depends="initbuild"> + <copy todir="${build.classes.dir}/org/smartfrog"> + <fileset dir="${bin}"> + <include name="default.sf"/> + <include name="default.ini"/> + </fileset> + </copy> + </target> + <!-- =================================================================== --> + <!-- Copy .sf files to "build" directories --> + <!-- =================================================================== --> + <target name="copySF" depends="initbuild"> + <copy todir="${build.classes.dir}"> + <fileset dir="${src.dir}"> + <include name="**/*.sf*"/> + </fileset> + </copy> + </target> + <!-- =================================================================== --> + <!-- Copy .sfcd files to "build" directories --> + <!-- These files should contain a list of configuration descriptors --> + <!-- =================================================================== --> + <target name="copySFCD" depends="initbuild"> + <copy todir="${build.classes.dir}"> + <fileset dir="${src.dir}"> + <include name="**/*.sfcd*"/> + </fileset> + </copy> + </target> + <!-- =================================================================== --> + <!-- Copy .bat files to "build" directories --> + <!-- =================================================================== --> + <target name="copyBAT" depends="initbuild"> + <copy todir="${build.classes.dir}"> + <fileset dir="${src.dir}"> + <include name="**/*.bat*"/> + </fileset> + </copy> + </target> + <!-- =================================================================== --> + <!-- Copy .html files to "build" directories --> + <!-- =================================================================== --> + <target name="copyHTML" depends="initbuild"> + <copy todir="${build.classes.dir}"> + <fileset dir="${src.dir}"> + <include name="**/*.htm*"/> + </fileset> + </copy> + </target> + <!-- =================================================================== --> + <!-- Copy Gif files to "build" directories --> + <!-- =================================================================== --> + <target name="copyGif" depends="initbuild"> + <copy todir="${build.classes.dir}"> + <fileset dir="${src.dir}"> + <include name="**/*.gif"/> + </fileset> + </copy> + </target> + <!-- =================================================================== --> + <!-- --> + <!-- =================================================================== --> + <target name="copylibs" depends="initdist"> + <copy todir="${dist.lib.dir}"> + <fileset dir="${lib}"> + <include name="**/*.jar"/> + </fileset> + </copy> + </target> + + <!-- =================================================================== --> + <!-- Copy binary files. --> + <!-- execute permissions are set on binary stuff, permissions that get --> + <!-- lost --> + <!-- =================================================================== --> + <target name="copybins" depends="initdist"> + <copy todir="${dist.bin.dir}"> + <fileset dir="${bin}"> + <include name="**/*"/> + <exclude name="**/*.bak"/> + <exclude name="**/tools"/> + </fileset> + </copy> + <chmod dir="${dist.bin.dir}" perm="ugo+rx" excludes="**/*.ico, **/*.ini, **/*.sf*,**/*.bat"/> + <chmod dir="${dist.bin.dir}/security" perm="ugo+rx" excludes="**/*.ico, **/*.ini, **/*.sf*,**/*.bat"/> + </target> + <!-- =================================================================== --> + <!-- Copy PDF, HTML files from docs to dist/docs --> + <!-- =================================================================== --> + <target name="copydocs" depends="initdist"> + <copy todir="${dist.docs.dir}"> + <fileset dir="${docs}"> + <include name="**/*.pdf"/> + <include name="**/*.html"/> + <include name="**/*.htm"/> + </fileset> + </copy> + </target> + <!-- =================================================================== --> + <!-- --> + <!-- =================================================================== --> + <target name="copyexamples" depends="initdist"> + <copy todir="${dist.src.dir}"> + <fileset dir="${src.dir}"> + <include name="${examplesFiles}"/> + <exclude name="**/*.dfPackage"/> + </fileset> + </copy> + </target> + <!-- =================================================================== --> + <!-- JDocs --> + <!-- =================================================================== --> + <target name="jdocs" depends="initdist,generateversion" description="Generates the API documentation"> + <!-- Java Docs for all --> + <echo message=""/> + <echo message="------------------------------------------------------------------------"/> + <echo message=" Creating Java Docs for ${Name.System} ${version} [${dist.dir}/${jdocs}]"/> + <echo message="------------------------------------------------------------------------"/> + <mkdir dir="${dist.jdocs.dir}"/> + <javadoc + packagenames="org.smartfrog.*" + sourcepath="${src.dir}" + destdir="${dist.jdocs.dir}" + author="true" + version="true" + use="true" + windowtitle="${Name.System}" + Header="${Name.System} ${Version}" + Footer="${Name.System} ${version} ${Version}" + doctitle="${Name.System}" + bottom="${Name.Company}" + source="${javac.java.version}"> + <group title="SmartFrog Packages" packages="org.smartfrog.*"/> + <classpath refid="smartfrog.class.path"/> + </javadoc> + <!-- Java doc for the grammars --> + <exec executable="java"> + <arg line="-cp ${javacc.dir}/javacc.jar"/> + <arg line="jjdoc"/> + <arg line="-OUTPUT_FILE=${docs}/DefaultParser.html"/> + <arg line="${src}/org/smartfrog/sfcore/languages/sf/DefaultParser.jj"/> + </exec> + </target> + <!-- =================================================================== --> + <!-- BUILD --> + <!-- =================================================================== --> + <target name="prebuild" + depends="initbuild,generateversion,compile,copySF,copyGif,copyBAT,copyHTML,copyDefault,copySFCD" /> + + <target name="build" + depends="prebuild" + description="Recompile and create all packages"/> + + <!-- =================================================================== --> + <!-- Jar Files --> + <!-- =================================================================== --> + + <target name="target-names" depends="init,generateversion"> + <property name="sfJMX.stub" value="sf-JMX-${Version}" /> + <property name="sfJMX.jar" + location="${dist.lib.dir}/${sfJMX.stub}.jar" /> + </target> + + <!-- sfJMX Jar --> + <target name="sfJMXJar" depends="build,target-names"> + <jar jarfile="${sfJMX.jar}" basedir="${build.classes.dir}" includes="**/**" manifest="${manifestName}"/> + </target> + + <target name="jars" depends="initdist,sfJMXJar"> + </target> + + + <!-- =================================================================== --> + <!-- create security buld file --> + <!-- =================================================================== --> + <target name="buildSetup"> + <copy tofile="${dist.dir}/parsertargets" file="parsertargets"/> + <copy tofile="${dist.dir}/COPYRIGHT.txt" file="COPYRIGHT.txt"/> + <copy tofile="${dist.dir}/LICENSE.txt" file="LICENSE.txt"/> + <copy tofile="${dist.dir}/changes.txt" file="changes.txt"/> + <copy tofile="${dist.dir}/readme.txt" file="readme.txt"/> + </target> + <!-- =================================================================== --> + <!-- DIST --> + <!-- =================================================================== --> + <target name="dist" depends="build,initdist,jars,copylibs,copybins,copydocs, copyexamples,buildSetup,fixCRLF,srczip" description="Prepares distribution package"> + </target> + <!-- =================================================================== --> + <!-- src.zip --> + <!-- =================================================================== --> + <target name="srczip" depends="initdist" description="Creates src.zip with SF sources"> + <zip destfile="${dist.dir}/src.zip"> + <zipfileset dir="${src}"> + <include name="**/**"/> + <exclude name="**/*.dfPackage"/> + </zipfileset> + </zip> + </target> + <!-- =================================================================== --> + <!-- clean --> + <!-- =================================================================== --> + <target name="clean" depends="init" description="Restores the distribution to its clean state"> + <!-- Delete the ${build} ${dist.dir} ${jdocs} directory trees --> + <!-- remove parser source files --> + <delete dir="${build}" failonerror="false"/> + <delete dir="${dist.dir}" failonerror="false"/> + </target> + <!-- =================================================================== --> + <!-- a clean distribution --> + <!-- =================================================================== --> + <target name="fromclean" depends="clean,sfParseTest,dist"/> + <!-- =================================================================== --> + <!-- sfParse parsertargets --> + <!-- =================================================================== --> + <target name="sfParseTest" depends="build,jars"> + <java classname="org.smartfrog.SFParse" failonerror="true" fork="true"> + <!--classpathref="smartfrog.run.class.path"--> + <classpath> + <pathelement location="${smartfrog.home}/lib/smartfrog-${sf.build.version}.jar"/> + <pathelement location="${smartfrog.home}/lib/sfServices-${sf.build.version}.jar"/> + <pathelement location="${smartfrog.home}/lib/sfExamples-${sf.build.version}.jar"/> + <pathelement location="${dist.lib.dir}/sf-scripting.jar"/> + <pathelement location="${dist.lib.dir}/sf-JMX-${Version}.jar"/> + </classpath> + <arg value="-R"/> + <!--<arg value="-r"/> --> + <arg value="-q"/> + <arg value="-f"/> + <arg file="parsertargets"/> + </java> + </target> + <!-- =================================================================== --> + <!-- do everything --> + <!-- =================================================================== --> + <target name="all" depends="dist,sfParseTest" description="creates all the packages required to run smartfrog, and validate any .sf in the package"> </target> + <target name="default" depends="all" description="default target for the project; invokes 'all'"/> + +</project> +<!-- End of file --> Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/SFJMXAgentImpl.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/SFJMXAgentImpl.java 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/agent/SFJMXAgentImpl.java 2007-02-22 00:47:54 UTC (rev 3910) @@ -28,7 +28,7 @@ import java.text.DateFormat; import java.net.InetAddress; import javax.management.*; -import javax.management.modelmbean.*; +//import javax.management.modelmbean.*; import org.smartfrog.sfcore.prim.*; import org.smartfrog.sfcore.compound.*; @@ -40,7 +40,8 @@ import org.smartfrog.services.jmx.communication.ConnectionFactory; import org.smartfrog.services.jmx.communication.ConnectorClient; import org.smartfrog.services.jmx.common.Utilities; -import com.sun.management.jmx.*; +//import com.sun.management.jmx.*; +import mx4j.*; import java.net.UnknownHostException; /** @@ -79,14 +80,16 @@ public SFJMXAgentImpl() throws RemoteException, Exception { // Parse system properties to check if LEVEL_TRACE and/or LEVEL_DEBUG are set // and enable the TRACE level accordingly - try { - Trace.parseTraceProperties(); - } catch (IOException e) { + // try { + //Trace.parseTraceProperties(); + /*} catch (IOException e) { e.printStackTrace(); - } + }*/ // CREATE the MBeanServer - server = MBeanServerFactory.createMBeanServer("SmartFrog"); + //server = MBeanServerFactory.createMBeanServer("SmartFrog"); + +// server = Registry.getServer(); } @@ -183,7 +186,9 @@ *@return Description of the Return Value *@exception Exception Description of the Exception */ - private Object intantiateMBean(String mbeanClass, ComponentDescription constructor) throws Exception { + private Object intantiateMBean(String mbeanClass, ObjectName objectName, ComponentDescription constructor) throws Exception { + + System.out.println("IN INTANTIATEMBEAN"); // Search for constructor parameters Context constructorContext = null; if (constructor != null) { @@ -239,7 +244,8 @@ } signature[i++] = paramClass; } - return server.instantiate(mbeanClass, parameters, signature); + // return server.instantiate(mbeanClass, parameters, signature); + return server.createMBean(mbeanClass, objectName, null, parameters, signature); } @@ -322,16 +328,20 @@ if (!properties.containsKey("type")) { properties.put("type", "sf.jmx.mbean.generic"); } - if (!properties.containsKey("server")) { + /* if (!properties.containsKey("server")) { properties.put("server", localServerId); - } + }*/ + System.out.println("Serve Id===" + localServerId); + System.out.println("Serve domain===" + domain); + System.out.println("Name===" + properties.get("name")); // Build ObjectName and instantiate Object mbeanInstance = null; ObjectName mbeanObjectName = null; try { mbeanObjectName = new ObjectName(domain, (Hashtable) properties); - mbeanInstance = intantiateMBean(className, (ComponentDescription) mbeanContext.get("constructor")); + // mbeanObjectName = new ObjectName(domain); + mbeanInstance = intantiateMBean(className, mbeanObjectName, (ComponentDescription) mbeanContext.get("constructor")); } catch (MalformedObjectNameException mone) { if (sfLog().isErrorEnabled()){ sfLog().error("Could not create an ObjectName for MBean: " + (String)properties.get("name"),mone);} continue; @@ -374,7 +384,7 @@ // Register the MBean try { - server.registerMBean(mbeanInstance, mbeanObjectName); + //server.registerMBean(mbeanInstance, mbeanObjectName); if (sfLog().isDebugEnabled()){ sfLog().debug(mbeanObjectName + " registered");} } catch (Exception e) { if (sfLog().isErrorEnabled()){ sfLog().error("Could not register MBean: " + mbeanObjectName,e);} @@ -422,14 +432,14 @@ } //Test if the property matches a compliant MBean class - try { - Introspector.testCompliance(mbeanInstance.getClass()); + /* try { + MBeanIntrospector.testCompliance(mbeanInstance.getClass()); } catch (NotCompliantMBeanException ncbe) { echo("Not compliant MBean. It will not be registered within the MBeanServer: " + beanKey); echo(ncbe.toString()); continue; } - +*/ // Search for the domain String domain; try { @@ -470,9 +480,9 @@ if (!properties.containsKey("type")) { properties.put("type", "sf.jmx.mbean"); } - if (!properties.containsKey("server")) { + /* if (!properties.containsKey("server")) { properties.put("server", localServerId); - } + }*/ // Build ObjectName and register ObjectName mbeanObjectName = null; @@ -568,6 +578,7 @@ public synchronized void sfDeploy() throws SmartFrogException, RemoteException { super.sfDeploy(); + server = MBeanServerFactory.createMBeanServer("SmartFrog"); // Search for a name (Default name is "sfJMXAgent") nameRef = sfCompleteNameSafe(); try { Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/Communicator.sf =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/Communicator.sf 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/Communicator.sf 2007-02-22 00:47:54 UTC (rev 3910) @@ -51,7 +51,7 @@ // Templates for the HTML code //rootDirectory "C:\\Program Files\\SmartFrog\\lib\\sfJMX.jar"; rootDirectory ".\\lib\\sfJMX.jar"; - pathInJar "mx4j/adaptor/http/xsl"; + pathInJar "mx4j/tools/adaptor/http/xsl"; // Authentication features authentication "none"; // Possible values: none / basic/ digest @@ -80,7 +80,7 @@ description "This processor takes the XML tree and transform it to HTML by means of XSLT"; properties:name "XSLTProcessor"; properties:type "sf.jmx.srv.xml"; - class "mx4j.adaptor.http.XSLTProcessor"; + class "mx4j.tools.adaptor.http.XSLTProcessor"; } /** Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/html/HtmlAdaptor.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/html/HtmlAdaptor.java 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/html/HtmlAdaptor.java 2007-02-22 00:47:54 UTC (rev 3910) @@ -35,12 +35,12 @@ //import openjmx.adaptor.http.AdaptorSocketFactory; //import openjmx.adaptor.http.ssl.SSLFactory; -import mx4j.adaptor.http.HttpAdaptor; -import mx4j.adaptor.http.HttpAdaptorMBean; -import mx4j.adaptor.http.XSLTProcessor; -import mx4j.adaptor.http.ProcessorMBean; -import mx4j.adaptor.AdaptorServerSocketFactory; //AdaptorSocketFactory; -import mx4j.adaptor.ssl.SSLAdaptorServerSocketFactory; //import mx4j.adaptor.http.ssl.SSLFactory; +import mx4j.tools.adaptor.http.HttpAdaptor; +import mx4j.tools.adaptor.http.HttpAdaptorMBean; +import mx4j.tools.adaptor.http.XSLTProcessor; +import mx4j.tools.adaptor.http.ProcessorMBean; +import mx4j.tools.adaptor.AdaptorServerSocketFactory; //AdaptorSocketFactory; +import mx4j.tools.adaptor.ssl.SSLAdaptorServerSocketFactory; //import mx4j.adaptor.http.ssl.SSLFactory; import org.smartfrog.sfcore.prim.Prim; import org.smartfrog.sfcore.prim.PrimImpl; @@ -224,7 +224,7 @@ *@return HTTPServer's port */ public int getPort() { - return httpAdaptor.getPort().intValue(); + return httpAdaptor.getPort(); } @@ -238,7 +238,7 @@ if (isActive()) { throw new IllegalStateException("You should stop this HTMLAdaptor first"); } - httpAdaptor.setPort(new Integer(port)); + httpAdaptor.setPort(port); } @@ -410,7 +410,7 @@ super.sfDeploy(); try { httpAdaptor.setHost ((String) sfResolveHere("host")); - httpAdaptor.setPort((Integer) sfResolveHere("port")); + httpAdaptor.setPort(((Integer) sfResolveHere("port")).intValue()); } catch (Exception e) { e.printStackTrace(); } @@ -433,7 +433,7 @@ pathInJar = (String) sfResolve("pathInJar"); } catch (Exception e) {} - QueryExp xmlExp = Query.match(Query.classattr(), Query.value("mx4j.adaptor.http.XSLTProcessor")); + QueryExp xmlExp = Query.match(Query.classattr(), Query.value("mx4j.tools.adaptor.http.XSLTProcessor")); Set mbeanSet = null; try { mbeanSet = server.queryNames(new ObjectName("*:*"), xmlExp); @@ -465,7 +465,8 @@ xsltProcessor.setPathInJar(pathInJar); } httpAdaptor.setProcessor(xsltProcessor); - ObjectName xsltName = new ObjectName(server.getDefaultDomain()+":name=XSLTProcessor,type=sf.jmx.srv.xml,server="+mbeanServerId); + //ObjectName xsltName = new ObjectName(server.getDefaultDomain()+":name=XSLTProcessor,type=sf.jmx.srv.xml,server="+mbeanServerId); + ObjectName xsltName = new ObjectName(server.getDefaultDomain()+":name=XSLTProcessor,type=sf.jmx.srv.xml"); server.registerMBean(xsltProcessor, xsltName); } catch (Exception e) { e.printStackTrace(); } Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/html/HtmlAdaptorMBean.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/html/HtmlAdaptorMBean.java 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/html/HtmlAdaptorMBean.java 2007-02-22 00:47:54 UTC (rev 3910) @@ -21,10 +21,10 @@ package org.smartfrog.services.jmx.communication.html; import javax.management.ObjectName; -import mx4j.adaptor.http.XSLTProcessor; -import mx4j.adaptor.http.ProcessorMBean; -import mx4j.adaptor.AdaptorServerSocketFactory; //AdaptorSocketFactory; -import mx4j.adaptor.ssl.SSLAdaptorServerSocketFactory; //import mx4j.adaptor.http.ssl.SSLFactory; +import mx4j.tools.adaptor.http.XSLTProcessor; +import mx4j.tools.adaptor.http.ProcessorMBean; +import mx4j.tools.adaptor.AdaptorServerSocketFactory; //AdaptorSocketFactory; +import mx4j.tools.adaptor.ssl.SSLAdaptorServerSocketFactory; //import mx4j.adaptor.http.ssl.SSLFactory; import org.smartfrog.services.jmx.communication.CommunicatorMBean; Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiConnectorClient.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiConnectorClient.java 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/communication/rmi/RmiConnectorClient.java 2007-02-22 00:47:54 UTC (rev 3910) @@ -26,6 +26,7 @@ import java.rmi.RemoteException; import java.rmi.server.UnicastRemoteObject; import javax.management.*; +import javax.management.loading.ClassLoaderRepository; import org.smartfrog.services.jmx.notification.RemoteNotificationListenerWrapper; import org.smartfrog.services.jmx.communication.ConnectorClient; import org.smartfrog.services.jmx.communication.HeartBeatNotification; @@ -959,4 +960,33 @@ // } } + public String [] getDomains() { + return new String[0]; + } + + public ClassLoaderRepository getClassLoaderRepository() { + return null; + } + + public void removeNotificationListener(ObjectName name, ObjectName listener, NotificationFilter filter, Object handback) throws +InstanceNotFoundException, ListenerNotFoundException { + + } + + public ClassLoader getClassLoaderFor(ObjectName mbeanName) throws +InstanceNotFoundException { + return null; + + } + + public ClassLoader getClassLoader(ObjectName loaderName) throws +InstanceNotFoundException { + return null; + } + + public void removeNotificationListener(ObjectName name, +NotificationListener listener, NotificationFilter filter, Object +handback) throws InstanceNotFoundException, ListenerNotFoundException { + } + } Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployer/MBeanDeployer.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployer/MBeanDeployer.java 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/deployer/MBeanDeployer.java 2007-02-22 00:47:54 UTC (rev 3910) @@ -350,7 +350,11 @@ throw new Exception("RemoteStub of ModelMBean managed resource not found"); } } - server.registerMBean(mbeanInstance, mbeanObjectName); + Object[] params = {new Boolean(true)}; + String[] signature = {"boolean"}; + String mbeanClass = "org.smartfrog.sfcore.compound.CompoundImpl"; +// server.createMBean(mbeanClass, mbeanObjectName, null, params, signature); + server.registerMBean(mbeanInstance, mbeanObjectName); // Put the MBean in the hashtable along with its ObjectName registeredMBeans.put(mbeanInstance, mbeanObjectName); @@ -433,10 +437,9 @@ if (sfIsRemote(managedResource)) { resourceType = "RMIReference"; } - // Create and register an instance of the ModelMBean server.createMBean(modelMBeanClass, modelMBeanName); - server.invoke(modelMBeanName, "setModelMBeanInfo", new Object[]{modelMBeanInfo}, + server.invoke(modelMBeanName, "setModelMBeanInfo", new Object[]{modelMBeanInfo}, new String[]{"javax.management.modelmbean.ModelMBeanInfo"}); server.invoke(modelMBeanName, "setManagedResource", new Object[]{managedResource, resourceType}, new String[]{"java.lang.Object", "java.lang.String"}); @@ -510,6 +513,8 @@ throw new Exception("RemoteStub of ModelMBean managed resource not found"); } } + + System.out.println("Dynamic MBean registred with Name-=======" + mbeanName); server.createMBean( "org.smartfrog.services.jmx.mbean.PrimDynamicMBean", mbeanName, new Object[]{prim}, @@ -605,7 +610,7 @@ System.err.println("***************ToDo FIX *********** SeverID"+ server.toString()); //mBeanServerId = (String) server.invoke(new ObjectName("JMImplementation:type=MBeanServerDelegate"), "getMBeanServerId", new Object[] {}, new String[] {}); - registerMBean(this); + // registerMBean(this); createPrimDynamicMBeans(); Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/arithNetManager/launchArithExample.sf =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/arithNetManager/launchArithExample.sf 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/arithNetManager/launchArithExample.sf 2007-02-22 00:47:54 UTC (rev 3910) @@ -77,22 +77,36 @@ sendBothValues extends SendBothValues; } + +SfAgentAddress extends concat { +//sfAgentAddress "rmi://localhost:3800/MasterAgentFF"; + -- "rmi://"; + host "localhost"; + -- ":"; + port "3800"; + -- "/"; + agentJMXName "RMIConnectorServer"; +} + + sfConfig extends Compound { deploymentAnalyzer extends DeploymentAnalyzer { sfManageable extends LAZY ArithManageableMetaData; } - arithMBeanDeployer1 extends MBeanDeployer { - sfAgentAddress LAZY HOST localhost:Agents:subAgent1; - sfMBeans extends Compound { +/* arithMBeanDeployer1 extends MBeanDeployer { + // sfAgentAddress LAZY HOST localhost:Agents:subAgent1; + sfAgentAddress extends SfAgentAddress; + sfMBeans extends Compound { leftGenerator LAZY ROOT:manager:leftGenerator; rightGenerator LAZY ROOT:manager:rightGenerator; } } - +*/ arithMBeanDeployer2 extends MBeanDeployer { - sfAgentAddress LAZY HOST localhost:Agents:subAgent2; + // sfAgentAddress LAZY HOST localhost:Agents:subAgent2; + sfAgentAddress extends SfAgentAddress; modelMBeans extends LAZY { deploymentModelMBean extends DeploymentModelMBean { properties:name "ArithDeployment"; @@ -100,7 +114,7 @@ } } sfMBeans extends Compound { - arithManager LAZY ATTRIB manager; + arithManager LAZY ROOT:manager; printer LAZY ROOT:manager:printer; } } Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/cascading.sf =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/cascading.sf 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/cascading.sf 2007-02-22 00:47:54 UTC (rev 3910) @@ -35,7 +35,7 @@ constructor extends { address extends Parameter{ class "org.smartfrog.services.jmx.communication.ServerAddress"; - value ["rmi", "dhcp-27-213", 3800, "RMIConnectorServer"]; + value ["rmi", "eb97201", 3800, "RMIConnectorServer"]; } pattern extends Parameter { class "javax.management.ObjectName"; Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/deployment.sf =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/deployment.sf 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/deployment.sf 2007-02-22 00:47:54 UTC (rev 3910) @@ -99,7 +99,8 @@ * Component to register MBeans in a remote JMX Agent */ remoteMBeanDeployer extends MBeanDeployer { - sfAgentAddress "rmi://dhcp-27-213:3800/RMIConnectorServer"; // Register in a remote JMX Agent + //sfAgentAddress "rmi://dhcp-27-213:3800/RMIConnectorServer"; // Register in a remote JMX Agent + sfAgentAddress "rmi://eb97201:3800/RMIConnectorServer"; // Register in a remote JMX Agent modelMBeans extends LAZY { mngDeploymentModelMBean extends DeploymentModelMBean { properties:name "MngDeploymentModelMBean"; Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/dynamicmbean.sf =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/dynamicmbean.sf 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/dynamicmbean.sf 2007-02-22 00:47:54 UTC (rev 3910) @@ -42,7 +42,7 @@ * Component to register MBeans in a remote JMX Agent */ remoteMBeanDeployer extends MBeanDeployer { - sfAgentAddress "rmi://dhcp-27-213:3800/RMIConnectorServer"; // Register in a remote JMX Agent + sfAgentAddress "rmi://eb97201:3800/RMIConnectorServer"; // Register in a remote JMX Agent dynamicMBeans extends Compound { negateMBean LAZY ATTRIB negate; plusMBean LAZY ATTRIB plus; Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/mbeanDeployer/simpleMBeanDeployerExample.sf =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/mbeanDeployer/simpleMBeanDeployerExample.sf 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/mbeanDeployer/simpleMBeanDeployerExample.sf 2007-02-22 00:47:54 UTC (rev 3910) @@ -41,7 +41,7 @@ * a method to start generarion that can be invoke using JMX */ SleepyGenerator extends NetElem { - sfClass "com.hp.sfServices.jmx.example.SleepyGenerator"; + sfClass "org.smartfrog.services.jmx.example.SleepyGenerator"; outputs:value extends Output; number 0; } @@ -51,7 +51,7 @@ * the last result in the a SF attribute so that it can be monitored using JMX */ StorePrinter extends Printer { - sfClass "com.hp.sfServices.jmx.example.StorePrinter"; + sfClass "org.smartfrog.services.jmx.example.StorePrinter"; result 0; } // end basic components. @@ -87,7 +87,7 @@ -- ":"; port "3800"; -- "/"; - agentJMXName "MasterAgentFF"; + agentJMXName "RMIConnectorServer"; } //LAZY Reference to create Reference at RunTime. @@ -108,8 +108,8 @@ // reference to sfCompleteName of jmxAgent. sfAgentAddress LAZY HOST localhost:rootProcess:AGENT:masterAgentJMX; sfMBeans extends Compound { - generator LAZY ROOT:simpleArithNet:generator; - printer LAZY ROOT:simpleArithNet:printer; + generator LAZY ROOT:SimpleArithNet:generator; + printer LAZY ROOT:SimpleArithNet:printer; } } @@ -127,6 +127,8 @@ //sfAgentAddress "rmi://localhost:3800/MasterAgentFF"; sfAgentAddress extends SfAgentAddress; dynamicMBeans extends Compound { + // generator LAZY HOST localhost:rootProcess:ex2:simpleArithNet:generator; + // printer LAZY HOST localhost:rootProcess:ex2:simpleArithNet:printer; generator LAZY ROOT:simpleArithNet:generator; printer LAZY ROOT:simpleArithNet:printer; } @@ -146,14 +148,14 @@ simpleArithNet extends SimpleArithNet; // MBeanDeployer using sfReference in localhost - arithMBeanDeployerLocalREF extends ArithMBeanDeployerLocalREF; + // arithMBeanDeployerLocalREF extends ArithMBeanDeployerLocalREF; // MBeanDeployer using LAZYReference to create sfReference in remotehost // Check LAZYReference - arithMBeanDeployerRemoteLAZY_REF extends ArithMBeanDeployerRemoteLAZY_REF{ + /* arithMBeanDeployerRemoteLAZY_REF extends ArithMBeanDeployerRemoteLAZY_REF{ //LAZY Reference is deployed in remote host so that sfHost will get the right remote name. Cool! addressLAZYReference:sfProcessHost ATTRIB host2; - } + }*/ // MBeanDeployer using RMI url (string) in localhost arithMBeanDeployerLOCAL_RMI extends ArithMBeanDeployerLOCAL_RMI; Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/modelmbean.sf =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/modelmbean.sf 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/modelmbean.sf 2007-02-22 00:47:54 UTC (rev 3910) @@ -169,7 +169,7 @@ * Component to register MBeans in a remote JMX Agent */ remoteMBeanDeployer extends MBeanDeployer { - sfAgentAddress "rmi://dhcp-27-213:3800/RMIConnectorServer"; // Register in a remote JMX Agent + sfAgentAddress "rmi://eb97201:3800/RMIConnectorServer"; // Register in a remote JMX Agent modelMBeans extends LAZY { manager extends ManagerModelMBean { managedResource LAZY ATTRIB manager; Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/sfmbean.sf =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/sfmbean.sf 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/example/sfmbean.sf 2007-02-22 00:47:54 UTC (rev 3910) @@ -41,7 +41,7 @@ * Component to register MBeans in a remote JMX Agent */ remoteMBeanDeployer extends MBeanDeployer { - sfAgentAddress "rmi://dhcp-27-213:3800/RMIConnectorServer"; // Register in a remote JMX Agent + sfAgentAddress "rmi://eb97201:3800/RMIConnectorServer"; // Register in a remote JMX Agent sfMBeans extends Compound { arithManager LAZY ATTRIB manager; } Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbean/mbean.sf =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbean/mbean.sf 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbean/mbean.sf 2007-02-22 00:47:54 UTC (rev 3910) @@ -101,3 +101,4 @@ // } // } } + Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MBeanBrowser.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MBeanBrowser.java 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MBeanBrowser.java 2007-02-22 00:47:54 UTC (rev 3910) @@ -35,7 +35,8 @@ import org.smartfrog.services.jmx.communication.ServerAddress; import java.util.Vector; -import com.sun.management.jmx.*; +//import com.sun.management.jmx.*; +import mx4j.*; import java.rmi.RemoteException; /** @@ -70,11 +71,11 @@ public MBeanBrowser() throws Exception { // Parse system properties to check if LEVEL_TRACE and/or LEVEL_DEBUG are set // and enable the TRACE level accordingly - try { - Trace.parseTraceProperties(); - } catch (IOException e) { + //try { + //Trace.parseTraceProperties(); + /* } catch (IOException e) { e.printStackTrace(); - } + }*/ } @@ -88,18 +89,21 @@ public void init(String args[]) throws Exception { if ((args != null) && (args.length > 0)) { ServerAddress url = checkArguments(args); - //System.out.println(url.getHost()+":"+url.getPort()+"/"+url.getName()); + System.out.println(url.getHost()+":"+url.getPort()+"/"+url.getResource()); frame = new MainFrame(url); + System.out.println("GOT MAINFRAME FROM URL"); } else { frame = new MainFrame(); } //Validate frames that have preset sizes //Pack frames that have useful preferred size info, e.g. from their layout + System.out.println("I M HERE 5"); if (packFrame) { frame.pack(); } else { frame.validate(); } + System.out.println("I M HERE 6"); //Center the window Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); frame.setSize((int) screenSize.getWidth() * 4 / 5, (int) screenSize.getHeight() * 4 / 5); @@ -135,11 +139,16 @@ args = new String[]{mbeanbrowser.URL}; } // If there is no arguments, we use the default url + System.out.println("I M HERE 1"); mbeanbrowser.init(args); + System.out.println("I M HERE 2"); if (mbeanbrowser.frame!=null){ mbeanbrowser.frame.systemExit=true; // Will do a system.exit when window closed. } + + System.out.println("I M HERE 3"); mbeanbrowser.setConfig(); + System.out.println("I M HERE 4"); } catch (java.net.MalformedURLException me) { System.err.println( "Error: "+ me.getMessage()+ ". URL example: rmi://localhost:3800/RMIConnectorServer"+usage); } catch (java.lang.IllegalArgumentException ae) { @@ -265,13 +274,17 @@ public static ComponentDescription getMBeanBrowserDescription() throws Exception { InputStream is = SFClassLoader.getResourceAsStream("org/smartfrog/services/jmx/mbeanbrowser/MBeanBrowser.sf"); Phases descr = (new SFParser("sf").sfParse(is)); - Vector phases = new Vector(); - phases.add("type"); - phases.add("link"); - descr.sfResolvePhases(phases); - return (ComponentDescription) - (descr.sfAsComponentDescription()). - sfResolve(new Reference(ReferencePart.here("MBeanBrowser"))); + //Vector phases = new Vector(); + // phases.add("type"); + // phases.add("link"); + // descr.sfResolvePhases(phases); + ComponentDescription cd = descr.sfAsComponentDescription(); + //System.out.println("COMP====" + cd.toString()); + // ComponentDescription comp = (ComponentDescription) cd.sfResolveHere(new Reference(ReferencePart.here("MBeanBrowser"))); + Reference ref = Reference.fromString("MBeanBrowser"); + Object comp = cd.sfResolve(ref); + System.out.println("DESCR====" + comp.toString()); + return (ComponentDescription) comp; } Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MBeanBrowser.sf =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MBeanBrowser.sf 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MBeanBrowser.sf 2007-02-22 00:47:54 UTC (rev 3910) @@ -19,13 +19,18 @@ */ #include "org/smartfrog/components.sf" +#include "org/smartfrog/predicates.sf" MBeanBrowser extends Prim { sfClass "org.smartfrog.services.jmx.mbeanbrowser.MBeanBrowser"; sfExport true; - url "rmi://localhost:3800/RMIConnectorServer"; - connectWhenStarted false; + //url "rmi://localhost:3800/RMIConnectorServer"; + url "rmi://eb97201:3800/RMIConnectorServer"; + //connectWhenStarted false; + connectWhenStarted true; sfDetach false; heartBeatPeriod 1000; // By default, the frequency with wich the connection is checked is 1 second heartBeatRetries 3; // By default, the retries before considering a connection lost is 5 } + +sfConfig extends MBeanBrowser; Modified: trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MainFrame.java =================================================================== --- trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MainFrame.java 2007-02-20 17:38:35 UTC (rev 3909) +++ trunk/core/components/jmx/src/org/smartfrog/services/jmx/mbeanbrowser/MainFrame.java 2007-02-22 00:47:54 UTC (rev 3910) @@ -122,6 +122,7 @@ public MainFrame(ServerAddress url) { enableEvents(AWTEvent.WINDOW_EVENT_MASK); ... [truncated message content] |