December 2008 - jbosstools-commits

JBoss Tools SVN: r12640 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console: src/org/hibernate/eclipse/console and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2008-12-17 09:19:09 -0500 (Wed, 17 Dec 2008) New Revision: 12640 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConnectionProfileCtrl.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/IConsoleConfigurationLaunchConstants.java Log: https://jira.jboss.org/jira/browse/JBIDE-3361 Added new choice '[JPA Project Configured Connection]'. Validation checks that project is jpa project and that connection profile specified for it. Console configuration uses current cp on the build time. Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF 2008-12-17 13:05:33 UTC (rev 12639) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF 2008-12-17 14:19:09 UTC (rev 12640) @@ -74,5 +74,7 @@ org.eclipse.core.filesystem, org.eclipse.core.variables, org.eclipse.datatools.connectivity.ui, - org.eclipse.datatools.connectivity + org.eclipse.datatools.connectivity, + org.eclipse.jpt.core, + org.eclipse.jpt.db Eclipse-LazyStart: true Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2008-12-17 13:05:33 UTC (rev 12639) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2008-12-17 14:19:09 UTC (rev 12640) @@ -10,6 +10,7 @@ import java.util.List; import java.util.Properties; +import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -18,6 +19,9 @@ import org.eclipse.datatools.connectivity.IConnectionProfile; import org.eclipse.datatools.connectivity.ProfileManager; import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; +import org.eclipse.jpt.core.JpaDataSource; +import org.eclipse.jpt.core.JpaProject; import org.eclipse.osgi.util.NLS; import org.hibernate.console.HibernateConsoleRuntimeException; import org.hibernate.console.preferences.ConsoleConfigurationPreferences; @@ -128,6 +132,20 @@ } public String getConnectionProfileName() { + if (Boolean.parseBoolean(getAttribute(IConsoleConfigurationLaunchConstants.USE_JPA_PROJECT_PROFILE, null))){ + String projName = getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, null); + if (projName != null){ + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName); + if (project != null){ + JpaProject jpaProject = (JpaProject) project.getAdapter(JpaProject.class); + if (jpaProject != null) { + JpaDataSource ds = jpaProject.getDataSource(); + if (ds != null) + return ds.getConnectionProfileName(); + } + } + } + } return getAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME, null); } @@ -167,8 +185,9 @@ public String getDialectName() { String dialect = getAttribute( IConsoleConfigurationLaunchConstants.DIALECT, null ); // determine dialect when connection profile is used - if (dialect == null && getConnectionProfileName() != null) { - IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(getConnectionProfileName()); + if (dialect == null && getConnectionProfileName() != null && getConnectionProfileName() != null) { + IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(getConnectionProfileName()); + if (profile == null) return null; String driver = profile.getProperties(profile.getProviderId()).getProperty("org.eclipse.datatools.connectivity.db.driverClass"); dialect = new DriverClassHelpers().getDialect(driver); } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2008-12-17 13:05:33 UTC (rev 12639) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2008-12-17 14:19:09 UTC (rev 12640) @@ -456,6 +456,9 @@ public static String ConsoleConfigurationMainTab_type; public static String ConsoleConfigurationMainTab_use_existing; public static String ConsoleConfigurationMainTab_wizard_page; + public static String ConsoleConfigurationMainTab_project_must_be_jpa; + public static String ConsoleConfigurationMainTab_cp_not_specified; + public static String ConsoleConfigurationMainTab_project_must_be_set; public static String ConsoleConfigurationMappingsTab_add_hbm_xml_file; public static String ConsoleConfigurationMappingsTab_add_hibernate_mapping_file; public static String ConsoleConfigurationMappingsTab_additional_mapping_files; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2008-12-17 13:05:33 UTC (rev 12639) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2008-12-17 14:19:09 UTC (rev 12640) @@ -448,6 +448,9 @@ ConsoleConfigurationMainTab_type=Type: ConsoleConfigurationMainTab_use_existing=Use &existing... ConsoleConfigurationMainTab_wizard_page=wizardPage +ConsoleConfigurationMainTab_project_must_be_jpa=Project ''{0}'' must be a JPA project +ConsoleConfigurationMainTab_cp_not_specified=Connection profile for project ''{0}'' not specified +ConsoleConfigurationMainTab_project_must_be_set=Project must be set to JPA project ConsoleConfigurationMappingsTab_add_hbm_xml_file=Add hbm.xml file ConsoleConfigurationMappingsTab_add_hibernate_mapping_file=Add a Hibernate Mapping file ConsoleConfigurationMappingsTab_additional_mapping_files=Additonal mapping files (not listed in cfg.xml) Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConnectionProfileCtrl.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConnectionProfileCtrl.java 2008-12-17 13:05:33 UTC (rev 12639) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConnectionProfileCtrl.java 2008-12-17 14:19:09 UTC (rev 12640) @@ -55,8 +55,12 @@ protected ComboViewer comboControl; protected Button buttonNew; protected Button buttonEdit; + + static final String NO_CONNECTIN_NAME = "[Hibernate configured connection]"; + static final String JPA_CONNECTIN_NAME = "[JPA Project Configured Connection]"; - static final protected ConnectionWrapper NO_CONNECTION_PLACEHOLDER = new ConnectionWrapper("",null); + static final protected ConnectionWrapper NO_CONNECTION_PLACEHOLDER = new ConnectionWrapper(NO_CONNECTIN_NAME, null); + static final protected ConnectionWrapper JPA_CONNECTION_PLACEHOLDER = new ConnectionWrapper(JPA_CONNECTIN_NAME, null); private static class ConnectionWrapper { @@ -250,11 +254,7 @@ @Override public String getText(Object element) { ConnectionWrapper cw = (ConnectionWrapper) element; - if(cw.getProfile()==null) { - return "[Hibernate configured connection]"; - } else { - return cw.getProfile().getName(); - } + return cw.getId(); } }); @@ -324,9 +324,6 @@ private String getSelectedId() { ConnectionWrapper cw = getSelectedConnection(); - if (cw == null) { - cw = NO_CONNECTION_PLACEHOLDER; - } return cw.getId(); } @@ -337,6 +334,7 @@ IConnectionProfile[] profiles = ProfileManager.getInstance() .getProfilesByCategory("org.eclipse.datatools.connectivity.db.category"); //$NON-NLS-1$ List<ConnectionWrapper> names = new ArrayList<ConnectionWrapper>(); + names.add(JPA_CONNECTION_PLACEHOLDER); names.add(NO_CONNECTION_PLACEHOLDER); for (IConnectionProfile connectionProfile : profiles) { names.add(new ConnectionWrapper(connectionProfile.getName(), connectionProfile)); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java 2008-12-17 13:05:33 UTC (rev 12639) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java 2008-12-17 14:19:09 UTC (rev 12640) @@ -21,6 +21,8 @@ import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.jpt.core.JpaDataSource; +import org.eclipse.jpt.core.JpaProject; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -168,7 +170,14 @@ configuration.setAttribute(IConsoleConfigurationLaunchConstants.PROPERTY_FILE, nonEmptyTrimOrNull(propertyFileText)); configuration.setAttribute(IConsoleConfigurationLaunchConstants.CFG_XML_FILE, nonEmptyTrimOrNull(configurationFileText)); configuration.setAttribute(IConsoleConfigurationLaunchConstants.PERSISTENCE_UNIT_NAME, nonEmptyTrimOrNull(persistenceUnitNameText)); - configuration.setAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME, nonEmptyTrimOrNull(connectionProfileCtrl.getSelectedConnectionName())); + String cpName = nonEmptyTrimOrNull(connectionProfileCtrl.getSelectedConnectionName()); + if (ConnectionProfileCtrl.JPA_CONNECTIN_NAME.equals(cpName)){ + configuration.setAttribute(IConsoleConfigurationLaunchConstants.USE_JPA_PROJECT_PROFILE, Boolean.toString(true)); + configuration.removeAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME); + } else { + configuration.setAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME, cpName); + configuration.removeAttribute(IConsoleConfigurationLaunchConstants.USE_JPA_PROJECT_PROFILE); + } } public void initializeFrom(ILaunchConfiguration configuration) { @@ -184,7 +193,10 @@ configurationFileText.setText( configuration.getAttribute( IConsoleConfigurationLaunchConstants.CFG_XML_FILE, "" )); //$NON-NLS-1$ persistenceUnitNameText.setText( configuration.getAttribute( IConsoleConfigurationLaunchConstants.PERSISTENCE_UNIT_NAME, "" )); //$NON-NLS-1$ - connectionProfileCtrl.selectValue(configuration.getAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME, "")); //$NON-NLS-1$ + if (Boolean.parseBoolean(configuration.getAttribute(IConsoleConfigurationLaunchConstants.USE_JPA_PROJECT_PROFILE, Boolean.toString(false)))){ + connectionProfileCtrl.selectValue(ConnectionProfileCtrl.JPA_CONNECTIN_NAME); + } else + connectionProfileCtrl.selectValue(configuration.getAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME, "")); //$NON-NLS-1$ } catch (CoreException e) { HibernateConsolePlugin.getDefault().log( e ); @@ -364,6 +376,7 @@ confbutton.setEnabled(!configurationFileWillBeCreated && !modeJPA); persistenceUnitNameText.setEnabled(modeJPA); + String cpName = nonEmptyTrimOrNull(connectionProfileCtrl.getSelectedConnectionName()); if(getProjectName()!=null && StringHelper.isNotEmpty(getProjectName().trim())) { Path projectPath = new Path(getProjectName()); @@ -377,7 +390,33 @@ setErrorMessage(out); return false; } + + if (ConnectionProfileCtrl.JPA_CONNECTIN_NAME.equals(cpName)){ + JpaProject jpaProject = (JpaProject) findJavaProject.getAdapter(JpaProject.class); + if (jpaProject == null){ + setErrorMessage(NLS.bind(HibernateConsoleMessages.ConsoleConfigurationMainTab_project_must_be_jpa, getProjectName())); + return false; + } + JpaDataSource ds = jpaProject.getDataSource(); + if (ds == null || "".equals(ds.getConnectionProfileName())){ + setErrorMessage(NLS.bind(HibernateConsoleMessages.ConsoleConfigurationMainTab_cp_not_specified, getProjectName())); + return false; + } + } + } else {//check if jpa project connection selected + if (ConnectionProfileCtrl.JPA_CONNECTIN_NAME.equals(cpName)){ + setErrorMessage(HibernateConsoleMessages.ConsoleConfigurationMainTab_project_must_be_set); + return false; + } } + + if (ConnectionProfileCtrl.JPA_CONNECTIN_NAME.equals(cpName)){ + if (!jpaMode.getSelection()){ + String out = NLS.bind("{0} mode must be used for jpa project configured connection", jpaMode.getText()); + setErrorMessage(out); + return false; + } + } /* TODO: warn about implicit behavior of loading /hibernate.cfg.xml, /hibernate.properties and /META-INF/persistence.xml * if (propertyFilename.length() == 0 && configurationFilename.trim().length() == 0) { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/IConsoleConfigurationLaunchConstants.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/IConsoleConfigurationLaunchConstants.java 2008-12-17 13:05:33 UTC (rev 12639) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/IConsoleConfigurationLaunchConstants.java 2008-12-17 14:19:09 UTC (rev 12640) @@ -13,6 +13,7 @@ public static final String PERSISTENCE_UNIT_NAME = ID + ".PERSISTENCE_UNIT_NAME"; //$NON-NLS-1$ public static final String CONFIGURATION_FACTORY = ID + ".CONFIGURATION_FACTORY"; //$NON-NLS-1$ public static final String CONNECTION_PROFILE_NAME = ID + ".CONNECTION_PROFILE_NAME"; //$NON-NLS-1$ + public static final String USE_JPA_PROJECT_PROFILE = ID + ".USE_JPA_PROJECT_PROFILE"; //$NON-NLS-1$ public static final String FILE_MAPPINGS = ID + ".FILE_MAPPINGS"; //$NON-NLS-1$ public static final String PROJECT_NAME = IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME;

17 years

1
0
0 / 0

JBoss Tools SVN: r12639 - in trunk/vpe/plugins/org.jboss.tools.vpe: ve and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2008-12-17 08:05:33 -0500 (Wed, 17 Dec 2008) New Revision: 12639 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html Log: https://jira.jboss.org/jira/browse/JBIDE-3396 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2008-12-17 12:54:34 UTC (rev 12638) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2008-12-17 13:05:33 UTC (rev 12639) @@ -477,7 +477,7 @@ } protected nsIDOMElement findContentArea() { - nsIDOMElement area = xulRunnerEditor.getDOMDocument().getDocumentElement(); + nsIDOMElement area = null; nsIDOMNodeList nodeList = xulRunnerEditor.getDOMDocument().getElementsByTagName(HTML.TAG_BODY); long length = nodeList.getLength(); for(long i=0; i<length; i++) { @@ -492,7 +492,9 @@ } } if (area == null) { - return null; + //fix for jbide-3396, if we can't find a boody element, we should create it + area = xulRunnerEditor.getDOMDocument().createElement(HTML.TAG_BODY); + xulRunnerEditor.getDOMDocument().getDocumentElement().appendChild(area); } nsIDOMNode root = xulRunnerEditor.getDOMDocument().getDocumentElement(); @@ -784,4 +786,4 @@ } return editor; } -} \ No newline at end of file +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html 2008-12-17 12:54:34 UTC (rev 12638) +++ trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html 2008-12-17 13:05:33 UTC (rev 12639) @@ -67,6 +67,8 @@ </head> -<body id="__content__area__"></body> +<body id="__content__area__"> + +</body> </html>

17 years

1
0
0 / 0

JBoss Tools SVN: r12638 - branches/jbosstools-3.0.0.CR1/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces.

by jbosstools-commits＠lists.jboss.org

Author: sdzmitrovich Date: 2008-12-17 07:54:34 -0500 (Wed, 17 Dec 2008) New Revision: 12638 Modified: branches/jbosstools-3.0.0.CR1/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-3326 Modified: branches/jbosstools-3.0.0.CR1/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java =================================================================== --- branches/jbosstools-3.0.0.CR1/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-12-17 11:32:38 UTC (rev 12637) +++ branches/jbosstools-3.0.0.CR1/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-12-17 12:54:34 UTC (rev 12638) @@ -233,9 +233,14 @@ .replaceFirst( "^\\s*(\\#|\\$)\\{facesContext.externalContext.requestContextPath\\}", Constants.EMPTY); //$NON-NLS-1$ - IFile file = pageContext.getVisualBuilder().getCurrentIncludeInfo() - .getFile(); + IFile file = null; + if (pageContext.getVisualBuilder().getCurrentIncludeInfo() != null) + file = pageContext.getVisualBuilder().getCurrentIncludeInfo() + .getFile(); + if (file == null) + return resolvedValue; + resolvedValue = ElService.getInstance().replaceEl(file, resolvedValue); // IPath path = new Path(resolvedValue);

17 years

1
0
0 / 0

JBoss Tools SVN: r12637 - in trunk/jmx/docs: reference and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: smukhina Date: 2008-12-17 06:32:38 -0500 (Wed, 17 Dec 2008) New Revision: 12637 Added: trunk/jmx/docs/reference/ trunk/jmx/docs/reference/en/ trunk/jmx/docs/reference/en/images/ trunk/jmx/docs/reference/en/images/favicon.ico trunk/jmx/docs/reference/en/master.xml trunk/jmx/docs/reference/en/modules/ trunk/jmx/docs/reference/en/modules/introduction.xml trunk/jmx/docs/reference/pom.xml Log: https://jira.jboss.org/jira/browse/JBDS-528 JMX Guide build structure Added: trunk/jmx/docs/reference/en/images/favicon.ico =================================================================== (Binary files differ) Property changes on: trunk/jmx/docs/reference/en/images/favicon.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jmx/docs/reference/en/master.xml =================================================================== --- trunk/jmx/docs/reference/en/master.xml (rev 0) +++ trunk/jmx/docs/reference/en/master.xml 2008-12-17 11:32:38 UTC (rev 12637) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" +"http://www.docbook.org/xml/4.3/docbookx.dtd" + +[<!ENTITY introduction SYSTEM "modules/introduction.xml"> + + +<!ENTITY seamlink "../../seam/html_single/index.html"> +<!ENTITY aslink "../../as/html_single/index.html"> +<!ENTITY esblink "../../esb_ref_guide/html_single/index.html"> +<!ENTITY gsglink "../../GettingStartedGuide/html_single/index.html"> +<!ENTITY hibernatelink "../../hibernatetools/html_single/index.html"> +<!ENTITY jbpmlink "../../jbpm/html_single/index.html"> +<!ENTITY jsflink "../../jsf/html_single/index.html"> +<!ENTITY jsfreflink "../../jsf_tools_ref_guide/html_single/index.html"> +<!ENTITY jsftutoriallink "../../jsf_tools_tutorial/html_single/index.html"> +<!ENTITY strutsreflink "../../struts_tools_ref_guide/html_single/index.html"> +<!ENTITY strutstutoriallink "../../struts_tools_tutorial/html_single/index.html"> + + +]> + +<book> + + <bookinfo> + <title>JMX Tools Reference Guide</title> + +  + + <pubdate>December 2008</pubdate> + <copyright> + <year>2007</year> + <year>2008</year> + <holder>JBoss, a division of Red Hat Inc.</holder> + </copyright> + <releaseinfo> + Version: 3.0.0.CR1 + </releaseinfo> +<abstract> + <title/> + <para> + <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/as/pdf/JMX_Tools_Ref...">PDF version</ulink> + </para> +</abstract> + + </bookinfo> + + + <toc/> + &introduction; +  + +</book> Added: trunk/jmx/docs/reference/en/modules/introduction.xml =================================================================== --- trunk/jmx/docs/reference/en/modules/introduction.xml (rev 0) +++ trunk/jmx/docs/reference/en/modules/introduction.xml 2008-12-17 11:32:38 UTC (rev 12637) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<chapter id="intruduction" > + <title>Introduction</title> + + <para>This chapter covers the basics of working with JMX plugin.</para> + + <para></para> +</chapter> Added: trunk/jmx/docs/reference/pom.xml =================================================================== --- trunk/jmx/docs/reference/pom.xml (rev 0) +++ trunk/jmx/docs/reference/pom.xml 2008-12-17 11:32:38 UTC (rev 12637) @@ -0,0 +1,117 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.jboss.tools</groupId> + <artifactId>jmx-tools-ref-guide-${translation}</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>jdocbook</packaging> + <name>JMX_Tools_Reference_Guide</name> + + <profiles> + <profile> + <id>diffmk</id> + <properties> + <master>master_output.xml</master> + </properties> + </profile> + </profiles> + + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.0-200803311251UTC-MPJDOCBOOK-8</version> + + <extensions>true</extensions> + + <dependencies> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + + <configuration> + <sourceDocumentName>${master}</sourceDocumentName> + <sourceDirectory>${pom.basedir}/en</sourceDirectory> + <imageResource> + <directory>${pom.basedir}/en</directory> + <includes> + <include>images/**/*</include> + </includes> + </imageResource> + <cssResource> + <directory>${pom.basedir}/${cssdir}</directory> + </cssResource> + + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/pdf.xsl</stylesheetResource> + <finalName>${pom.name}.pdf</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>eclipse</formatName> + <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/eclipse.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> +  +  + <docbookVersion>1.72.0</docbookVersion> + </options> + + </configuration> + </plugin> + + </plugins> + </build> + + <distributionManagement> + <repository> +  +  +  + <id>repository.jboss.org</id> + <url>file://${maven.repository.root}</url> + </repository> + <snapshotRepository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshot Repository</name> + <url>dav:https://snapshots.jboss.org/maven2</url> + </snapshotRepository> + </distributionManagement> + + <properties> + <stylesdir>../../../documentation/jbosstools-docbook-xslt/src/main/resources/</stylesdir> + <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/org/css/</cssdir> + <master>master.xml</master> + <translation>en-US</translation> + </properties> + +</project>

17 years

1
0
0 / 0

JBoss Tools SVN: r12636 - workspace/grid/esb-example.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2008-12-17 00:19:57 -0500 (Wed, 17 Dec 2008) New Revision: 12636 Modified: workspace/grid/esb-example/transform_CSV2XML.zip workspace/grid/esb-example/transform_XML2XML_simple.zip Log: change esb samples Modified: workspace/grid/esb-example/transform_CSV2XML.zip =================================================================== (Binary files differ) Modified: workspace/grid/esb-example/transform_XML2XML_simple.zip =================================================================== (Binary files differ)

17 years

1
0
0 / 0

JBoss Tools SVN: r12635 - workspace/examples.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2008-12-17 00:19:31 -0500 (Wed, 17 Dec 2008) New Revision: 12635 Modified: workspace/examples/projectExamples.xml Log: changes for esb samples Modified: workspace/examples/projectExamples.xml =================================================================== --- workspace/examples/projectExamples.xml 2008-12-17 04:53:31 UTC (rev 12634) +++ workspace/examples/projectExamples.xml 2008-12-17 05:19:31 UTC (rev 12635) @@ -207,7 +207,7 @@ The tranformation is done by configuring Smooks and performing two transformation, one transformation from CSV to an intermediate xml format, and a second transformation from the intermediate xml format to the target xml.</description> - <size>9500</size> + <size>7200</size> <url> http://anonsvn.jboss.org/repos/jbosstools/workspace/grid/esb-example/tran... </url> @@ -286,7 +286,7 @@ <description>This is a very basic sample of how to manually define and apply a Message Transformation within JBoss ESB. It applies a very simple XSLT to a SampleOrder.xml message and prints the before and after XML to the console.</description> - <size>9300</size> + <size>6700</size> <url> http://anonsvn.jboss.org/repos/jbosstools/workspace/grid/esb-example/tran... </url>

17 years

1
0
0 / 0

JBoss Tools SVN: r12634 - workspace/grid/esb-example.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2008-12-16 23:53:31 -0500 (Tue, 16 Dec 2008) New Revision: 12634 Modified: workspace/grid/esb-example/transform_CSV2XML.zip Log: change a esb sample Modified: workspace/grid/esb-example/transform_CSV2XML.zip =================================================================== (Binary files differ)

17 years

1
0
0 / 0

JBoss Tools SVN: r12633 - workspace/grid/esb-example.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2008-12-16 22:32:40 -0500 (Tue, 16 Dec 2008) New Revision: 12633 Modified: workspace/grid/esb-example/transform_CSV2XML.zip Log: change a esb sample Modified: workspace/grid/esb-example/transform_CSV2XML.zip =================================================================== (Binary files differ)

17 years

1
0
0 / 0

JBoss Tools SVN: r12632 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2008-12-16 19:26:45 -0500 (Tue, 16 Dec 2008) New Revision: 12632 Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StartEventFigure.java Log: Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StartEventFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StartEventFigure.java 2008-12-17 00:26:23 UTC (rev 12631) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StartEventFigure.java 2008-12-17 00:26:45 UTC (rev 12632) @@ -5,7 +5,7 @@ import org.jboss.tools.flow.jpdl4.Activator; -public class StartEventFigure extends EventFigure { // EventFigure { +public class StartEventFigure extends EventFigure { private static final Image icon = ImageDescriptor.createFromURL( Activator.getDefault().getBundle().getEntry("icons/48/start_event_empty.png")).createImage();;

17 years

1
0
0 / 0

JBoss Tools SVN: r12631 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4: icons/16 and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2008-12-16 19:26:23 -0500 (Tue, 16 Dec 2008) New Revision: 12631 Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_cancel.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_error.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_terminate.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/flow_sequence.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/gateway_exclusive.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/gateway_parallel.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/start_event_empty.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_empty.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_cancel.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_error.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_terminate.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/flow_sequence.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/gateway_exclusive.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/gateway_parallel.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/start_event_empty.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_empty.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_cancel.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_error.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_terminate.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/flow_sequence.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/gateway_exclusive.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/gateway_parallel.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/start_event_empty.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_empty.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/task_empty_110.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/GatewayFigure.java Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EndEventFigure.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EventFigure.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ExclusiveGatewayFigure.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ParallelGatewayFigure.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StartEventFigure.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StateTaskFigure.java Log: - short xml notation while saving - new graphics Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_cancel.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_cancel.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_error.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_error.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_terminate.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_terminate.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/flow_sequence.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/flow_sequence.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/gateway_exclusive.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/gateway_exclusive.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/gateway_parallel.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/gateway_parallel.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/start_event_empty.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/start_event_empty.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_empty.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_empty.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_cancel.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_cancel.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_error.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_error.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_terminate.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_terminate.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/flow_sequence.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/flow_sequence.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/gateway_exclusive.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/gateway_exclusive.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/gateway_parallel.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/gateway_parallel.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/start_event_empty.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/start_event_empty.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_empty.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_empty.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_cancel.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_cancel.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_error.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_error.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_terminate.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_terminate.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/flow_sequence.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/flow_sequence.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/gateway_exclusive.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/gateway_exclusive.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/gateway_parallel.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/gateway_parallel.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/start_event_empty.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/start_event_empty.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_empty.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_empty.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/task_empty_110.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/task_empty_110.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2008-12-17 00:25:15 UTC (rev 12630) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -70,8 +70,8 @@ "Create a new Start Event", "org.jboss.tools.flow.jpdl4.startEvent", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.startEvent"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/start_event_empty.png")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/start_event_empty.png")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/start_event_empty.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/start_event_empty.png")) ); entries.add(combined); combined = new CombinedTemplateCreationEntry( @@ -79,8 +79,8 @@ "Create a new End Event", "org.jboss.tools.flow.jpdl4.endEvent", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.endEvent"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/end_event_terminate.png")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/end_event_terminate.png")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/end_event_terminate.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/end_event_terminate.png")) ); entries.add(combined); return entries; @@ -93,8 +93,8 @@ "Create a new Wait State Task", "org.jboss.tools.flow.jpdl4.stateTask", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.stateTask"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/task_empty.png")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/task_empty.png")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_empty.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_empty.png")) ); entries.add(combined); return entries; @@ -107,8 +107,8 @@ "Create a new Exclusive Gateway", "org.jboss.tools.flow.jpdl4.exclusiveGateway", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.exclusiveGateway"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/gateway_exclusive.png")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/gateway_exclusive.png")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/gateway_exclusive.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/gateway_exclusive.png")) ); entries.add(combined); combined = new CombinedTemplateCreationEntry( @@ -116,8 +116,8 @@ "Create a new Parallel Fork Gateway", "org.jboss.tools.flow.jpdl4.parallelForkGateway", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.parallelForkGateway"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/gateway_parallel.png")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/gateway_parallel.png")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/gateway_parallel.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/gateway_parallel.png")) ); entries.add(combined); combined = new CombinedTemplateCreationEntry( @@ -125,8 +125,8 @@ "Create a new Parallel Join Gateway", "org.jboss.tools.flow.jpdl4.parallelJoinGateway", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.parallelJoinGateway"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/gateway_parallel.png")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/gateway_parallel.png")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/gateway_parallel.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/gateway_parallel.png")) ); entries.add(combined); return entries; @@ -138,8 +138,8 @@ "Sequence", "Creating a new Sequence Flow", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.sequenceFlow"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/flow_sequence.png")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/flow_sequence.png")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/flow_sequence.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/flow_sequence.png")) ); entries.add(tool); return entries; Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2008-12-17 00:25:15 UTC (rev 12630) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -18,10 +18,10 @@ import org.jboss.tools.flow.jpdl4.model.ParallelForkGateway; import org.jboss.tools.flow.jpdl4.model.ParallelJoinGateway; import org.jboss.tools.flow.jpdl4.model.Process; +import org.jboss.tools.flow.jpdl4.model.SequenceFlow; import org.jboss.tools.flow.jpdl4.model.StartEvent; import org.jboss.tools.flow.jpdl4.model.StateTask; import org.jboss.tools.flow.jpdl4.model.SuperState; -import org.jboss.tools.flow.jpdl4.model.SequenceFlow; public class JpdlSerializer { @@ -38,8 +38,15 @@ Object object = wrapper.getElement(); if (!(object instanceof Element)) return; appendOpening(buffer, wrapper, level); - appendBody(buffer, wrapper, level); - appendClosing(buffer, wrapper, level); + StringBuffer body = new StringBuffer(); + appendBody(body, wrapper, level); + if (body.length() > 0) { + buffer.append(">"); + buffer.append(body); + appendClosing(buffer, wrapper, level); + } else { + buffer.append("/>"); + } } private static void appendOpening(StringBuffer buffer, Wrapper wrapper, int level) { @@ -56,90 +63,82 @@ buffer.append("to=\"" + value + "\""); } appendConnectionGraphics(buffer, (ConnectionWrapper)wrapper); - buffer.append(">"); } else if (element instanceof EndEvent) { EndEvent endState = (EndEvent)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<end"); - if (endState.getName() != null) { + if (!isEmpty(endState.getName())) { buffer.append(" "); String value = endState.getName(); buffer.append("name=\"" + value + "\""); } appendNodeGraphics(buffer, (NodeWrapper)wrapper); - buffer.append(">"); } else if (element instanceof StartEvent) { StartEvent startState = (StartEvent)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<start"); - if (startState.getName() != null) { + if (!isEmpty(startState.getName())) { buffer.append(" "); String value = startState.getName(); buffer.append("name=\"" + value + "\""); } appendNodeGraphics(buffer, (NodeWrapper)wrapper); - buffer.append(">"); } else if (element instanceof SuperState) { SuperState superState = (SuperState)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<super-state"); - if (superState.getName() != null) { + if (!isEmpty(superState.getName())) { buffer.append(" "); String value = superState.getName(); buffer.append("name=\"" + value + "\""); } - buffer.append(">"); } else if (element instanceof StateTask) { StateTask state = (StateTask)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<state"); - if (state.getName() != null) { + if (!isEmpty(state.getName())) { buffer.append(" "); String value = state.getName(); buffer.append("name=\"" + value + "\""); } appendNodeGraphics(buffer, (NodeWrapper)wrapper); - buffer.append(">"); } else if (element instanceof ExclusiveGateway) { ExclusiveGateway exclusiveGateway = (ExclusiveGateway)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<exclusive"); - if (exclusiveGateway.getName() != null) { + if (!isEmpty(exclusiveGateway.getName())) { buffer.append(" "); String value = exclusiveGateway.getName(); buffer.append("name=\"" + value + "\""); } appendNodeGraphics(buffer, (NodeWrapper)wrapper); - buffer.append(">"); } else if (element instanceof ParallelForkGateway) { ParallelForkGateway parallelForkGateway = (ParallelForkGateway)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<fork"); - if (parallelForkGateway.getName() != null) { + if (!isEmpty(parallelForkGateway.getName())) { buffer.append(" "); String value = parallelForkGateway.getName(); buffer.append("name=\"" + value + "\""); } appendNodeGraphics(buffer, (NodeWrapper)wrapper); - buffer.append(">"); } else if (element instanceof ParallelJoinGateway) { ParallelJoinGateway parallelJoinGateway = (ParallelJoinGateway)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<join"); - if (parallelJoinGateway.getName() != null) { + if (!isEmpty(parallelJoinGateway.getName())) { buffer.append(" "); String value = parallelJoinGateway.getName(); buffer.append("name=\"" + value + "\""); } appendNodeGraphics(buffer, (NodeWrapper)wrapper); - buffer.append(">"); } else if (element instanceof Process) { Process process = (Process)element; buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n"); @@ -151,16 +150,19 @@ value = value == null ? "" : value; buffer.append("initial=\"" + value + "\""); } - if (process.getName() != null) { + if (!isEmpty(process.getName())) { buffer.append(" "); String value = process.getName(); buffer.append("name=\"" + value + "\""); } - buffer.append(">"); } } + private static boolean isEmpty(String str) { + return str == null || "".equals(str); + } + private static void appendPadding(StringBuffer buffer, int level) { for (int i = 0; i < level; i++) { buffer.append(" "); Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EndEventFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EndEventFigure.java 2008-12-17 00:25:15 UTC (rev 12630) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EndEventFigure.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -1,42 +1,17 @@ package org.jboss.tools.flow.jpdl4.figure; -import org.eclipse.draw2d.LineBorder; -import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; -import org.jboss.tools.flow.common.figure.AbstractElementFigure; import org.jboss.tools.flow.jpdl4.Activator; -public class EndEventFigure extends AbstractElementFigure { //EventFigure { +public class EndEventFigure extends EventFigure { //EventFigure { private static final Image icon = ImageDescriptor.createFromURL( Activator.getDefault().getBundle().getEntry( - "icons/large/end_event_terminate.png")).createImage(); + "icons/48/end_event_terminate.png")).createImage(); - public EndEventFigure() { - setSize(32, 32); - } - - public void setText(String text) { - } - - public void setBounds(Rectangle r) { - r.setSize(32, 32); - super.setBounds(r); - } - protected void customizeFigure() { setIcon(icon); } - public void setSelected(boolean b) { - super.setSelected(b); - ((LineBorder) getBorder()).setWidth(b ? 3 : 0); - repaint(); - } - // protected void customizeFigure() { - // super.customizeFigure(); - // ellipse.setLineWidth(5); - // } - } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EventFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EventFigure.java 2008-12-17 00:25:15 UTC (rev 12630) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EventFigure.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -1,7 +1,30 @@ package org.jboss.tools.flow.jpdl4.figure; -import org.jboss.tools.flow.common.figure.EllipseElementFigure; +import org.eclipse.draw2d.ConnectionAnchor; +import org.eclipse.draw2d.EllipseAnchor; +import org.eclipse.draw2d.geometry.Rectangle; +import org.jboss.tools.flow.common.figure.AbstractElementFigure; -public class EventFigure extends EllipseElementFigure { +public abstract class EventFigure extends AbstractElementFigure { + public EventFigure() { + setSize(48, 48); + } + + public void setText(String text) { + } + + public void setBounds(Rectangle r) { + r.setSize(48, 48); + super.setBounds(r); + } + + public ConnectionAnchor getSourceConnectionAnchor() { + return new EllipseAnchor(this); + } + + public ConnectionAnchor getTargetConnectionAnchor() { + return new EllipseAnchor(this); + } + } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ExclusiveGatewayFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ExclusiveGatewayFigure.java 2008-12-17 00:25:15 UTC (rev 12630) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ExclusiveGatewayFigure.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -1,29 +1,15 @@ package org.jboss.tools.flow.jpdl4.figure; -import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; -import org.jboss.tools.flow.common.figure.AbstractElementFigure; import org.jboss.tools.flow.jpdl4.Activator; -public class ExclusiveGatewayFigure extends AbstractElementFigure { //DiamondElementFigure { +public class ExclusiveGatewayFigure extends GatewayFigure { //DiamondElementFigure { private static final Image ICON = ImageDescriptor.createFromURL( Activator.getDefault().getBundle().getEntry( - "icons/large/gateway_exclusive.png")).createImage(); + "icons/48/gateway_exclusive.png")).createImage(); - public ExclusiveGatewayFigure() { - setSize(32, 32); - } - - public void setText(String text) { - } - - public void setBounds(Rectangle r) { - r.setSize(32, 32); - super.setBounds(r); - } - protected void customizeFigure() { setIcon(ICON); } Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/GatewayFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/GatewayFigure.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/GatewayFigure.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -0,0 +1,30 @@ +package org.jboss.tools.flow.jpdl4.figure; + +import org.eclipse.draw2d.ConnectionAnchor; +import org.eclipse.draw2d.geometry.Rectangle; +import org.jboss.tools.flow.common.figure.AbstractElementFigure; +import org.jboss.tools.flow.common.figure.DiamondAnchor; + +public abstract class GatewayFigure extends AbstractElementFigure { //DiamondElementFigure { + + public GatewayFigure() { + setSize(48, 48); + } + + public void setText(String text) { + } + + public void setBounds(Rectangle r) { + r.setSize(48, 48); + super.setBounds(r); + } + + public ConnectionAnchor getSourceConnectionAnchor() { + return new DiamondAnchor(this); + } + + public ConnectionAnchor getTargetConnectionAnchor() { + return new DiamondAnchor(this); + } + +} Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ParallelGatewayFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ParallelGatewayFigure.java 2008-12-17 00:25:15 UTC (rev 12630) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ParallelGatewayFigure.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -1,30 +1,17 @@ package org.jboss.tools.flow.jpdl4.figure; -import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; -import org.jboss.tools.flow.common.figure.AbstractElementFigure; import org.jboss.tools.flow.jpdl4.Activator; -public class ParallelGatewayFigure extends AbstractElementFigure { //DiamondElementFigure { +public class ParallelGatewayFigure extends GatewayFigure { //DiamondElementFigure { private static final Image ICON = ImageDescriptor.createFromURL( Activator.getDefault().getBundle().getEntry( - "icons/large/gateway_parallel.png")).createImage(); + "icons/48/gateway_parallel.png")).createImage(); - public ParallelGatewayFigure() { - setSize(32, 32); - } - - public void setText(String text) { - } - - public void setBounds(Rectangle r) { - r.setSize(32, 32); - super.setBounds(r); - } - protected void customizeFigure() { setIcon(ICON); } + } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StartEventFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StartEventFigure.java 2008-12-17 00:25:15 UTC (rev 12630) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StartEventFigure.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -1,39 +1,18 @@ package org.jboss.tools.flow.jpdl4.figure; -import org.eclipse.draw2d.LineBorder; -import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; -import org.jboss.tools.flow.common.figure.AbstractElementFigure; import org.jboss.tools.flow.jpdl4.Activator; -public class StartEventFigure extends AbstractElementFigure { // EventFigure { +public class StartEventFigure extends EventFigure { // EventFigure { private static final Image icon = ImageDescriptor.createFromURL( - Activator.getDefault().getBundle().getEntry("icons/large/start_event_empty.png")).createImage();; + Activator.getDefault().getBundle().getEntry("icons/48/start_event_empty.png")).createImage();; - public StartEventFigure() { - setSize(32, 32); - } - - public void setText(String text) { - } - - public void setBounds(Rectangle r) { - r.setSize(32, 32); - super.setBounds(r); - } - - protected void customizeFigure() { + protected void customizeFigure() { setIcon(icon); } - public void setSelected(boolean b) { - super.setSelected(b); - ((LineBorder) getBorder()).setWidth(b ? 3 : 1); - repaint(); - } - } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StateTaskFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StateTaskFigure.java 2008-12-17 00:25:15 UTC (rev 12630) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StateTaskFigure.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -1,7 +1,29 @@ package org.jboss.tools.flow.jpdl4.figure; +import org.eclipse.draw2d.ColorConstants; +import org.eclipse.draw2d.Graphics; +import org.eclipse.swt.graphics.Color; import org.jboss.tools.flow.common.figure.RoundedRectangleElementFigure; public class StateTaskFigure extends RoundedRectangleElementFigure { - + + private static final Color veryLightBlue = new Color(null, 246, 247, 255); + private static final Color lightBlue = new Color(null, 3, 104, 154); + + protected void paintChildren(Graphics graphics) { + Color foregroundColor = graphics.getForegroundColor(); + Color backgroundColor = graphics.getBackgroundColor(); + graphics.setBackgroundColor(veryLightBlue); + graphics.setForegroundColor(lightBlue); + super.paintChildren(graphics); + graphics.setBackgroundColor(backgroundColor); + graphics.setForegroundColor(foregroundColor); + } + + protected void customizeFigure() { + super.customizeFigure(); + getLabel().setForegroundColor(ColorConstants.darkGray); + rectangle.setLineWidth(2); + } + }

17 years

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits December 2008