[Mc4j-cvs] mc4j MC4J.iml,1.1,1.2 ant.developer.properties,1.4,1.5 MC4JProject.iws,1.4,1.5 Readme.txt
Brought to you by:
ghinkl
Menu
▾
▴
[Mc4j-cvs] mc4j MC4J.iml,1.1,1.2 ant.developer.properties,1.4,1.5 MC4JProject.iws,1.4,1.5 Readme.txt,1.9,1.10 .cvsignore,1.1,1.2 build.xml,1.40,1.41 MC4JProject.ipr,1.4,1.5
|
From: Greg H. <gh...@us...> - 2006-04-12 19:14:38
|
Update of /cvsroot/mc4j/mc4j In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20162 Modified Files: ant.developer.properties MC4JProject.iws Readme.txt .cvsignore build.xml MC4JProject.ipr Added Files: MC4J.iml Log Message: Merging EMS into head for the 2.0 release work Index: .cvsignore =================================================================== RCS file: /cvsroot/mc4j/mc4j/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 10 Nov 2004 15:50:09 -0000 1.1 --- .cvsignore 12 Apr 2006 19:14:00 -0000 1.2 *************** *** 1,2 **** .nbintdb ! Thumbs.db \ No newline at end of file --- 1,4 ---- .nbintdb ! Thumbs.db ! .nbattrs ! .DS_Store Index: build.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/build.xml,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** build.xml 14 Mar 2005 15:09:00 -0000 1.40 --- build.xml 12 Apr 2006 19:14:00 -0000 1.41 *************** *** 44,47 **** --- 44,49 ---- <property name="module.jar" value="org-mc4j-console.jar"/> + <property name="platform.dir" value="platform6"/> + <property name="application.install" value="build/mc4j"/> *************** *** 49,53 **** name="init" description="Initializes the MC4J build system."> ! <echo message="MC4J Build Environment - Try [ant -projecthelp] for more info."/> --- 51,55 ---- name="init" description="Initializes the MC4J build system."> ! <echo message="MC4J Build Environment - Try [ant -projecthelp] for more info."/> *************** *** 56,74 **** <!-- Make sure we have all the directories we need to run a build. --> <mkdir dir="classes"/> ! <path id="classpath.compile"> <!-- When reasonable, replace these with specific paths --> <!-- to openide*.jar and whatever else you need. --> - <pathelement path="${application.install}/lib/openide.jar"/> - <pathelement path="${application.install}/lib/openide-loaders.jar"/> - <pathelement path="${application.install}/lib/ext/regexp*.jar"/> - <pathelement path="${application.install}/modules/autoload/openide-io.jar"/> ! <fileset dir="${application.install}/core"> ! <include name="*.jar"/> </fileset> ! <fileset dir="${application.install}/modules"> ! <include name="*.jar"/> </fileset> --- 58,80 ---- <!-- Make sure we have all the directories we need to run a build. --> <mkdir dir="classes"/> ! <path id="classpath.compile"> <!-- When reasonable, replace these with specific paths --> <!-- to openide*.jar and whatever else you need. --> ! <pathelement path="modules/ems/dist/org-mc4j-ems.jar"/> ! ! <fileset dir="${application.install}/${platform.dir}/core"> ! <include name="**/*.jar"/> </fileset> ! ! <fileset dir="${application.install}/${platform.dir}/lib"> ! <include name="**/*.jar"/> ! </fileset> ! ! ! <fileset dir="${application.install}/${platform.dir}/modules"> ! <include name="**/*.jar"/> </fileset> *************** *** 89,106 **** <available classpathref="classpath.compile" ! classname="org.openide.DialogDisplayer" property="installed.netbeans"/> ! ! <condition property="compile.target" value="jsr14" > <isset property="jre15Available"/> </condition> <condition property="compile.target" value="1.4"> ! <not><isset property="jre15Available"/></not> </condition> <condition property="compile.source" value="1.4"> ! <not><isset property="jre15Available"/></not> </condition> <condition property="compile.source" value="1.5"> --- 95,115 ---- <available classpathref="classpath.compile" ! classname="org.openide.DialogDisplayer" property="installed.netbeans"/> ! <condition property="compile.target" value="jsr14"> <isset property="jre15Available"/> </condition> <condition property="compile.target" value="1.4"> ! <not> ! <isset property="jre15Available"/> ! </not> </condition> <condition property="compile.source" value="1.4"> ! <not> ! <isset property="jre15Available"/> ! </not> </condition> <condition property="compile.source" value="1.5"> *************** *** 114,126 **** unless="installed.netbeans" message="Could not locate the NetBeans platform in the classpath. Make sure to follow the build instructions at http://mc4j.sourceforge.net/Building.html"/> ! </target> ! <target name="compile" depends="init" description="Compiles the MC4J, generic codebase."> <javac srcdir="src" destdir="classes" debug="true" source="${compile.source}" target="${compile.target}"> <exclude name="**/carbon/**"/> <exclude name="org/mc4j/jre15/**" unless="jre15Available"/> --- 123,137 ---- unless="installed.netbeans" message="Could not locate the NetBeans platform in the classpath. Make sure to follow the build instructions at http://mc4j.sourceforge.net/Building.html"/> ! </target> ! <target name="compile" depends="init, build-modules" description="Compiles the MC4J, generic codebase."> <javac srcdir="src" destdir="classes" debug="true" source="${compile.source}" target="${compile.target}"> + <exclude name="**/carbon/**"/> + <exclude name="**/chires/**"/> <exclude name="org/mc4j/jre15/**" unless="jre15Available"/> *************** *** 133,137 **** </target> ! <target name="jars" depends="compile" description="Builds the MC4J Module JAR Files" > --- 144,148 ---- </target> ! <target name="jars" depends="compile" description="Builds the MC4J Module JAR Files"> *************** *** 139,196 **** <fileset dir="."> <include name="${module.jar}"/> - <include name="mc4j_common.jar"/> </fileset> </delete> ! ! <jar jarfile="${module.jar}" manifest="dist/module_manifest.mf" update="true" compress="false"> <!-- OC4J support: put this into JAR for OC4J ApplicationClient to work--> <fileset dir="src/etc" includes="**/*"/> ! <fileset dir="classes" > ! ! <include name="**/persistence/**/*.class"/> ! <include name="**/install/**/*.class"/> ! ! <include name="**/IConnectionNode.class"/> ! <include name="**/swing/*.class"/> ! <include name="**/swing/html/*.class"/> ! <include name="**/welcome/*"/> ! <include name="**/swing/animate/*.class"/> ! <include name="**/ExtendedExplorerPanel.class"/> ! <include name="**/ManagementNode*.class"/> ! <include name="**/ConnectAction*.class"/> ! ! <include name="org/mc4j/console/DisplayConnectionExplorerAction*"/> ! <include name="org/mc4j/console/CreateConnectionAction*"/> ! <include name="org/mc4j/console/ConnectionExplorer*"/> ! <include name="org/mc4j/console/install/ExplorerUtil*"/> ! ! <include name="org/mc4j/console/util/*"/> ! ! <include name="org/mc4j/console/connection/wizard/*.class"/> ! <include name="org/mc4j/console/connection/wizard/**/*.class"/> ! ! <include name="org/mc4j/console/connection/DisconnectAction*"/> ! <include name="org/mc4j/console/connection/ReconnectAction*"/> ! <include name="org/mc4j/console/connection/RefreshAction*"/> ! ! ! <!--<include name="**/mejb/**/*"/>--> ! <!--<include name="**/mejb/ShowMEJBViewAction*"/>--> ! ! ! <exclude name="org/mc4j/console/connect/*Connection.class"/> ! ! <include name="org/mc4j/console/bean/attribute/watch/MonitorTopComponent*.class"/> ! <include name="org/mc4j/console/bean/attribute/watch/MonitorExplorer*.class"/> ! <include name="org/mc4j/console/bean/attribute/watch/MonitorRootNode*.class"/> ! ! <include name="org/mc4j/console/connection/install/*"/> ! </fileset> ! <fileset dir="dist"> <include name="org/**/*"/> <include name="Windows/**/*"/> --- 150,166 ---- <fileset dir="."> <include name="${module.jar}"/> </fileset> </delete> ! <jar jarfile="${module.jar}" manifest="application/dist/module_manifest.mf" update="true" compress="false"> <!-- OC4J support: put this into JAR for OC4J ApplicationClient to work--> <fileset dir="src/etc" includes="**/*"/> ! <fileset dir="classes"> ! <include name="**/*.class"/> </fileset> ! <fileset dir="application/dist"> <include name="org/**/*"/> <include name="Windows/**/*"/> *************** *** 212,218 **** <fileset dir="application"> <include name="dashboards/*.dtd"/> </fileset> ! <zipfileset src="lib/regexp.jar"><exclude name="META-INF/MANIFEST.MF"/></zipfileset> </jar> --- 182,189 ---- <fileset dir="application"> <include name="dashboards/*.dtd"/> + <include name="dashboards/Standard*.xml"/> </fileset> ! <!--<zipfileset src="lib/regexp.jar"><exclude name="META-INF/MANIFEST.MF"/></zipfileset>--> </jar> *************** *** 221,244 **** <!-- classes only, for delegated classloaders --> ! <jar jarfile="mc4j_common.jar" update="true" compress="false"> <fileset dir="classes"/> ! </jar> </target> - <target name="all" depends="compile, jars, brand, install, run" description="Build the module."> </target> ! <target name="all-debug" depends="compile, jars, brand, install, run-debug" description="Build the module."> </target> ! <target name="install" description="copy the jars."> <!-- install the modules --> ! <copy todir="${application.install}\modules" overwrite="yes"> <fileset dir="."> <include name="${module.jar}"/> --- 192,251 ---- <!-- classes only, for delegated classloaders --> ! <!--<jar jarfile="mc4j_common.jar" update="true" compress="false"> <fileset dir="classes"/> ! </jar>--> </target> + <!--<property name="platform-file" value="netbeans-4_1-platform.zip"/>--> + <property name="platform-file" value="netbeans-5_0-platform.zip"/> + <target name="get-nb-platform"> + <mkdir dir="build"/> + <mkdir dir="build/download"/> + <echo message="Downloading NetBeans Platform (~4.4 MB)"/> + <!--<get dest="build/download/${platform-file}" + src="http://www.netbeans.org/download/4_1/fcs/200505031930/66083d474e5fdfc80a1443fb851bd9d5/${platform-file}" + verbose="true"/>--> + <get dest="build/download/${platform-file}" + src="http://us1.mirror.netbeans.org/download/5_0/fcs/200601251500/netbeans-5_0-platform.zip" + verbose="true"/> </target> ! <target name="prepare-platform"> + <unzip src="build/download/${platform-file}" dest="build"/> + <rename src="build/netbeans" dest="build/mc4j"/> </target> ! <target name="clean-dist"> ! <delete dir="build/mc4j"/> ! </target> ! ! ! <target name="all" depends="get-nb-platform, prepare-platform, build-debug" description="Setup the project and run it"/> ! ! ! ! ! <target name="build" depends="compile, jars, brand, install, run" description="Build the project including preparation of the nb platform."> ! ! </target> ! ! <target name="build-debug" depends="compile, jars, brand, install, run-debug" description="Build the module."> ! ! </target> ! ! ! <target name="build-modules" description="Build the modules MC4J is dependent on"> ! <ant antfile="build.xml" target="dist" dir="modules/ems"/> ! </target> ! ! <target name="install" depends="brand, update-dashboards" description="Create the installation of MC4J over top a platform install."> <!-- install the modules --> ! <copy todir="${application.install}/${platform.dir}/modules" overwrite="yes"> <fileset dir="."> <include name="${module.jar}"/> *************** *** 246,249 **** --- 253,266 ---- </copy> + <copy todir="${application.install}/${platform.dir}/modules/ext" overwrite="yes"> + <fileset dir="lib/common" includes="*.jar"/> + <fileset dir="modules/ems/dist" includes="*.jar"/> + </copy> + + <copy todir="${basedir}/${application.install}/${platform.dir}/lib/" overwrite="yes"> + <fileset dir="lib/boot" includes="*.jar"/> + </copy> + + <!-- <copy todir="${application.install}" overwrite="yes"> *************** *** 262,272 **** <!-- install the external class libraries --> ! <mkdir dir="${application.install}\mc4jlib"/> <copy todir="${application.install}\mc4jlib" overwrite="yes"> <fileset dir="." includes="mc4j_common.jar"/> ! <fileset dir="lib/common"> ! <include name="*.jar"/> ! </fileset> ! </copy> <!-- install the extra mx4j libraries --> --- 279,286 ---- <!-- install the external class libraries --> ! <!--<mkdir dir="${application.install}\mc4jlib"/> <copy todir="${application.install}\mc4jlib" overwrite="yes"> <fileset dir="." includes="mc4j_common.jar"/> ! </copy>--> <!-- install the extra mx4j libraries --> *************** *** 295,328 **** - <copy todir="${application.install}" flatten="no" overwrite="yes"> - <fileset dir="application"> - <include name="dashboards/**/*.xml"/> - <include name="dashboards/**/*.html"/> - <include name="dashboards/**/*.dtd"/> - </fileset> - </copy> ! <copy todir="${application.install}/config/Modules" overwrite="yes"> <fileset dir="application/config" includes="*.xml"/> </copy> <copy todir="${application.install}/bin" overwrite="yes"> ! <fileset dir="dist"> <include name="ide.policy"/> </fileset> </copy> </target> <target name="brand" description="customize the netbeans platform for mc4j"> <copy ! todir="${application.install}/lib/" overwrite="yes" ! file="application/branding/branding" /> ! <mkdir dir="${application.install}/core/patches"/> <jar ! destfile="${application.install}/core/patches/Mc4jBranding.jar" basedir="application/branding/bundle"/> </target> --- 309,350 ---- ! <copy todir="${application.install}/${platform.dir}/config/Modules" overwrite="yes"> <fileset dir="application/config" includes="*.xml"/> </copy> <copy todir="${application.install}/bin" overwrite="yes"> ! <fileset dir="application/dist"> <include name="ide.policy"/> </fileset> </copy> + <copy todir="${application.install}" overwrite="yes"> + <fileset dir="."> + <include name="Readme.txt"/> + </fileset> + </copy> </target> + <target name="update-dashboards" description="Install the dashboard files in the installation directory."> + <copy todir="${application.install}" flatten="no" overwrite="yes"> + <fileset dir="application"> + <include name="dashboards/**/*.xml"/> + <include name="dashboards/**/*.html"/> + <include name="dashboards/**/*.dtd"/> + </fileset> + </copy> + + </target> <target name="brand" description="customize the netbeans platform for mc4j"> <copy ! todir="${application.install}/${platform.dir}/lib/" overwrite="yes" ! file="application/branding/branding"/> ! <mkdir dir="${application.install}/${platform.dir}/core/patches"/> <jar ! destfile="${application.install}/${platform.dir}/core/patches/Mc4jBranding.jar" basedir="application/branding/bundle"/> </target> *************** *** 350,358 **** <exec executable="${application.install}/bin/runide.exe"/> </target> ! ! ! <target name="run" description="Directly starts MC4J with the settings as the installer would use."> ! <echo>Starting MC4J</echo> <java classname="org.netbeans.Main" --- 372,379 ---- <exec executable="${application.install}/bin/runide.exe"/> </target> ! ! <target name="run" description="Directly starts MC4J with the settings as the installer would use."> ! <echo message="Starting MC4J with home of ${basedir}/${application.install}"/> <java classname="org.netbeans.Main" *************** *** 361,365 **** <jvmarg value="-Xms24m"/> ! <jvmarg value="-Xmx96m"/> <arg value="--branding"/> --- 382,386 ---- <jvmarg value="-Xms24m"/> ! <jvmarg value="-Xmx296m"/> <arg value="--branding"/> *************** *** 372,375 **** --- 393,399 ---- --> + <!--<env key="DYLD_LIBRARY_PATH" value="/Applications/YourKit Java Profiler 5.0.1.app/bin/mac"/> + <jvmarg value="-agentlib:yjpagent"/>--> + <!-- Under 1.5 JRE's this will start up the built-in jmxremoting support --> <sysproperty key="com.sun.management.jmxremote.port" value="8999"/> *************** *** 385,389 **** <!-- Define where the persistent files live --> ! <sysproperty key="netbeans.user" value="${user.home}/.mc4j/${application.version}"/> <!-- Provide stacktraces on exceptions --> <sysproperty key="netbeans.debug.exceptions" value="true"/> --- 409,413 ---- <!-- Define where the persistent files live --> ! <!-- <sysproperty key="netbeans.user" value="${user.home}/.mc4j/${application.version}"/>--> <!-- Provide stacktraces on exceptions --> <sysproperty key="netbeans.debug.exceptions" value="true"/> *************** *** 391,400 **** <sysproperty key="netbeans.logger.console" value="true"/> <!-- Set the runtime home dir --> ! <sysproperty key="netbeans.home" value="${application.install}"/> ! <sysproperty key="netbeans.dirs" value="${application.install}"/> <classpath> ! <pathelement path="${application.install}/lib/boot.jar"/> </classpath> --- 415,427 ---- <sysproperty key="netbeans.logger.console" value="true"/> <!-- Set the runtime home dir --> ! <sysproperty key="netbeans.home" value="${basedir}/${application.install}/${platform.dir}"/> ! <sysproperty key="netbeans.dirs" value=""/> <classpath> ! <pathelement path="${basedir}/${application.install}/${platform.dir}/lib/boot.jar"/> ! <!--<fileset dir="${basedir}/${application.install}/${platform.dir}/core"> ! <include name="*.jar"/> ! </fileset>--> </classpath> *************** *** 402,416 **** </target> ! <target name="run-debug" description="Directly starts MC4J with the settings as the installer would use."> <echo>Starting MC4J with debugger</echo> - <java - classname="org.netbeans.Main" - fork="yes" - dir="${application.install}"> ! <jvmarg value="-Xms32m"/> ! <jvmarg value="-Xmx128m"/> ! <!--<jvmarg value="-XX:+UseParallelGC"/>--> ! <!--<jvmarg value="-Xincgc"/> --> <!-- Support for running a debugger --> --- 429,441 ---- </target> ! <target name="run-debug" description="Directly starts MC4J with the settings as the installer would use."> <echo>Starting MC4J with debugger</echo> ! <java classname="org.netbeans.Main" fork="yes" dir="${application.install}"> ! ! <jvmarg value="-Xms96m"/> ! <jvmarg value="-Xmx256m"/> ! ! <sysproperty key="swing.aatext" value="true"/> <!-- Support for running a debugger --> *************** *** 421,445 **** <arg value="--branding"/> <arg value="mc4j"/> - <sysproperty key="com.sun.management.jmxremote.port" value="8999"/> - <sysproperty key="com.sun.management.jmxremote.ssl" value="false"/> - <sysproperty key="com.sun.management.jmxremote.authenticate" value="false"/> ! <!-- JProfiler --> ! <!-- ! <jvmarg value="-Xint"/> ! <jvmarg value="-Xrunjprofiler"/> ! <jvmarg value="-Xbootclasspath/a:C:/Program Files/jprofiler/bin/agent.jar"/> ! --> ! <!-- YourKit profiler --> ! <!-- ! <jvmarg value="-Xint"/> ! <jvmarg value="-Xbootclasspath/a:C:/tools/yjp-3.0-eap-build400/bin/yjpagent.dll"/> ! <jvmarg value="-Xrunyjpagent"/> ! --> --- 446,467 ---- + <!--<jvmarg value="-agentpath:/Users/ghinkle/development/tools/NetBeansIDE5.0Beta2.app/Contents/Resources/NetBeans/profiler1/lib/deployed/jdk15/mac/libprofilerinterface.jnilib=/Users/ghinkle/development/tools/NetBeansIDE5.0Beta2.app/Contents/Resources/NetBeans/profiler1/lib,5140"/>--> + + <arg value="--branding"/> <arg value="mc4j"/> ! <sysproperty key="Plastic.defaultTheme" value="DesertBlue"/> ! <arg value="-ui"/> <arg value="com.jgoodies.looks.plastic.PlasticLookAndFeel"/> ! <!--<arg value="-laf"/> <arg value="com.Trendy.swing.plaf.TrendyLookAndFeel"/>--> ! <sysproperty key="com.sun.management.jmxremote.port" value="8998"/> ! <sysproperty key="com.sun.management.jmxremote.ssl" value="false"/> ! <sysproperty key="com.sun.management.jmxremote.authenticate" value="false"/> + <sysproperty key="apple.laf.useScreenMenuBar" value="true"/> + <!--<sysproperty key="apple.awt.brushMetalLook" value="true"/>--> + <!--<sysproperty key="swing.defaultlaf" value="javax.swing.plaf.metal.MetalLookAndFeel"/>--> *************** *** 453,462 **** <sysproperty key="netbeans.logger.console" value="true"/> <!-- Set the runtime home dir --> ! <sysproperty key="netbeans.home" value="${application.install}"/> <classpath> ! <pathelement path="${application.install}/lib/boot.jar"/> </classpath> </java> --- 475,492 ---- <sysproperty key="netbeans.logger.console" value="true"/> <!-- Set the runtime home dir --> ! <sysproperty key="netbeans.home" value="${basedir}/${application.install}/${platform.dir}"/> ! <sysproperty key="netbeans.dirs" value=""/> <classpath> + <pathelement path="${basedir}/${application.install}/${platform.dir}/lib/boot.jar"/> + <pathelement path="${basedir}/${application.install}/${platform.dir}/lib/org-openide-util.jar"/> + <pathelement path="${basedir}/${application.install}/${platform.dir}/lib/org-openide-modules.jar"/> ! <!-- TODO separate out the deepjar handler and nested classloader into a separate library for the boot classpath --> ! <!--<pathelement path="${basedir}/${application.install}/${platform.dir}/modules/ext/org-mc4j-ems.jar"/>--> + <pathelement path="${basedir}/${application.install}/${platform.dir}/lib/looks-1.3.1.jar"/> + + <pathelement path="${basedir}/${application.install}/${platform.dir}/lib/trendyDemoAndTrial.jar"/> </classpath> </java> *************** *** 465,468 **** --- 495,499 ---- <target name="clear-userdir" description="Cleans out the entire MC4J User Dir"> <deltree dir="${user.home}/.mc4j/${application.version}"/> + <delete file="build/mc4j/ConnectionNodes.db"/> </target> *************** *** 471,479 **** <target name="build-docs" depends="init" description="Generates html documentation tree"> <!-- **** Copy needed resources **** --> ! <copy todir="docs" overwrite="yes" > <fileset dir="${doc.build.dir}"> <include name="*.css"/> </fileset> ! <fileset dir="application/dashboards"> <include name="*.dtd"/> </fileset> --- 502,510 ---- <target name="build-docs" depends="init" description="Generates html documentation tree"> <!-- **** Copy needed resources **** --> ! <copy todir="docs" overwrite="yes"> <fileset dir="${doc.build.dir}"> <include name="*.css"/> </fileset> ! <fileset dir="application/dashboards"> <include name="*.dtd"/> </fileset> *************** *** 499,504 **** includes="**/*.xml"> </style> <mkdir dir="docs/printer"/> - <!-- Top Level Static Files --> <style basedir="${doc.build.dir}" destdir="docs/printer" --- 530,535 ---- includes="**/*.xml"> </style> + <mkdir dir="docs/printer"/> <style basedir="${doc.build.dir}" destdir="docs/printer" *************** *** 507,513 **** excludes="**/build.xml,**/module.xml" includes="**/*.xml"> ! <param name="module-menu" expression="nomenu"/> </style> ! --- 538,544 ---- excludes="**/build.xml,**/module.xml" includes="**/*.xml"> ! <param name="module-menu" expression="nomenu"/> </style> ! *************** *** 543,554 **** --> </target> - - <target - name="clean-docs" - description="Removes built documentation from disk."> ! <delete dir="docs"/> ! </target> </project> --- 574,603 ---- --> </target> ! <target ! name="clean-docs" ! description="Removes built documentation from disk."> ! ! <delete dir="docs"/> ! </target> + + <taskdef resource="simiantask.properties" classpath="lib/simian-2.2.4.jar"/> + + <target name="simian"> + <simian> + <fileset dir="src" includes="**/*.java"/> + <formatter type="xml" toFile="simian-log.xml"/> + </simian> + + <style + destdir="." + extension=".html" + style="simian.xsl" + includes="simian-log.xml"> + </style> + </target> + + </project> Index: MC4JProject.iws =================================================================== RCS file: /cvsroot/mc4j/mc4j/MC4JProject.iws,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MC4JProject.iws 5 Oct 2004 05:17:17 -0000 1.4 --- MC4JProject.iws 12 Apr 2006 19:14:00 -0000 1.5 *************** *** 2,7 **** <project version="4" relativePaths="true"> <component name="AspectsView" /> ! <component name="BookmarkManager"> ! <editor_bookmark url="file://$PROJECT_DIR$/src/org/mc4j/console/bean/attribute/watch/monitor/StartMonitoringAction.java" line="69" number="9" /> </component> <component name="CheckinPanelState" /> --- 2,325 ---- <project version="4" relativePaths="true"> <component name="AspectsView" /> ! <component name="BookmarkManager" /> [...2212 lines suppressed...] </entry> ! <entry file="file://$PROJECT_DIR$/src/org/mc4j/console/connection/proxy/JSR77ManagementMBeanServerProxy.java"> <provider selected="true" editor-type-id="text-editor"> ! <state line="45" column="0" selection-start="1453" selection-end="1453" vertical-scroll-proportion="0.43875685"> <folding /> </state> </provider> </entry> ! <entry file="file://$PROJECT_DIR$/build.xml"> <provider selected="true" editor-type-id="text-editor"> ! <state line="495" column="0" selection-start="18352" selection-end="18419" vertical-scroll-proportion="0.731203"> <folding /> </state> </provider> </entry> ! <entry file="file://$PROJECT_DIR$/ant.developer.properties"> <provider selected="true" editor-type-id="text-editor"> ! <state line="7" column="0" selection-start="182" selection-end="182" vertical-scroll-proportion="0.21755028"> <folding /> </state> Index: Readme.txt =================================================================== RCS file: /cvsroot/mc4j/mc4j/Readme.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Readme.txt 19 Jan 2005 14:11:58 -0000 1.9 --- Readme.txt 12 Apr 2006 19:14:00 -0000 1.10 *************** *** 1,4 **** ! MC4J 1.2 beta 8 Read Me ! Release 1/18/05 http://mc4j.sourceforge.net --- 1,4 ---- ! MC4J 1.2 beta 9 Read Me ! Release 3/14/05 http://mc4j.sourceforge.net *************** *** 19,22 **** --- 19,26 ---- Release Notes + 1.2 beta 9 + * WebLogic 6, 7 and 8.1 support fixed + * WebSphere Studio test environment support added + 1.2 beta 8 * WebSphere 5 support fixed Index: ant.developer.properties =================================================================== RCS file: /cvsroot/mc4j/mc4j/ant.developer.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ant.developer.properties 4 Oct 2004 14:05:01 -0000 1.4 --- ant.developer.properties 12 Apr 2006 19:14:00 -0000 1.5 *************** *** 5,9 **** # a strange location. See the online build instructions at # http://mc4j.sourceforge.net/Building.html - application.install = ${basedir}/../application/mc4j ! application.version = 1.2b7 \ No newline at end of file --- 5,8 ---- # a strange location. See the online build instructions at # http://mc4j.sourceforge.net/Building.html ! application.version = 2.0a1 \ No newline at end of file --- NEW FILE: MC4J.iml --- <?xml version="1.0" encoding="UTF-8"?> <module version="4" relativePaths="false" type="JAVA_MODULE"> <component name="ModuleRootManager" /> <component name="NewModuleRootManager"> <output url="file://$MODULE_DIR$/classes" /> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <excludeFolder url="file://$MODULE_DIR$/build" /> <excludeFolder url="file://$MODULE_DIR$/mc4j2" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="JBoss" level="project" /> <orderEntry type="library" name="JDMK" level="project" /> <orderEntry type="library" name="JFreeChart" level="project" /> <orderEntry type="library" name="JMX Remoting RI" level="project" /> <orderEntry type="library" name="MX4J" level="project" /> <orderEntry type="library" name="NetBeans" level="project" /> <orderEntry type="library" name="UtilConcurrent" level="project" /> <orderEntry type="library" name="Carbon" level="project" /> <orderEntry type="library" name="JGraph" level="project" /> <orderEntry type="module-library"> <library> <CLASSES> <root url="file://$MODULE_DIR$/src" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/common/animation-1.1.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module" module-name="ems" /> <orderEntry type="library" name="chires" level="project" /> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/common/forms-1.0.5.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="library" name="NetBeans" level="application" /> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/common/swingx.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/common/ognl-2.6.7.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/common/jcommon-1.0.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/common/jfreechart-1.0.1.jar!/" /> </CLASSES> <JAVADOC> <root url="http://www.jfree.org/jfreechart/api/gjdoc/" /> </JAVADOC> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/common/zql.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntryProperties /> </component> </module> Index: MC4JProject.ipr =================================================================== RCS file: /cvsroot/mc4j/mc4j/MC4JProject.ipr,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MC4JProject.ipr 5 Oct 2004 05:17:17 -0000 1.4 --- MC4JProject.ipr 12 Apr 2006 19:14:00 -0000 1.5 *************** *** 6,18 **** <additionalClassPath /> <antReference projectDefault="true" /> ! <customJdkName value="java version "1.5.0"" /> <maximumHeapSize value="128" /> <properties /> </buildFile> </component> <component name="CodeStyleManager"> <option name="USE_DEFAULT_CODE_STYLE_SCHEME" value="true" /> <option name="CODE_STYLE_SCHEME" value="" /> </component> <component name="CodeStyleSettingsManager"> <option name="PER_PROJECT_SETTINGS" /> --- 6,32 ---- <additionalClassPath /> <antReference projectDefault="true" /> ! <customJdkName value="1.5.0_06" /> ! <maximumHeapSize value="128" /> ! <properties /> ! </buildFile> ! <buildFile url="file://$PROJECT_DIR$/modules/ems/build.xml"> ! <additionalClassPath /> ! <antReference projectDefault="true" /> ! <customJdkName value="" /> <maximumHeapSize value="128" /> <properties /> </buildFile> </component> + <component name="BuildJarProjectSettings"> + <option name="BUILD_JARS_ON_MAKE" value="false" /> + </component> <component name="CodeStyleManager"> <option name="USE_DEFAULT_CODE_STYLE_SCHEME" value="true" /> <option name="CODE_STYLE_SCHEME" value="" /> </component> + <component name="CodeStyleProjectProfileManger"> + <option name="PROJECT_PROFILE" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + </component> <component name="CodeStyleSettingsManager"> <option name="PER_PROJECT_SETTINGS" /> *************** *** 21,25 **** <component name="CompilerConfiguration"> <option name="DEFAULT_COMPILER" value="Javac" /> - <option name="CLEAR_OUTPUT_DIRECTORY" value="false" /> <option name="DEPLOY_AFTER_MAKE" value="0" /> <resourceExtensions> --- 35,38 ---- *************** *** 39,43 **** --- 52,73 ---- <component name="DataSourceManager" /> <component name="DataSourceManagerImpl" /> + <component name="DependenciesAnalyzeManager"> + <option name="myForwardDirection" value="false" /> + </component> <component name="DependencyValidationManager" /> + <component name="EclipseCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="EclipseEmbeddedCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> <component name="EjbActionsConfiguration"> <option name="NEW_MESSAGE_BEAN_LAST_PACKAGE" value="" /> *************** *** 55,58 **** --- 85,92 ---- </component> <component name="GUI Designer component loader factory" /> + <component name="InspectionProjectProfileManager"> + <option name="PROJECT_PROFILE" value="Project Default" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + </component> <component name="JUnitProjectSettings"> <option name="TEST_RUNNER" value="UI" /> *************** *** 64,68 **** <option name="ADDITIONAL_OPTIONS_STRING" value="-O" /> <option name="MAXIMUM_HEAP_SIZE" value="128" /> - <option name="USE_GENERICS_COMPILER" value="false" /> </component> <component name="JavadocGenerationManager"> --- 98,101 ---- *************** *** 92,108 **** <component name="Palette2"> <group name="Swing"> ! <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false"> <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> </item> ! <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false"> <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> </item> ! <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false"> <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> </item> ! <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false"> <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> </item> ! <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false"> <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> <initial-values> --- 125,141 ---- <component name="Palette2"> <group name="Swing"> ! <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> </item> ! <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> </item> ! <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false"> <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> </item> ! <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> </item> ! <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> <initial-values> *************** *** 110,114 **** </initial-values> </item> ! <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false"> <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> <initial-values> --- 143,147 ---- </initial-values> </item> ! <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> <initial-values> *************** *** 116,120 **** </initial-values> </item> ! <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false"> <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> <initial-values> --- 149,153 ---- </initial-values> </item> ! <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> <initial-values> *************** *** 122,126 **** </initial-values> </item> ! <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false"> <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> <initial-values> --- 155,159 ---- </initial-values> </item> ! <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false"> <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> <initial-values> *************** *** 128,195 **** </initial-values> </item> ! <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> <preferred-size width="150" height="-1" /> </default-constraints> </item> ! <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> <preferred-size width="150" height="-1" /> </default-constraints> </item> ! <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> <preferred-size width="150" height="-1" /> </default-constraints> </item> ! <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> ! <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> ! <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> ! <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false"> <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> </item> ! <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> ! <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false"> <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> ! <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> ! <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false"> <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> <preferred-size width="200" height="200" /> </default-constraints> </item> ! <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false"> <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> <preferred-size width="200" height="200" /> </default-constraints> </item> ! <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> </item> ! <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> </item> </group> </component> --- 161,245 ---- </initial-values> </item> ! <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> <preferred-size width="150" height="-1" /> </default-constraints> </item> ! <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> <preferred-size width="150" height="-1" /> </default-constraints> </item> ! <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> <preferred-size width="150" height="-1" /> </default-constraints> </item> ! <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> ! <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> ! <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> ! <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> </item> ! <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> ! <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> ! <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> ! <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> <preferred-size width="200" height="200" /> </default-constraints> </item> ! <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> <preferred-size width="200" height="200" /> </default-constraints> </item> ! <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> </item> ! <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> </item> + <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> + <preferred-size width="-1" height="20" /> + </default-constraints> + </item> + <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> + </item> </group> </component> *************** *** 197,203 **** <modules> <module fileurl="file://$PROJECT_DIR$/MC4J.iml" filepath="$PROJECT_DIR$/MC4J.iml" /> </modules> </component> ! <component name="ProjectRootManager" version="2" assert-keyword="false" jdk-15="false" project-jdk-name="java version "1.5.0"" /> <component name="RmicSettings"> <option name="IS_EANABLED" value="false" /> --- 247,254 ---- <modules> <module fileurl="file://$PROJECT_DIR$/MC4J.iml" filepath="$PROJECT_DIR$/MC4J.iml" /> + <module fileurl="file://$PROJECT_DIR$/modules/ems/ems.iml" filepath="$PROJECT_DIR$/modules/ems/ems.iml" /> </modules> </component> ! <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5.0_06" /> <component name="RmicSettings"> <option name="IS_EANABLED" value="false" /> *************** *** 381,385 **** --- 432,439 ---- <option name="INSTRUMENT_CLASSES" value="false" /> <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="false" /> + <option name="IRIDA_LAYOUT_MODE" value="false" /> + <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" /> </component> + <UsedPathMacros /> </project> |
