JBoss Tools SVN: r5213 - trunk/common/plugins/org.jboss.tools.common.model/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-12-05 06:24:50 -0500 (Wed, 05 Dec 2007)
New Revision: 5213
Modified:
trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta
Log:
JBIDE-1393
Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta 2007-12-05 11:17:31 UTC (rev 5212)
+++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta 2007-12-05 11:24:50 UTC (rev 5213)
@@ -615,7 +615,8 @@
</Constraint>
<Editor name="CheckBox"/>
</XModelAttribute>
- <XModelAttribute default="Blank" name="Page Template" xmlname="page_template">
+ <XModelAttribute default="Blank" name="Page Template"
+ visibility="false" xmlname="page_template">
<Editor name="DropDown"/>
</XModelAttribute>
</XModelAttributes>
@@ -674,7 +675,8 @@
</Constraint>
<Editor name="CheckBox"/>
</XModelAttribute>
- <XModelAttribute default="Blank" name="Page Template" xmlname="page_template">
+ <XModelAttribute default="Blank" name="Page Template"
+ visibility="false" xmlname="page_template">
<Editor name="DropDown"/>
</XModelAttribute>
</XModelAttributes>
18 years
JBoss Tools SVN: r5212 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-12-05 06:17:31 -0500 (Wed, 05 Dec 2007)
New Revision: 5212
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XProjectContentProvider.java
Log:
JBIDE-1400
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XProjectContentProvider.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XProjectContentProvider.java 2007-12-05 11:09:08 UTC (rev 5211)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XProjectContentProvider.java 2007-12-05 11:17:31 UTC (rev 5212)
@@ -53,7 +53,7 @@
if(element instanceof XModelObject) {
XModelObject o = (XModelObject)element;
XFilteredTree filteredTree = getFilteredTree(o);
- if(o == filteredTree.getRoot()) {
+ if(filteredTree != null && o == filteredTree.getRoot()) {
return EclipseResourceUtil.getProject(o);
}
return o.getParent();
18 years
JBoss Tools SVN: r5211 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui: wizards/appregister and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-12-05 06:09:08 -0500 (Wed, 05 Dec 2007)
New Revision: 5211
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectAdoptOperation.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/AppRegisterWizard.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebWarWizard.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/NewWebProjectWizard.java
Log:
JBIDE-821
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectAdoptOperation.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectAdoptOperation.java 2007-12-04 11:32:27 UTC (rev 5210)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectAdoptOperation.java 2007-12-05 11:09:08 UTC (rev 5211)
@@ -56,7 +56,7 @@
}
protected boolean isLinkingToProjectOutsideWorkspace() {
- return true;
+ return true; //TODO modify
}
protected boolean hasJavaSource() {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/AppRegisterWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/AppRegisterWizard.java 2007-12-04 11:32:27 UTC (rev 5210)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/AppRegisterWizard.java 2007-12-05 11:09:08 UTC (rev 5211)
@@ -41,7 +41,7 @@
AppRegisterWizardPage page;
public AppRegisterWizard() {
- setHelpAvailable(true);
+ setHelpAvailable(false);
}
public boolean performFinish() {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java 2007-12-04 11:32:27 UTC (rev 5210)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java 2007-12-05 11:09:08 UTC (rev 5211)
@@ -52,7 +52,7 @@
public ImportWebProjectWizard() {
setNeedsProgressMonitor(true);
- setHelpAvailable(true);
+ setHelpAvailable(false);
}
public void init(IWorkbench workbench, IStructuredSelection selection) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebWarWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebWarWizard.java 2007-12-04 11:32:27 UTC (rev 5210)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebWarWizard.java 2007-12-05 11:09:08 UTC (rev 5211)
@@ -37,7 +37,7 @@
protected ImportWebWarContext context;
public ImportWebWarWizard() {
- setHelpAvailable(true);
+ setHelpAvailable(false);
}
public void init(IWorkbench workbench, IStructuredSelection selection) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/NewWebProjectWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/NewWebProjectWizard.java 2007-12-04 11:32:27 UTC (rev 5210)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/NewWebProjectWizard.java 2007-12-05 11:09:08 UTC (rev 5211)
@@ -39,7 +39,7 @@
public NewWebProjectWizard() {
setNeedsProgressMonitor(true);
- setHelpAvailable(true);
+ setHelpAvailable(false);
}
public void init(IWorkbench workbench, IStructuredSelection selection) {
18 years
JBoss Tools SVN: r5210 - in trunk/documentation/guides/userguide/GettingStartedGuide/en: modules and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: afedosik
Date: 2007-12-04 06:32:27 -0500 (Tue, 04 Dec 2007)
New Revision: 5210
Added:
trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/further_reading.xml
Modified:
trunk/documentation/guides/userguide/GettingStartedGuide/en/master.xml
Log:
http://jira.jboss.com/jira/browse/RHDS-337 Further Reading chapter with links
Modified: trunk/documentation/guides/userguide/GettingStartedGuide/en/master.xml
===================================================================
--- trunk/documentation/guides/userguide/GettingStartedGuide/en/master.xml 2007-12-04 08:46:07 UTC (rev 5209)
+++ trunk/documentation/guides/userguide/GettingStartedGuide/en/master.xml 2007-12-04 11:32:27 UTC (rev 5210)
@@ -7,6 +7,8 @@
<!ENTITY first_seam SYSTEM "modules/first_seam.xml">
<!ENTITY jsp_application SYSTEM "modules/jsp_application.xml">
<!ENTITY rad_jsf_application SYSTEM "modules/rad_jsf_application.xml">
+<!ENTITY further_reading SYSTEM "modules/further_reading.xml">
+
]>
<book>
@@ -30,6 +32,7 @@
&first_seam;
&jsp_application;
&rad_jsf_application;
+&further_reading;
</book>
Added: trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/further_reading.xml
===================================================================
--- trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/further_reading.xml (rev 0)
+++ trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/further_reading.xml 2007-12-04 11:32:27 UTC (rev 5210)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="further_reading" xreflabel="further_reading">
+ <?dbhtml filename="further_reading.html"?>
+ <chapterinfo>
+ <keywordset>
+ <keyword>JBoss Developer Studio</keyword>
+ <keyword>Eclipse</keyword>
+ <keyword>Deploy</keyword>
+ <keyword>Deployment</keyword>
+ <keyword>JBoss</keyword>
+ </keywordset>
+ </chapterinfo>
+
+ <title>Further Reading</title>
+
+ <para>
+ <emphasis role="bold">Seam Dev Tools Reference Guide</emphasis>
+ <ulink url="../../../seam/en/html/index.html">(html)</ulink> <ulink url="../../../seam/en/html_single/index.html">(html single)</ulink> <ulink url="../../../seam/en/pdf/Seam_Dev_Tools_Reference_Guide.pdf">(PDF)</ulink>
+ </para>
+
+ <para>
+ <emphasis role="bold">Visual Web Tools Reference Guide</emphasis>
+ <ulink url="../../../jsf/en/html/index.html">(html)</ulink> <ulink url="../../../jsf/en/html_single/index.html">(html single)</ulink> <ulink url="../../../jsf/en/pdf/Visual_Web_Tools_Reference_Guide.pdf">(PDF)</ulink>
+ </para>
+
+ <para>
+ <emphasis role="bold">JBoss Server Manager Reference Guide</emphasis>
+ <ulink url="../../../as/en/html/index.html">(html)</ulink> <ulink url="../../../as/en/html_single/index.html">(html single)</ulink> <ulink url="../../../as/en/pdf/server_manager_guide.pdf">(PDF)</ulink>
+ </para>
+
+ <para>
+ <emphasis role="bold">jBPM Tools Reference Guide</emphasis>
+ <ulink url="../../../jbpm/en/html/index.html">(html)</ulink> <ulink url="../../../jbpm/en/html_single/index.html">(html single)</ulink> <ulink url="../../../jbpm/en/pdf/jBPM_Tools_Ref.pdf">(PDF)</ulink>
+ </para>
+
+ <para>
+ <emphasis role="bold">Hibernate Tools Reference Guide</emphasis>
+ <ulink url="../../../hibernatetools/en/html/index.html">(html)</ulink> <ulink url="../../../hibernatetools/en/html_single/index.html">(html single)</ulink> <ulink url="../../../hibernatetools/en/pdf/hibernate_tools.pdf">(PDF)</ulink>
+ </para>
+
+ <para>
+ <emphasis role="bold">Legacy-jsf-struts guide</emphasis>
+ <ulink url="../../../legacy-jsf-struts/en/html/index.html">(html)</ulink> <ulink url="../../../legacy-jsf-struts/en/html_single/index.html">(html single)</ulink> <ulink url="../../../legacy-jsf-struts/en/pdf/legacy-jsf-struts.pdf">(PDF)</ulink>
+ </para>
+
+ <para>
+ <emphasis role="bold">Exadel Studio Migration Guide</emphasis>
+ <ulink url="../../../Exadel-migration/en/html/index.html">(html)</ulink> <ulink url="../../../Exadel-migration/en/html_single/index.html">(html single)</ulink> <ulink url="../../../Exadel-migration/en/pdf/exadel-migration.pdf">(PDF)</ulink>
+ </para>
+
+
+</chapter>
18 years
JBoss Tools SVN: r5209 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: achabatar
Date: 2007-12-04 03:46:07 -0500 (Tue, 04 Dec 2007)
New Revision: 5209
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeEditPart.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-874
Calling buildMappings() is done only at the beginning, after that Mapping object is retrieved from Map object.
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeEditPart.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeEditPart.java 2007-12-03 22:10:58 UTC (rev 5208)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeEditPart.java 2007-12-04 08:46:07 UTC (rev 5209)
@@ -31,7 +31,7 @@
import org.eclipse.gef.editpolicies.SelectionEditPolicy;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
-import org.hibernate.console.ConsoleConfiguration;
+import org.hibernate.cfg.Configuration;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.Component;
import org.hibernate.mapping.DependantValue;
@@ -71,11 +71,11 @@
while (model.getParent() != null) {
model = model.getParent();
}
- ConsoleConfiguration consoleConfiguration = null;
+ Configuration cfg = null;
if (model instanceof OrmDiagram) {
- consoleConfiguration = ((OrmDiagram) model).getConsoleConfiguration();
+ cfg = ((OrmDiagram) model).getConsoleConfiguration().getConfiguration();
}
- label.setText(ormLabelProvider.getText(getElement(), consoleConfiguration));
+ label.setText(ormLabelProvider.getText(getElement(), cfg));
label.setBackgroundColor(getColor());
label.setIcon(ormLabelProvider.getImage(getElement()));
label.setLabelAlignment(PositionConstants.LEFT);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java 2007-12-03 22:10:58 UTC (rev 5208)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java 2007-12-04 08:46:07 UTC (rev 5209)
@@ -15,7 +15,6 @@
import java.util.Map;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.IColorProvider;
import org.eclipse.jface.viewers.IFontProvider;
import org.eclipse.jface.viewers.LabelProvider;
@@ -25,7 +24,6 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
import org.hibernate.cfg.Configuration;
-import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.mapping.Any;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.Component;
@@ -35,7 +33,6 @@
import org.hibernate.mapping.Property;
import org.hibernate.mapping.RootClass;
import org.hibernate.mapping.SimpleValue;
-import org.hibernate.mapping.SingleTableSubclass;
import org.hibernate.mapping.Subclass;
import org.hibernate.mapping.Table;
@@ -86,7 +83,7 @@
return image;
}
- public String getText(Object element, ConsoleConfiguration consoleConfiguration) {
+ public String getText(Object element, Configuration cfg) {
if (element instanceof RootClass) {
String name = (String)ormModelNameVisitor.visitPersistentClass((RootClass)element, null);
if (name == null) {
@@ -116,7 +113,7 @@
return name;
}
} else if (element instanceof Column) {
- String name = (String)ormModelNameVisitor.visitDatabaseColumn((Column)element, consoleConfiguration);
+ String name = (String)ormModelNameVisitor.visitDatabaseColumn((Column)element, cfg);
if (name == null) {
return "OrmElement";
} else {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java 2007-12-03 22:10:58 UTC (rev 5208)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java 2007-12-04 08:46:07 UTC (rev 5209)
@@ -10,11 +10,13 @@
******************************************************************************/
package org.jboss.tools.hibernate.ui.view.views;
+import java.util.HashMap;
+import java.util.Map;
import java.util.ResourceBundle;
import org.hibernate.HibernateException;
+import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
-import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.dialect.Dialect;
import org.hibernate.eclipse.console.workbench.TypeNameValueVisitor;
import org.hibernate.engine.Mapping;
@@ -33,7 +35,7 @@
static private String SPACE = " ";
static private String POINTER = " -> ";
-
+
private ResourceBundle BUNDLE = ResourceBundle
.getBundle(OrmModelNameVisitor.class.getPackage().getName()
+ ".views");
@@ -41,44 +43,61 @@
public OrmModelNameVisitor() {
super();
}
+
+ private Map mappings = new HashMap();
+ private Map dialects = new HashMap();
public Object visitDatabaseColumn(Column column, Object argument) {
- ConsoleConfiguration consoleConfiguration = (ConsoleConfiguration) argument;
- Mapping mapping = consoleConfiguration.getConfiguration()
- .buildMapping();
-
- String dialectName = null;
+ Configuration cfg = null;
+ Mapping mapping = null;
Dialect dialect = null;
- String type = null;
- try {
- dialectName = consoleConfiguration.getConfiguration().getProperty(
- Environment.DIALECT);
- dialect = (Dialect) Class.forName(dialectName).newInstance();
- type = column.getSqlType(dialect, mapping);
- } catch (HibernateException e) {
- ViewPlugin.getDefault().logError(e);
- // ViewPlugin.getDefault().showError("Error", e);
- } catch (InstantiationException e) {
- ViewPlugin.getDefault().logError(e);
- } catch (IllegalAccessException e) {
- ViewPlugin.getDefault().logError(e);
- } catch (ClassNotFoundException e) {
- ViewPlugin.getDefault().logError(e);
+ if (argument instanceof Configuration) {
+
+ cfg = (Configuration) argument;
+
+ if (mappings.containsKey(cfg)) {
+ mapping = (Mapping) mappings.get(cfg);
+ } else {
+ mapping = cfg.buildMapping();
+ mappings.put(cfg, mapping);
+ }
+
+ try {
+ String dialectName = cfg.getProperty(Environment.DIALECT);
+ if (dialects.containsKey(dialectName)) {
+ dialect = (Dialect) dialects.get(dialectName);
+ } else {
+ dialect = (Dialect) Class.forName(dialectName).newInstance();
+ dialects.put(dialectName, dialect);
+ }
+ } catch (HibernateException e) {
+ ViewPlugin.getDefault().logError(e);
+ } catch (InstantiationException e) {
+ ViewPlugin.getDefault().logError(e);
+ } catch (IllegalAccessException e) {
+ ViewPlugin.getDefault().logError(e);
+ } catch (ClassNotFoundException e) {
+ ViewPlugin.getDefault().logError(e);
+ }
}
+ String type = column.getSqlType(dialect, mapping);
+
StringBuffer name = new StringBuffer();
name.append(column.getName());
- name.append(" [");
- name.append(type != null ? type.toUpperCase() : "");
- name.append(column.isNullable() ? " Nullable" : "");
- name.append(HibernateUtils.getTable(column) != null
- && HibernateUtils.isPrimaryKey(column) ? " PK" : "");
- name.append(HibernateUtils.getTable(column) != null
- && HibernateUtils.isForeignKey(column) ? " FK" : "");
- name.append("]");
+ if (type != null) {
+ name.append(" [");
+ name.append(type != null ? type.toUpperCase() : "");
+ name.append(column.isNullable() ? " Nullable" : "");
+ name.append(HibernateUtils.getTable(column) != null
+ && HibernateUtils.isPrimaryKey(column) ? " PK" : "");
+ name.append(HibernateUtils.getTable(column) != null
+ && HibernateUtils.isForeignKey(column) ? " FK" : "");
+ name.append("]");
+ }
return name.toString();
18 years
JBoss Tools SVN: r5208 - trunk/core/util/packaging-convert.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2007-12-03 17:10:58 -0500 (Mon, 03 Dec 2007)
New Revision: 5208
Modified:
trunk/core/util/packaging-convert/.classpath
trunk/core/util/packaging-convert/.project
Log:
removed references to groovy plugin/classpath so the plugin isn't necessary
Modified: trunk/core/util/packaging-convert/.classpath
===================================================================
--- trunk/core/util/packaging-convert/.classpath 2007-12-03 19:54:50 UTC (rev 5207)
+++ trunk/core/util/packaging-convert/.classpath 2007-12-03 22:10:58 UTC (rev 5208)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry exported="true" kind="lib" path="bin-groovy"/>
+ <!--classpathentry exported="true" kind="lib" path="bin-groovy"/-->
<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="lib/jaxen-1.1-beta-6.jar"/>
<classpathentry kind="lib" path="lib/groovy-all-1.0.jar"/>
Modified: trunk/core/util/packaging-convert/.project
===================================================================
--- trunk/core/util/packaging-convert/.project 2007-12-03 19:54:50 UTC (rev 5207)
+++ trunk/core/util/packaging-convert/.project 2007-12-03 22:10:58 UTC (rev 5208)
@@ -10,14 +10,14 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
+ <!--buildCommand>
<name>org.codehaus.groovy.eclipse.groovyBuilder</name>
<arguments>
</arguments>
- </buildCommand>
+ </buildCommand-->
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.codehaus.groovy.eclipse.groovyNature</nature>
+ <!--nature>org.codehaus.groovy.eclipse.groovyNature</nature -->
</natures>
</projectDescription>
18 years
JBoss Tools SVN: r5207 - in trunk/core/util/packaging-convert: .settings and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2007-12-03 14:54:50 -0500 (Mon, 03 Dec 2007)
New Revision: 5207
Added:
trunk/core/util/packaging-convert/.classpath
trunk/core/util/packaging-convert/.project
trunk/core/util/packaging-convert/.settings/
trunk/core/util/packaging-convert/.settings/org.codehaus.groovy.eclipse.preferences.prefs
trunk/core/util/packaging-convert/.settings/org.eclipse.jdt.core.prefs
trunk/core/util/packaging-convert/build.xml
trunk/core/util/packaging-convert/lib/
trunk/core/util/packaging-convert/lib/ant-1.6.5.jar
trunk/core/util/packaging-convert/lib/commons-cli-1.0.jar
trunk/core/util/packaging-convert/lib/dom4j-1.6.1.jar
trunk/core/util/packaging-convert/lib/groovy-all-1.0.jar
trunk/core/util/packaging-convert/lib/jaxen-1.1-beta-6.jar
trunk/core/util/packaging-convert/src/
trunk/core/util/packaging-convert/src/org/
trunk/core/util/packaging-convert/src/org/jboss/
trunk/core/util/packaging-convert/src/org/jboss/tools/
trunk/core/util/packaging-convert/src/org/jboss/tools/archives/
trunk/core/util/packaging-convert/src/org/jboss/tools/archives/PackagingConverter.groovy
Log:
Initial import of packaging converter
Added: trunk/core/util/packaging-convert/.classpath
===================================================================
--- trunk/core/util/packaging-convert/.classpath (rev 0)
+++ trunk/core/util/packaging-convert/.classpath 2007-12-03 19:54:50 UTC (rev 5207)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="lib" path="bin-groovy"/>
+ <classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/jaxen-1.1-beta-6.jar"/>
+ <classpathentry kind="lib" path="lib/groovy-all-1.0.jar"/>
+ <classpathentry kind="lib" path="lib/ant-1.6.5.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/core/util/packaging-convert/.project
===================================================================
--- trunk/core/util/packaging-convert/.project (rev 0)
+++ trunk/core/util/packaging-convert/.project 2007-12-03 19:54:50 UTC (rev 5207)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>packaging-convert</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.codehaus.groovy.eclipse.groovyBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.codehaus.groovy.eclipse.groovyNature</nature>
+ </natures>
+</projectDescription>
Added: trunk/core/util/packaging-convert/.settings/org.codehaus.groovy.eclipse.preferences.prefs
===================================================================
--- trunk/core/util/packaging-convert/.settings/org.codehaus.groovy.eclipse.preferences.prefs (rev 0)
+++ trunk/core/util/packaging-convert/.settings/org.codehaus.groovy.eclipse.preferences.prefs 2007-12-03 19:54:50 UTC (rev 5207)
@@ -0,0 +1,3 @@
+#Fri Nov 30 17:34:13 CST 2007
+eclipse.preferences.version=1
+groovy.compiler.output.path=bin-groovy
Added: trunk/core/util/packaging-convert/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/core/util/packaging-convert/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/core/util/packaging-convert/.settings/org.eclipse.jdt.core.prefs 2007-12-03 19:54:50 UTC (rev 5207)
@@ -0,0 +1,3 @@
+#Fri Nov 30 17:34:12 CST 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,*.groovy
Added: trunk/core/util/packaging-convert/build.xml
===================================================================
--- trunk/core/util/packaging-convert/build.xml (rev 0)
+++ trunk/core/util/packaging-convert/build.xml 2007-12-03 19:54:50 UTC (rev 5207)
@@ -0,0 +1,15 @@
+<project default="convert">
+
+ <path id="groovy-classpath">
+ <fileset dir="lib" includes="**/*.jar"/>
+ </path>
+
+ <target name="convert">
+ <property name="packaging-path" value="/home/marshall/Workspaces/jbosside/pojp/.packaging"/>
+
+ <java classpathref="groovy-classpath" classname="groovy.lang.GroovyShell">
+ <arg line="src/org/jboss/tools/archives/PackagingConverter.groovy"/>
+ <arg line="${packaging-path}"/>
+ </java>
+ </target>
+</project>
\ No newline at end of file
Added: trunk/core/util/packaging-convert/lib/ant-1.6.5.jar
===================================================================
(Binary files differ)
Property changes on: trunk/core/util/packaging-convert/lib/ant-1.6.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core/util/packaging-convert/lib/commons-cli-1.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/core/util/packaging-convert/lib/commons-cli-1.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core/util/packaging-convert/lib/dom4j-1.6.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/core/util/packaging-convert/lib/dom4j-1.6.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core/util/packaging-convert/lib/groovy-all-1.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/core/util/packaging-convert/lib/groovy-all-1.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core/util/packaging-convert/lib/jaxen-1.1-beta-6.jar
===================================================================
(Binary files differ)
Property changes on: trunk/core/util/packaging-convert/lib/jaxen-1.1-beta-6.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core/util/packaging-convert/src/org/jboss/tools/archives/PackagingConverter.groovy
===================================================================
--- trunk/core/util/packaging-convert/src/org/jboss/tools/archives/PackagingConverter.groovy (rev 0)
+++ trunk/core/util/packaging-convert/src/org/jboss/tools/archives/PackagingConverter.groovy 2007-12-03 19:54:50 UTC (rev 5207)
@@ -0,0 +1,187 @@
+package org.jboss.tools.archives;
+
+import org.dom4j.io.SAXReader
+import org.dom4j.io.OutputFormat
+import org.dom4j.io.XMLWriter
+import org.dom4j.DocumentHelper
+
+class PackagingConverter {
+
+ def packagingFile
+ def projectName
+
+ def projectFile
+ def projectDir
+ def projectDoc
+ def projectDescription
+ def error = false
+
+ PackagingConverter (packagingFile) {
+ this.packagingFile = packagingFile
+ def lastSlashIndex = packagingFile.lastIndexOf('/')
+ if (lastSlashIndex == -1) {
+ lastSlashIndex = packagingFile.lastIndexOf('\\')
+
+ }
+ if (lastSlashIndex == -1) {
+ println "Error: Path to packaging file is invalid: " + packagingFile
+ error = true
+ }
+ else {
+ projectDir = this.packagingFile.substring(0, lastSlashIndex)
+ projectFile = projectDir + '/.project'
+
+ def reader = new FileReader(projectFile)
+ projectDoc = new SAXReader().read(reader)
+ projectDescription = projectDoc.rootElement
+ reader.close()
+
+ projectName = projectDescription.elementText('name')
+ }
+ }
+
+ def convert () {
+ println "Updating Project Builder to 'org.jboss.ide.eclipse.archives.core.archivesBuilder'..."
+ updateBuilder()
+
+ println "Adding 'org.jboss.ide.eclipse.archives.core.archivesNature' nature..."
+ addNature()
+
+ println "Backing up to .project.bak, and saving to .project in " + projectDir + "..."
+ saveProject()
+
+ println "Converting JBossIDE 1.x packages to JBossTools/RHDS archives..."
+ convertPackaging()
+ }
+
+ def updateBuilder () {
+ def buildCommand = projectDescription.element('buildSpec').elements('buildCommand').find {
+ it.elementText('name') == 'org.jboss.ide.eclipse.packaging.core.PackagingBuilder'}
+
+ if (buildCommand != null) {
+ buildCommand.element('name').setText('org.jboss.ide.eclipse.archives.core.archivesBuilder')
+ }
+ }
+
+ def addNature () {
+ def natures = projectDescription.element('natures')
+ def nature = natures.addElement('nature')
+ nature.setText('org.jboss.ide.eclipse.archives.core.archivesNature')
+ }
+
+ def saveProject () {
+ new AntBuilder().copy(file: projectFile, toFile: projectFile+'.bak')
+ saveDoc(projectDoc, projectFile)
+ }
+
+ def convertPackaging ()
+ {
+ def reader = new FileReader(packagingFile)
+ def doc = new SAXReader().read(reader)
+ def configurations = doc.rootElement
+ reader.close()
+
+ def packagesDoc = DocumentHelper.createDocument()
+ def packages = packagesDoc.addElement('packages')
+
+ configurations.elementIterator().each { pkg ->
+ def newPkg = packages.addElement('package')
+ println "Converting package '" + pkg.attributeValue('name') + "'..."
+
+ newPkg.addAttribute('name', pkg.attributeValue('name'))
+ newPkg.addAttribute('type', 'jar')
+ newPkg.addAttribute('inWorkspace', 'true')
+ newPkg.addAttribute('exploded', pkg.attributeValue('exploded'))
+
+ if (pkg.attributeValue('destination') == '') {
+ newPkg.addAttribute('todir', '/' + projectName)
+ } else {
+ newPkg.addAttribute('todir', '/' + projectName + '/' + pkg.attributeValue('destination'))
+ }
+
+ pkg.elementIterator().each { element ->
+ if (element.name == 'file') convertFile(newPkg, element)
+ else convertFolder(newPkg, element)
+ }
+ }
+
+ savePackaging(packagesDoc)
+ }
+
+ def getParent (pkg, prefix) {
+ def parent = pkg
+
+ if (prefix != '')
+ {
+ def folders = prefix.split('/')
+ folders.each { folder ->
+ def element = parent.addElement('folder')
+ element.addAttribute('name', folder)
+
+ parent = element
+ }
+ }
+ return parent
+ }
+
+ def convertFile (pkg, file) {
+ def location = file.attributeValue('location')
+ def basedir = location.substring(0, location.lastIndexOf('/'))
+ def filename = location.substring(location.lastIndexOf('/')+1)
+ def parent = getParent(pkg, file.attributeValue('prefix'))
+ def fileset = parent.addElement('fileset')
+
+ if (file.attribute('projectLocation') != null) {
+ fileset.addAttribute('dir', '/' + projectName + '/' + basedir)
+ fileset.addAttribute('inWorkspace', 'true')
+ } else {
+ fileset.addAttribute('dir', basedir)
+ fileset.addAttribute('inWorkspace', 'false')
+ }
+
+ fileset.addAttribute('includes', filename)
+ }
+
+ def convertFolder (pkg, folder) {
+ def basedir = folder.attributeValue('location')
+ def parent = getParent(pkg, folder.attributeValue('prefix'))
+ def fileset = parent.addElement('fileset')
+
+ if (folder.attribute('projectLocation') != null) {
+ fileset.addAttribute('dir', '/' + projectName + '/' + basedir)
+ fileset.addAttribute('inWorkspace', 'true')
+ } else {
+ fileset.addAttribute('dir', basedir)
+ fileset.addAttribute('inWorkspace', 'false')
+ }
+
+ fileset.addAttribute('includes', folder.attributeValue('includes'))
+ fileset.addAttribute('excludes', folder.attributeValue('excludes'))
+ }
+
+ def savePackaging (packagesDoc) {
+ println "Saving new Archives configuration to '" + projectDir + "/.packages' ..."
+ saveDoc(packagesDoc, new File(projectDir, ".packages"))
+ }
+
+ def saveDoc (doc, file) {
+ def format = OutputFormat.createPrettyPrint()
+
+ def fwriter = new FileWriter(file)
+ def writer = new XMLWriter(fwriter, format)
+
+ writer.write((org.dom4j.Document)doc)
+ fwriter.close()
+ }
+
+ static void main(args) {
+ if (args.length >= 1)
+ {
+ def converter = new PackagingConverter(args[0])
+ if (!converter.error) converter.convert()
+ }
+ else {
+ println "Usage: packaging-converter /path/to/.packaging"
+ }
+ }
+}
\ No newline at end of file
18 years
JBoss Tools SVN: r5206 - trunk/core/util.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2007-12-03 14:53:35 -0500 (Mon, 03 Dec 2007)
New Revision: 5206
Added:
trunk/core/util/packaging-convert/
Log:
Initial import of packaging converter
18 years
JBoss Tools SVN: r5205 - trunk/core.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2007-12-03 14:51:46 -0500 (Mon, 03 Dec 2007)
New Revision: 5205
Added:
trunk/core/util/
Log:
18 years
JBoss Tools SVN: r5204 - trunk/jbpm/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2007-12-03 11:58:10 -0500 (Mon, 03 Dec 2007)
New Revision: 5204
Modified:
trunk/jbpm/docs/reference/en/modules/Introduction.xml
trunk/jbpm/docs/reference/en/modules/Test_Drive_Proc.xml
trunk/jbpm/docs/reference/en/modules/The_JBoss_jBPM_Int_Mech.xml
trunk/jbpm/docs/reference/en/modules/guided_tour_jboss_jbpmgpd.xml
Log:
spelling is corrected
Modified: trunk/jbpm/docs/reference/en/modules/Introduction.xml
===================================================================
--- trunk/jbpm/docs/reference/en/modules/Introduction.xml 2007-12-03 16:27:58 UTC (rev 5203)
+++ trunk/jbpm/docs/reference/en/modules/Introduction.xml 2007-12-03 16:58:10 UTC (rev 5204)
@@ -10,7 +10,7 @@
</keywordset>
</chapterinfo>
<title>Introduction</title>
- <para>All developers and process analists who are beginning to use JBoss jBPM should read this Getting Started guide. It will give them a jumpstart showing how to create a process definition.</para>
+ <para>All developers and process analysts who are beginning to use JBoss jBPM should read this Getting Started guide. It will give them a jumpstart showing how to create a process definition.</para>
<section id="Preface">
<?dbhtml filename="Preface.html"?>
<title>Preface</title>
Modified: trunk/jbpm/docs/reference/en/modules/Test_Drive_Proc.xml
===================================================================
--- trunk/jbpm/docs/reference/en/modules/Test_Drive_Proc.xml 2007-12-03 16:27:58 UTC (rev 5203)
+++ trunk/jbpm/docs/reference/en/modules/Test_Drive_Proc.xml 2007-12-03 16:58:10 UTC (rev 5204)
@@ -14,9 +14,9 @@
<para> One of the most important advantages of JBoss jBPM's lightweight approach to BPM
and workflow management is that developers can easily leverage their usual programming
- skills and techiques. One of these well-known techniques is unit testing and test driven
+ skills and techniques. One of these well-known techniques is unit testing and test driven
development. In this chapter we will show how developers, making use of the JBoss jBPM GPD
- can use a technique we have baptised <property>Test Driven Process Development</property> to
+ can use a technique we have baptized <property>Test Driven Process Development</property> to
create process definitions and test their correctness. </para>
<para> When creating the <emphasis>
@@ -79,7 +79,7 @@
<para>In the first line of the method, a jBPM process archive object is
created. We use a constructor accepting the filename of the archive. In our case it is the
<emphasis>
- <property>hello</property></emphasis> file we created earlier and wich lives in the
+ <property>hello</property></emphasis> file we created earlier and which lives in the
<emphasis>
<property>src/main/jpdl</property></emphasis> folder of our project. After asserting that this object is really
created, we extract a process definition object from it. This object is fed to the
Modified: trunk/jbpm/docs/reference/en/modules/The_JBoss_jBPM_Int_Mech.xml
===================================================================
--- trunk/jbpm/docs/reference/en/modules/The_JBoss_jBPM_Int_Mech.xml 2007-12-03 16:27:58 UTC (rev 5203)
+++ trunk/jbpm/docs/reference/en/modules/The_JBoss_jBPM_Int_Mech.xml 2007-12-03 16:58:10 UTC (rev 5204)
@@ -27,7 +27,7 @@
implementation of the <emphasis>
<property>ActionHandler</property>
</emphasis> interface, and attach this piece of code to a particular event. These events
- are amongst others, going over a transition, leaving or enterning nodes, after and
+ are amongst others, going over a transition, leaving or entering nodes, after and
before signalling. </para>
<figure>
Modified: trunk/jbpm/docs/reference/en/modules/guided_tour_jboss_jbpmgpd.xml
===================================================================
--- trunk/jbpm/docs/reference/en/modules/guided_tour_jboss_jbpmgpd.xml 2007-12-03 16:27:58 UTC (rev 5203)
+++ trunk/jbpm/docs/reference/en/modules/guided_tour_jboss_jbpmgpd.xml 2007-12-03 16:58:10 UTC (rev 5204)
@@ -200,7 +200,7 @@
<property>Window > Show view > Outline</property>
</emphasis>). It is presented as the classical tree view. Also you can use <emphasis>
<property>Overview</property>
- </emphasis> that comes as as a scrollable thumbnail.</para>
+ </emphasis> that comes as a scrollable thumbnail.</para>
<figure>
<title>The Outline and Overview Views</title>
<mediaobject>
@@ -251,7 +251,7 @@
<para>Some properties can be directly edited in the graphical editor. One example of this is
the <emphasis>
<property>Name</property>
- </emphasis> property of nodes. You can edit this directly by selecting the node of wich
+ </emphasis> property of nodes. You can edit this directly by selecting the node of which
you want to change the name and then click once inside this node. This enables an editor
in the node. We change the name of the node to <emphasis>
<property>auction</property>
18 years