JBoss Tools SVN: r18280 - in trunk/jst/tests/org.jboss.tools.jst.jsp.test: src/org/jboss/tools/jst/jsp/test/ca and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-10-23 22:33:13 -0400 (Fri, 23 Oct 2009)
New Revision: 18280
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.project
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java
Log:
JBIDE-5059: Fix JstJspAllTests.testJsfJspJbide2016Test
JBIDE-5060: Fix JstJspAllTests.testCAForELinStyleTest
The test cases are fixed in trunk
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.project 2009-10-23 23:28:02 UTC (rev 18279)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.project 2009-10-24 02:33:13 UTC (rev 18280)
@@ -15,6 +15,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
@@ -22,5 +27,6 @@
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.jboss.tools.jsf.jsfnature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
</natures>
</projectDescription>
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2009-10-23 23:28:02 UTC (rev 18279)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2009-10-24 02:33:13 UTC (rev 18280)
@@ -15,6 +15,7 @@
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
+import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor;
import org.jboss.tools.jst.jsp.test.TestUtil;
@@ -94,7 +95,12 @@
protected boolean compareProposal(String proposalName, ICompletionProposal[] proposals){
for (int i = 0; i < proposals.length; i++) {
- if(proposals[i].getDisplayString().toLowerCase().equals(proposalName.toLowerCase())) return true;
+ if (proposals[i] instanceof AutoContentAssistantProposal) {
+ AutoContentAssistantProposal ap = (AutoContentAssistantProposal)proposals[i];
+ if (ap.getReplacementString().toLowerCase().equals(proposalName.toLowerCase())) return true;
+ } else {
+ if(proposals[i].getDisplayString().toLowerCase().equals(proposalName.toLowerCase())) return true;
+ }
}
return false;
}
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r18279 - trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-10-23 19:28:02 -0400 (Fri, 23 Oct 2009)
New Revision: 18279
Modified:
trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/build.properties
Log:
what is good for athena is bad for uberbuilder :) reverted to get RC1 build back
Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/build.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/build.properties 2009-10-23 23:13:52 UTC (rev 18278)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/build.properties 2009-10-23 23:28:02 UTC (rev 18279)
@@ -3,8 +3,6 @@
generate.feature(a)org.jboss.tools.flow.jpdl4.source.feature=org.jboss.tools.flow.jpdl4.feature
generate.feature(a)org.jboss.tools.flow.common.source.feature=org.jboss.tools.flow.common.feature
+generate.feature(a)org.jboss.tools.jbpm.common.source.feature=org.jboss.tools.jbpm.common.feature
generate.feature(a)org.jboss.tools.jbpm.convert.source.feature=org.jboss.tools.jbpm.convert.feature
generate.feature(a)org.jbpm.gd.jpdl.source.feature=org.jbpm.gd.jpdl.feature
-
-# do not generate source feature for common; instead, fetch it from upstream jbpm3 build (see jbosstools-trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties#featureIDsToInstall)
-#generate.feature(a)org.jboss.tools.jbpm.common.source.feature=org.jboss.tools.jbpm.common.feature
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r18278 - in trunk/freemarker: plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-10-23 19:13:52 -0400 (Fri, 23 Oct 2009)
New Revision: 18278
Added:
trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/
trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/
trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/.classpath
trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/.freemarker-ide.xml
trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/.project
trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/edit.xhtml.ftl
trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/editproperty.xhtml.ftl
trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/editor/
trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/editor/test/
trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/editor/test/FreemarkerEditorTest.java
trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/preferences/
trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/preferences/test/
trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/preferences/test/FreemarkerPreferencePageTest.java
Modified:
trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml
trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/CompletionProcessor.java
trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/Editor.java
trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/preferences/PreferencePage.java
trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/META-INF/MANIFEST.MF
trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/build.properties
trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/test/FreemarkerAllTests.java
Log:
fremarker JUNit tests update to increase coverage to:
Classes Methods Blocks Lines
57% (53/93) 38% (249/663) 38% (6322/16542) 38% (1441.4/3744)
Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml
===================================================================
--- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml 2009-10-23 22:17:41 UTC (rev 18277)
+++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml 2009-10-23 23:13:52 UTC (rev 18278)
@@ -21,7 +21,6 @@
id="org.jboss.ide.eclipse.freemarker.test"
download-size="0"
install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
</feature>
Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/CompletionProcessor.java
===================================================================
--- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/CompletionProcessor.java 2009-10-23 22:17:41 UTC (rev 18277)
+++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/CompletionProcessor.java 2009-10-23 23:13:52 UTC (rev 18278)
@@ -54,6 +54,7 @@
private Editor editor;
+ private static final ICompletionProposal[] NO_COMPLETIONS = new ICompletionProposal[0];
public CompletionProcessor (Editor editor) {
this.editor = editor;
@@ -123,14 +124,14 @@
}
}
else {
- return null;
+ return NO_COMPLETIONS;
}
}
}
}
}
catch (BadLocationException e) {
- return null;
+ return NO_COMPLETIONS;
}
// check for interpolations
try {
@@ -160,14 +161,14 @@
}
}
catch (BadLocationException e) {
- return null;
+ return NO_COMPLETIONS;
}
}
}
catch (Exception e) {
Plugin.log(e);
}
- return null;
+ return NO_COMPLETIONS;
}
protected TemplateContextType getContextType(ITextViewer viewer, IRegion region) {
Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/Editor.java
===================================================================
--- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/Editor.java 2009-10-23 22:17:41 UTC (rev 18277)
+++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/Editor.java 2009-10-23 23:13:52 UTC (rev 18278)
@@ -35,6 +35,7 @@
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.ITextViewerExtension2;
import org.eclipse.jface.text.ITypedRegion;
import org.eclipse.jface.text.source.ISourceViewer;
@@ -181,6 +182,10 @@
return null;
}
+ public ITextViewer getTextViewer() {
+ return getSourceViewer();
+ }
+
public void addProblemMarker(String aMessage, int aLine) {
IFile file = ((IFileEditorInput)getEditorInput()).getFile();
try {
Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/preferences/PreferencePage.java
===================================================================
--- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/preferences/PreferencePage.java 2009-10-23 22:17:41 UTC (rev 18277)
+++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/preferences/PreferencePage.java 2009-10-23 23:13:52 UTC (rev 18278)
@@ -38,6 +38,8 @@
extends FieldEditorPreferencePage
implements IWorkbenchPreferencePage {
+ public static final String ID = "org.jboss.ide.eclipse.freemarker.preferences.OutlinePreferencePage";
+
public PreferencePage() {
super(GRID);
setPreferenceStore(Plugin.getDefault().getPreferenceStore());
Modified: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/META-INF/MANIFEST.MF 2009-10-23 22:17:41 UTC (rev 18277)
+++ trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/META-INF/MANIFEST.MF 2009-10-23 23:13:52 UTC (rev 18278)
@@ -7,6 +7,17 @@
Bundle-Vendor: JBoss by RedHat
Require-Bundle: org.eclipse.core.runtime,
org.junit,
- org.jboss.tools.tests;bundle-version="2.0.0"
+ org.jboss.tools.tests;bundle-version="2.0.0",
+ org.eclipse.jface;bundle-version="3.5.0",
+ org.jboss.ide.eclipse.freemarker;bundle-version="1.1.0",
+ org.eclipse.core.resources;bundle-version="3.5.1",
+ org.eclipse.ui;bundle-version="3.5.1",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.5.0",
+ org.eclipse.text;bundle-version="3.5.0",
+ org.eclipse.jface.text;bundle-version="3.5.1"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: freemarker-test.jar
+Export-Package: org.jboss.ide.eclipse.freemarker.editor.test,
+ org.jboss.ide.eclipse.freemarker.preferences.test,
+ org.jboss.ide.eclipse.freemarker.test
Modified: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/build.properties
===================================================================
--- trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/build.properties 2009-10-23 22:17:41 UTC (rev 18277)
+++ trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/build.properties 2009-10-23 23:13:52 UTC (rev 18278)
@@ -1,4 +1,5 @@
-source.. = src/
-output.. = bin/
bin.includes = META-INF/,\
- .
+ projects/,\
+ freemarker-test.jar
+source.freemarker-test.jar = src/
+jars.compile.order =
Added: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/.classpath
===================================================================
--- trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/.classpath (rev 0)
+++ trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/.classpath 2009-10-23 23:13:52 UTC (rev 18278)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/.freemarker-ide.xml
===================================================================
--- trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/.freemarker-ide.xml (rev 0)
+++ trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/.freemarker-ide.xml 2009-10-23 23:13:52 UTC (rev 18278)
@@ -0,0 +1,14 @@
+<config>
+ <context-values>
+ <resource path="edit.xhtml.ftl">
+ <value key="a" object-class="java.lang.String"/>
+ <value key="b" object-class="java.util.ArrayList" item-class="java.lang.String"/>
+ </resource>
+ <resource path="editproperty.xhtml.ftl">
+ <value key="a" object-class="java.lang.String"/>
+ <value key="b" object-class="java.util.ArrayList" item-class="java.lang.String"/>
+ </resource>
+ </context-values>
+ <macro-library>
+ </macro-library>
+</config>
\ No newline at end of file
Property changes on: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/.freemarker-ide.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/.project
===================================================================
--- trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/.project (rev 0)
+++ trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/.project 2009-10-23 23:13:52 UTC (rev 18278)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>testEditor</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/edit.xhtml.ftl
===================================================================
--- trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/edit.xhtml.ftl (rev 0)
+++ trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/edit.xhtml.ftl 2009-10-23 23:13:52 UTC (rev 18278)
@@ -0,0 +1,204 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<#include "../util/TypeInfo.ftl">
+<#assign entityName = pojo.shortName>
+<#assign componentName = entityName?uncap_first>
+<#assign homeName = componentName + "Home">
+<#assign masterPageName = entityName + "List">
+<#assign pageName = entityName>
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:a="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich"
+ template="layout/template.xhtml">
+
+<ui:define name="body">
+
+ <h:form id="${componentName}" styleClass="edit">
+
+ <rich:panel>
+ <f:facet name="header">${'#'}{${homeName}.managed ? 'Edit' : 'Add'} ${label(entityName)}</f:facet>
+<#foreach property in pojo.allPropertiesIterator>
+<#include "editproperty.xhtml.ftl">
+</#foreach>
+
+ <div style="clear:both">
+ <span class="required">*</span>
+ required fields
+ </div>
+
+ </rich:panel>
+
+ <div class="actionButtons">
+
+ <h:commandButton id="save"
+ value="Save"
+ action="${'#'}{${homeName}.persist}"
+ disabled="${'#'}{!${homeName}.wired}"
+ rendered="${'#'}{!${homeName}.managed}"/>
+
+ <h:commandButton id="update"
+ value="Save"
+ action="${'#'}{${homeName}.update}"
+ rendered="${'#'}{${homeName}.managed}"/>
+
+ <h:commandButton id="delete"
+ value="Delete"
+ action="${'#'}{${homeName}.remove}"
+ immediate="true"
+ rendered="${'#'}{${homeName}.managed}"/>
+
+ <s:button id="cancelEdit"
+ value="Cancel"
+ propagation="end"
+ view="/${pageName}.xhtml"
+ rendered="${'#'}{${homeName}.managed}"/>
+
+ <s:button id="cancelAdd"
+ value="Cancel"
+ propagation="end"
+ view="/${'#'}{empty ${componentName}From ? '${masterPageName}' : ${componentName}From}.xhtml"
+ rendered="${'#'}{!${homeName}.managed}"/>
+
+ </div>
+ </h:form>
+<#assign hasAssociations=false>
+<#foreach property in pojo.allPropertiesIterator>
+<#if isToOne(property) || c2h.isOneToManyCollection(property)>
+<#assign hasAssociations=true>
+</#if>
+</#foreach>
+
+<#if hasAssociations>
+<rich:tabPanel switchType="ajax">
+</#if>
+<#foreach property in pojo.allPropertiesIterator>
+<#if isToOne(property)>
+<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
+<#assign parentPageName = parentPojo.shortName>
+<#assign parentName = parentPojo.shortName?uncap_first>
+
+<#if property.optional>
+ <rich:tab label="${label(property.name)}">
+<#else>
+ <rich:tab label="${label(property.name)} *" labelClass="required">
+</#if>
+ <div class="association" id="${property.name}Parent">
+
+ <h:outputText value="There is no ${property.name} associated with this ${componentName}."
+ rendered="${'#'}{${homeName}.instance.${property.name} == null}"/>
+
+ <rich:dataTable var="_${parentName}"
+ value="${'#'}{${homeName}.instance.${property.name}}"
+ rendered="${'#'}{${homeName}.instance.${property.name} != null}"
+ rowClasses="rvgRowOne,rvgRowTwo"
+ id="${property.name}Table">
+<#foreach parentProperty in parentPojo.allPropertiesIterator>
+<#if !c2h.isCollection(parentProperty) && !isToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
+<#if parentPojo.isComponent(parentProperty)>
+<#foreach componentProperty in parentProperty.value.propertyIterator>
+ <h:column>
+ <f:facet name="header">${label(componentProperty.name)}</f:facet>
+ <@outputValue property=componentProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${componentProperty.name}}" indent=16/>
+ </h:column>
+</#foreach>
+<#else>
+ <h:column>
+ <f:facet name="header">${label(parentProperty.name)}</f:facet>
+ <@outputValue property=parentProperty expression="${'#'}{_${parentName}.${parentProperty.name}}" indent=16/>
+ </h:column>
+</#if>
+</#if>
+<#if isToOne(parentProperty)>
+<#assign grandparentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))>
+<#if grandparentPojo.isComponent(grandparentPojo.identifierProperty)>
+<#foreach componentProperty in grandparentPojo.identifierProperty.value.propertyIterator>
+ <h:column>
+ <f:facet name="header">${label(parentProperty.name)} ${label(componentProperty.name)?uncap_first}</f:facet>
+ <@outputValue property=componentProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${grandparentPojo.identifierProperty.name}.${componentProperty.name}}" indent=16/>
+ </h:column>
+</#foreach>
+<#else>
+ <h:column>
+ <f:facet name="header">${label(parentProperty.name)} ${label(grandparentPojo.identifierProperty.name)?uncap_first}</f:facet>
+ <@outputValue property=grandparentPojo.identifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${grandparentPojo.identifierProperty.name}}" indent=16/>
+ </h:column>
+</#if>
+</#if>
+</#foreach>
+ </rich:dataTable>
+
+<#if parentPojo.shortName!=pojo.shortName>
+ <div class="actionButtons">
+ <s:button id="${'#'}{${homeName}.instance.${property.name} != null ? 'changeParent' : 'selectParent'}" value="${'#'}{${homeName}.instance.${property.name} != null ? 'Change' : 'Select'} ${property.name}"
+ view="/${parentPageName}List.xhtml">
+ <f:param name="from" value="${pageName}Edit"/>
+ </s:button>
+ </div>
+
+</#if>
+ </div>
+ </rich:tab>
+</#if>
+<#if c2h.isOneToManyCollection(property)>
+
+ <rich:tab label="${label(property.name)}">
+ <h:form styleClass="association" id="${property.name}Children">
+
+<#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)>
+<#assign childPageName = childPojo.shortName>
+<#assign childEditPageName = childPojo.shortName + "Edit">
+<#assign childName = childPojo.shortName?uncap_first>
+ <h:outputText value="There are no ${property.name} associated with this ${componentName}."
+ rendered="${'#'}{empty ${homeName}.${property.name}}"/>
+
+ <rich:dataTable value="${'#'}{${homeName}.${property.name}}"
+ var="_${childName}"
+ rendered="${'#'}{not empty ${homeName}.${property.name}}"
+ rowClasses="rvgRowOne,rvgRowTwo"
+ id="${property.name}Table">
+<#foreach childProperty in childPojo.allPropertiesIterator>
+<#if !c2h.isCollection(childProperty) && !isToOne(childProperty) && childProperty != childPojo.versionProperty!>
+<#if childPojo.isComponent(childProperty)>
+<#foreach componentProperty in childProperty.value.propertyIterator>
+ <rich:column sortBy="${'#'}{_${childName}.${childProperty.name}.${componentProperty.name}}">
+ <f:facet name="header">${label(componentProperty.name)}</f:facet>
+ <@outputValue property=componentProperty expression="${'#'}{_${childName}.${childProperty.name}.${componentProperty.name}}" indent=20/>
+ </rich:column>
+</#foreach>
+<#else>
+ <rich:column sortBy="${'#'}{_${childName}.${childProperty.name}}">
+ <f:facet name="header">${label(childProperty.name)}</f:facet>
+ <@outputValue property=childProperty expression="${'#'}{_${childName}.${childProperty.name}}" indent=20/>
+ </rich:column>
+</#if>
+</#if>
+</#foreach>
+ </rich:dataTable>
+
+ </h:form>
+
+ <f:subview rendered="${'#'}{${homeName}.managed}" id="${property.name}">
+ <div class="actionButtons">
+ <s:button id="add${childName}"
+ value="Add ${childName}"
+ view="/${childEditPageName}.xhtml"
+ propagation="none">
+ <f:param name="${componentName}${pojo.identifierProperty.name?cap_first}"
+ value="${'#'}{${homeName}.instance.${pojo.identifierProperty.name}}"/>
+ <f:param name="${childName}From" value="${entityName}"/>
+ </s:button>
+ </div>
+ </f:subview>
+ </rich:tab>
+</#if>
+</#foreach>
+<#if hasAssociations>
+</rich:tabPanel>
+</#if>
+</ui:define>
+
+</ui:composition>
Added: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/editproperty.xhtml.ftl
===================================================================
--- trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/editproperty.xhtml.ftl (rev 0)
+++ trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/projects/testEditor/editproperty.xhtml.ftl 2009-10-23 23:13:52 UTC (rev 18278)
@@ -0,0 +1,229 @@
+<#include "../util/TypeInfo.ftl">
+
+<#if !c2h.isCollection(property) && !isToOne(property) && property != pojo.versionProperty!>
+<#assign propertyIsId = property.equals(pojo.identifierProperty)>
+<#if !propertyIsId || property.value.identifierGeneratorStrategy == "assigned">
+<#if pojo.isComponent(property)>
+<#foreach componentProperty in property.value.propertyIterator>
+<#assign column = componentProperty.columnIterator.next()>
+
+ <s:decorate id="${componentProperty.name}Field" template="layout/edit.xhtml">
+ <ui:define name="label">${label(componentProperty.name)}</ui:define>
+<#if isDate(componentProperty)>
+ <rich:calendar id="${componentProperty.name}"
+<#if propertyIsId>
+ disabled="${'#'}{${homeName}.managed}"
+</#if>
+<#if !column.nullable>
+ required="true"
+</#if>
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}" datePattern="MM/dd/yyyy" />
+<#elseif isTime(componentProperty)>
+ <h:inputText id="${componentProperty.name}"
+ size="5"
+<#if !column.nullable>
+ required="true"
+</#if>
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
+ <s:convertDateTime type="time"/>
+ <a:support event="onblur" reRender="${componentProperty.name}Field" bypassUpdates="true" ajaxSingle="true"/>
+ </h:inputText>
+<#elseif isTimestamp(componentProperty)>
+ <rich:calendar id="${componentProperty.name}"
+<#if !column.nullable>
+ required="true"
+</#if>
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}" datePattern="MM/dd/yyyy hh:mm a" />
+<#elseif isBigDecimal(componentProperty)>
+ <h:inputText id="${componentProperty.name}"
+<#if !column.nullable>
+ required="true"
+</#if>
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"
+ size="${column.precision+7}">
+ <a:support event="onblur" reRender="${componentProperty.name}Field" bypassUpdates="true" ajaxSingle="true"/>
+ </h:inputText>
+<#elseif isBigInteger(componentProperty)>
+ <h:inputText id="${componentProperty.name}"
+<#if propertyIsId>
+ disabled="${'#'}{${homeName}.managed}"
+</#if>
+<#if !column.nullable>
+ required="true"
+</#if>
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"
+ size="${column.precision+6}">
+ <a:support event="onblur" reRender="${componentProperty.name}Field" bypassUpdates="true" ajaxSingle="true"/>
+ </h:inputText>
+<#elseif isBoolean(componentProperty)>
+ <h:selectBooleanCheckbox id="${componentProperty.name}"
+<#if !column.nullable>
+ required="true"
+</#if>
+<#if propertyIsId>
+ disabled="${'#'}{${homeName}.managed}"
+</#if>
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"/>
+<#elseif isString(componentProperty)>
+<#if column.length gt 160>
+<#if column.length gt 800>
+<#assign rows = 10>
+<#else>
+<#assign rows = (column.length/80)?int>
+</#if>
+ <h:inputTextarea id="${componentProperty.name}"
+ cols="80"
+ rows="${rows}"
+<#if propertyIsId>
+ disabled="${'#'}{${homeName}.managed}"
+</#if>
+<#if !column.nullable>
+ required="true"
+</#if>
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"/>
+<#else>
+<#if column.length gt 100>
+<#assign size = 100>
+<#else>
+<#assign size = column.length>
+</#if>
+ <h:inputText id="${componentProperty.name}"
+<#if propertyIsId>
+ disabled="${'#'}{${homeName}.managed}"
+</#if>
+<#if !column.nullable>
+ required="true"
+</#if>
+ size="${size}"
+ maxlength="${column.length}"
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
+ <a:support event="onblur" reRender="${componentProperty.name}Field" bypassUpdates="true" ajaxSingle="true"/>
+ </h:inputText>
+</#if>
+<#else>
+ <h:inputText id="${componentProperty.name}"
+<#if !column.nullable>
+ required="true"
+</#if>
+<#if propertyIsId>
+ disabled="${'#'}{${homeName}.managed}"
+</#if>
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
+ <a:support event="onblur" reRender="${componentProperty.name}Field" bypassUpdates="true" ajaxSingle="true"/>
+ </h:inputText>
+</#if>
+ </s:decorate>
+</#foreach>
+<#else>
+<#assign column = property.columnIterator.next()>
+<#assign property = property.value.typeName>
+
+ <s:decorate id="${property.name}Field" template="layout/edit.xhtml">
+ <ui:define name="label">${label(property.name)}</ui:define>
+<#if isDate(property)>
+ <rich:calendar id="${property.name}"
+<#if propertyIsId>
+ disabled="${'#'}{${homeName}.managed}"
+</#if>
+<#if !column.nullable>
+ required="true"
+</#if>
+ value="${'#'}{${homeName}.instance.${property.name}}" datePattern="MM/dd/yyyy" />
+<#elseif isTime(property)>
+ <h:inputText id="${property.name}"
+ size="5"
+<#if !column.nullable>
+ required="true"
+</#if>
+ value="${'#'}{${homeName}.instance.${property.name}}">
+ <s:convertDateTime type="time"/>
+ <a:support event="onblur" reRender="${property.name}Field" bypassUpdates="true" ajaxSingle="true"/>
+ </h:inputText>
+<#elseif isTimestamp(property)>
+ <rich:calendar id="${property.name}"
+<#if !column.nullable>
+ required="true"
+</#if>
+ value="${'#'}{${homeName}.instance.${property.name}}" datePattern="MM/dd/yyyy hh:mm a"/>
+<#elseif isBigDecimal(property)>
+ <h:inputText id="${property.name}"
+<#if !column.nullable>
+ required="true"
+</#if>
+ value="${'#'}{${homeName}.instance.${property.name}}"
+ size="${column.precision+7}">
+ <a:support event="onblur" reRender="${property.name}Field" bypassUpdates="true" ajaxSingle="true"/>
+ </h:inputText>
+<#elseif isBigInteger(property)>
+ <h:inputText id="${property.name}"
+<#if propertyIsId>
+ disabled="${'#'}{${homeName}.managed}"
+</#if>
+<#if !column.nullable>
+ required="true"
+</#if>
+ value="${'#'}{${homeName}.instance.${property.name}}"
+ size="${column.precision+6}">
+ <a:support event="onblur" reRender="${property.name}Field" bypassUpdates="true" ajaxSingle="true"/>
+ </h:inputText>
+<#elseif isBoolean(property)>
+ <h:selectBooleanCheckbox id="${property.name}"
+<#if !column.nullable>
+ required="true"
+</#if>
+<#if propertyIsId>
+ disabled="${'#'}{${homeName}.managed}"
+</#if>
+ value="${'#'}{${homeName}.instance.${property.name}}"/>
+<#elseif isString(property)>
+<#if column.length gt 160>
+<#if column.length gt 800>
+<#assign rows = 10>
+<#else>
+<#assign rows = (column.length/80)?int>
+</#if>
+ <h:inputTextarea id="${property.name}"
+ cols="80"
+ rows="${rows}"
+<#if propertyIsId>
+ disabled="${'#'}{${homeName}.managed}"
+</#if>
+<#if !column.nullable>
+ required="true"
+</#if>
+ value="${'#'}{${homeName}.instance.${property.name}}"/>
+<#else>
+<#if column.length gt 100>
+<#assign size = 100>
+<#else>
+<#assign size = column.length>
+</#if>
+ <h:inputText id="${property.name}"
+<#if propertyIsId>
+ disabled="${'#'}{${homeName}.managed}"
+</#if>
+<#if !column.nullable>
+ required="true"
+</#if>
+ size="${size}"
+ maxlength="${column.length}"
+ value="${'#'}{${homeName}.instance.${property.name}}">
+ <a:support event="onblur" reRender="${property.name}Field" bypassUpdates="true" ajaxSingle="true"/>
+ </h:inputText>
+</#if>
+<#else>
+ <h:inputText id="${property.name}"
+<#if !column.nullable>
+ required="true"
+</#if>
+<#if propertyIsId>
+ disabled="${'#'}{${homeName}.managed}"
+</#if>
+ value="${'#'}{${homeName}.instance.${property.name}}">
+ <a:support event="onblur" reRender="${property.name}Field" bypassUpdates="true" ajaxSingle="true"/>
+ </h:inputText>
+</#if>
+ </s:decorate>
+</#if>
+</#if>
+</#if>
Added: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/editor/test/FreemarkerEditorTest.java
===================================================================
--- trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/editor/test/FreemarkerEditorTest.java (rev 0)
+++ trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/editor/test/FreemarkerEditorTest.java 2009-10-23 23:13:52 UTC (rev 18278)
@@ -0,0 +1,50 @@
+package org.jboss.ide.eclipse.freemarker.editor.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.text.IFindReplaceTarget;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.ui.IEditorPart;
+import org.jboss.ide.eclipse.freemarker.editor.CompletionProcessor;
+import org.jboss.ide.eclipse.freemarker.editor.FreemarkerMultiPageEditor;
+import org.jboss.ide.eclipse.freemarker.test.Activator;
+import org.jboss.tools.test.util.ResourcesUtils;
+import org.jboss.tools.test.util.WorkbenchUtils;
+
+public class FreemarkerEditorTest extends TestCase {
+
+
+
+ private static final String EDITPROPERTY_XHTML_FTL = "editproperty.xhtml.ftl";
+ private static final String TEST_EDITOR_PROJECT = "testEditor";
+
+ protected void setUp() throws Exception {
+ ResourcesUtils.importProject(Activator.PLUGIN_ID,"projects/"+TEST_EDITOR_PROJECT);
+ }
+
+ protected void tearDown() throws Exception {
+ ResourcesUtils.deleteProject(TEST_EDITOR_PROJECT);
+ }
+
+ public void testFreemarkerEditorIsOpened() {
+ IEditorPart part = WorkbenchUtils.openEditor(TEST_EDITOR_PROJECT + IPath.SEPARATOR + EDITPROPERTY_XHTML_FTL);
+ assertTrue(part instanceof FreemarkerMultiPageEditor);
+ FreemarkerMultiPageEditor editor = (FreemarkerMultiPageEditor)part;
+ }
+
+ public void testFreemarkerContentAssistIsShowed() {
+ IEditorPart part = WorkbenchUtils.openEditor(TEST_EDITOR_PROJECT + IPath.SEPARATOR + EDITPROPERTY_XHTML_FTL);
+ assertTrue(part instanceof FreemarkerMultiPageEditor);
+ FreemarkerMultiPageEditor editor = (FreemarkerMultiPageEditor)part;
+ CompletionProcessor proc = new CompletionProcessor(editor.getEditor());
+ IFindReplaceTarget find = (IFindReplaceTarget)editor.getAdapter(IFindReplaceTarget.class);
+ int pos = find.findAndSelect(0, "<#", true, false, false);
+ ICompletionProposal[] proposals = proc.computeCompletionProposals(editor.getEditor().getTextViewer(),pos+2);
+ assertTrue(proposals.length>0);
+
+ pos = find.findAndSelect(0, "label(componentProperty.name)", true, false, false);
+ proposals = proc.computeCompletionProposals(editor.getEditor().getTextViewer(),pos);
+ assertTrue(proposals.length>0);
+ }
+}
Property changes on: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/editor/test/FreemarkerEditorTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/preferences/test/FreemarkerPreferencePageTest.java
===================================================================
--- trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/preferences/test/FreemarkerPreferencePageTest.java (rev 0)
+++ trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/preferences/test/FreemarkerPreferencePageTest.java 2009-10-23 23:13:52 UTC (rev 18278)
@@ -0,0 +1,48 @@
+package org.jboss.ide.eclipse.freemarker.preferences.test;
+
+import org.eclipse.jface.preference.PreferenceDialog;
+import org.jboss.ide.eclipse.freemarker.preferences.PreferencePage;
+import org.jboss.tools.test.util.WorkbenchUtils;
+
+import junit.framework.TestCase;
+/**
+ * TODO Get rid of copy paste code
+ *
+ * @author eskimo
+ *
+ */
+public class FreemarkerPreferencePageTest extends TestCase {
+
+ public void testFreemarkerPreferencePageShow() {
+ PreferenceDialog prefDialog =
+ WorkbenchUtils.createPreferenceDialog(
+ PreferencePage.ID);
+
+ try {
+ prefDialog.setBlockOnOpen(false);
+ prefDialog.open();
+
+ Object selectedPage = prefDialog.getSelectedPage();
+ assertTrue("Selected page is not an instance of PreferencePage", selectedPage instanceof PreferencePage); //$NON-NLS-1$
+ } finally {
+ prefDialog.close();
+ }
+ }
+
+ public void testFreemarkerPreferencePagePerformOk() {
+ PreferenceDialog prefDialog =
+ WorkbenchUtils.createPreferenceDialog(
+ PreferencePage.ID);
+
+ try {
+ prefDialog.setBlockOnOpen(false);
+ prefDialog.open();
+
+ PreferencePage selectedPage = (PreferencePage)prefDialog.getSelectedPage();
+ selectedPage.performOk();
+ } finally {
+ prefDialog.close();
+ }
+ }
+
+}
Property changes on: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/preferences/test/FreemarkerPreferencePageTest.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Modified: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/test/FreemarkerAllTests.java
===================================================================
--- trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/test/FreemarkerAllTests.java 2009-10-23 22:17:41 UTC (rev 18277)
+++ trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/src/org/jboss/ide/eclipse/freemarker/test/FreemarkerAllTests.java 2009-10-23 23:13:52 UTC (rev 18278)
@@ -4,6 +4,8 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.jboss.ide.eclipse.freemarker.editor.test.FreemarkerEditorTest;
+import org.jboss.ide.eclipse.freemarker.preferences.test.FreemarkerPreferencePageTest;
import org.jboss.tools.tests.AbstractPluginsLoadTest;
public class FreemarkerAllTests extends TestCase {
@@ -12,6 +14,8 @@
{
TestSuite suite = new TestSuite(FreemarkerAllTests.class.getName());
suite.addTestSuite(FreemarkerPluginsLoadTest.class);
+ suite.addTestSuite(FreemarkerPreferencePageTest.class);
+ suite.addTestSuite(FreemarkerEditorTest.class);
return suite;
}
@@ -20,7 +24,7 @@
public FreemarkerPluginsLoadTest() {}
- public void testBirtPluginsAreResolvedAndActivated() {
+ public void testFreemarkerPluginsAreResolvedAndActivated() {
testBundlesAreLoadedFor("org.jboss.ide.eclipse.freemarker.feature");
}
}
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r18277 - branches/jbosstools-3.1.0.M4/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-10-23 18:17:41 -0400 (Fri, 23 Oct 2009)
New Revision: 18277
Modified:
branches/jbosstools-3.1.0.M4/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
Log:
JBIDE-4938 JBIDE-5071 regression in deployment
Modified: branches/jbosstools-3.1.0.M4/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
===================================================================
--- branches/jbosstools-3.1.0.M4/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2009-10-23 22:00:38 UTC (rev 18276)
+++ branches/jbosstools-3.1.0.M4/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2009-10-23 22:17:41 UTC (rev 18277)
@@ -69,7 +69,7 @@
IDeployableServer ds = ServerConverter.getDeployableServer(server);
boolean shouldAccept = ds != null && LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(type)
&& ModuleCoreNature.isFlexibleProject(module[0].getProject())
- && ds.zipsWTPDeployments();
+ && !ds.zipsWTPDeployments();
return shouldAccept;
}
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r18276 - trunk/common/releng/hudson.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-10-23 18:00:38 -0400 (Fri, 23 Oct 2009)
New Revision: 18276
Modified:
trunk/common/releng/hudson/run.sh
Log:
purge snapshop zips before a build
Modified: trunk/common/releng/hudson/run.sh
===================================================================
--- trunk/common/releng/hudson/run.sh 2009-10-23 21:59:23 UTC (rev 18275)
+++ trunk/common/releng/hudson/run.sh 2009-10-23 22:00:38 UTC (rev 18276)
@@ -4,6 +4,8 @@
# and is archived (for example) in https://pi4soa.svn.sourceforge.net/svnroot/pi4soa/trunk/releng/hudson/run.sh
# Build runs under ${WORKSPACE} == .../jbosstools-cbi-*/workspace
+echo "[`date +%Y/%m/%d\ %H:%M`] Hudson job ${JOBNAME} build #${BUILD_NUMBER} (${BUILD_ID}) started."
+
##############################################################################################
# BEGIN CONFIGURATION
@@ -17,8 +19,6 @@
##############################################################################################
-echo "[`date +%Y/%m/%d\ %H:%M`] Hudson job ${JOBNAME} build #${BUILD_NUMBER} (${BUILD_ID}) started."
-
uname -a
if [[ -f $HUDSON_CONFIG_DIR/scripts/common/common_bash.sh ]]; then
. $HUDSON_CONFIG_DIR/scripts/common/common_bash.sh
@@ -188,10 +188,6 @@
ln -s ${thirdPartyJarsDir} ${writableBuildRoot}/
thirdPartyJarsDir="${writableBuildRoot}/3rdPartyJars"
-# symlink downloads (reuse existing content)
-ln -s ${downloadsDir} ${writableBuildRoot}/
-downloadsDir="${writableBuildRoot}/downloads"
-
# clean up any *-SNAPSHOT.zip files in ${downloadsDir}
find ${downloadsDir} -maxdepth 1 -type f -name "*-SNAPSHOT.zip" -exec rm -f {} \;
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r18274 - trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-10-23 17:33:31 -0400 (Fri, 23 Oct 2009)
New Revision: 18274
Modified:
trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/build.properties
Log:
do not generate source feature for common; instead, fetch it from upstream jbpm3 build (see jbosstools-trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties#featureIDsToInstall)
Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/build.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/build.properties 2009-10-23 21:31:04 UTC (rev 18273)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/build.properties 2009-10-23 21:33:31 UTC (rev 18274)
@@ -3,6 +3,8 @@
generate.feature(a)org.jboss.tools.flow.jpdl4.source.feature=org.jboss.tools.flow.jpdl4.feature
generate.feature(a)org.jboss.tools.flow.common.source.feature=org.jboss.tools.flow.common.feature
-generate.feature(a)org.jboss.tools.jbpm.common.source.feature=org.jboss.tools.jbpm.common.feature
generate.feature(a)org.jboss.tools.jbpm.convert.source.feature=org.jboss.tools.jbpm.convert.feature
generate.feature(a)org.jbpm.gd.jpdl.source.feature=org.jbpm.gd.jpdl.feature
+
+# do not generate source feature for common; instead, fetch it from upstream jbpm3 build (see jbosstools-trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties#featureIDsToInstall)
+#generate.feature(a)org.jboss.tools.jbpm.common.source.feature=org.jboss.tools.jbpm.common.feature
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r18273 - in trunk/flow: features/org.jboss.tools.flow.common.feature/sourceTemplatePlugin and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-10-23 17:31:04 -0400 (Fri, 23 Oct 2009)
New Revision: 18273
Modified:
trunk/flow/features/org.jboss.tools.flow.common.feature/sourceTemplateFeature/feature.properties
trunk/flow/features/org.jboss.tools.flow.common.feature/sourceTemplatePlugin/about.properties
trunk/flow/features/org.jboss.tools.flow.common.feature/sourceTemplatePlugin/plugin.properties
trunk/flow/plugins/org.jboss.tools.flow.common/plugin.properties
trunk/flow/plugins/org.jboss.tools.flow.common/plugin.xml
Log:
Flow Language -> Flow Languages
Modified: trunk/flow/features/org.jboss.tools.flow.common.feature/sourceTemplateFeature/feature.properties
===================================================================
--- trunk/flow/features/org.jboss.tools.flow.common.feature/sourceTemplateFeature/feature.properties 2009-10-23 21:10:47 UTC (rev 18272)
+++ trunk/flow/features/org.jboss.tools.flow.common.feature/sourceTemplateFeature/feature.properties 2009-10-23 21:31:04 UTC (rev 18273)
@@ -1,12 +1,12 @@
# properties file for org.jboss.tools.jmx.source
-featureName=Flow Language Common Tools Sources
+featureName=Flow Languages Common Tools Sources
featureProvider=JBoss by Red Hat
# "updateSiteName" property - label for the update site
updateSiteName=JBossTools Update Site
# "description" property - description of the feature
-description=Flow Language Common Tools Sources
+description=Flow Languages Common Tools Sources
# "licenseURL" property - URL of the "Feature License"
# do not translate value - just change to point to a locale-specific HTML page
Modified: trunk/flow/features/org.jboss.tools.flow.common.feature/sourceTemplatePlugin/about.properties
===================================================================
--- trunk/flow/features/org.jboss.tools.flow.common.feature/sourceTemplatePlugin/about.properties 2009-10-23 21:10:47 UTC (rev 18272)
+++ trunk/flow/features/org.jboss.tools.flow.common.feature/sourceTemplatePlugin/about.properties 2009-10-23 21:31:04 UTC (rev 18273)
@@ -1,4 +1,4 @@
-blurb=Flow Language Common Tools Sources\n\
+blurb=Flow Languages Common Tools Sources\n\
\n\
Version: {featureVersion}\n\
Build id: {0}\n\
Modified: trunk/flow/features/org.jboss.tools.flow.common.feature/sourceTemplatePlugin/plugin.properties
===================================================================
--- trunk/flow/features/org.jboss.tools.flow.common.feature/sourceTemplatePlugin/plugin.properties 2009-10-23 21:10:47 UTC (rev 18272)
+++ trunk/flow/features/org.jboss.tools.flow.common.feature/sourceTemplatePlugin/plugin.properties 2009-10-23 21:31:04 UTC (rev 18273)
@@ -1,3 +1,3 @@
-pluginName = Flow Language Common Tools Sources Sources
+pluginName = Flow Languages Common Tools Sources
providerName = JBoss by Red Hat
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/plugin.properties
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/plugin.properties 2009-10-23 21:10:47 UTC (rev 18272)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/plugin.properties 2009-10-23 21:31:04 UTC (rev 18273)
@@ -1,3 +1,3 @@
#Properties file for org.jboss.tools.flow.common
Bundle-Vendor.0 = JBoss by Red Hat
-Bundle-Name.0 = Flow Language Common Tools
\ No newline at end of file
+Bundle-Name.0 = Flow Languages Common Tools
\ No newline at end of file
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/plugin.xml
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/plugin.xml 2009-10-23 21:10:47 UTC (rev 18272)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/plugin.xml 2009-10-23 21:31:04 UTC (rev 18273)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?>
<plugin>
- <extension-point id="languages" name="JBoss Tools Flow Language Extensions" schema="schema/languages.exsd"/>
- <extension-point id="elements" name="JBoss Tools Flow Language Elements" schema="schema/elements.exsd"/>
+ <extension-point id="languages" name="JBoss Tools Flow Languages Extensions" schema="schema/languages.exsd"/>
+ <extension-point id="elements" name="JBoss Tools Flow Languages Elements" schema="schema/elements.exsd"/>
</plugin>
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r18272 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-10-23 17:10:47 -0400 (Fri, 23 Oct 2009)
New Revision: 18272
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHSingleFilePublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHZippedJSTPublisher.java
Log:
Some progress monitor cleanup
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2009-10-23 20:27:20 UTC (rev 18271)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2009-10-23 21:10:47 UTC (rev 18272)
@@ -65,7 +65,7 @@
* @param mf
* @param path
* @param monitor
- * @return
+ * @return a list of error status objects.
* @throws CoreException
*/
public IStatus[] copyFile(IModuleFile mf, IPath path, IProgressMonitor monitor) throws CoreException;
@@ -78,9 +78,9 @@
*
* @param dir
* @param monitor
- * @return
+ * @return a list of error status objects.
*/
- public IStatus[] deleteResource(IPath path, IProgressMonitor monitor);
+ public IStatus[] deleteResource(IPath path, IProgressMonitor monitor) throws CoreException ;
/**
* Make a directory for this path relative to where the module belongs.
@@ -89,9 +89,9 @@
*
* @param dir
* @param monitor
- * @return
+ * @return a list of error status objects.
*/
- public IStatus[] makeDirectoryIfRequired(IPath dir, IProgressMonitor monitor);
+ public IStatus[] makeDirectoryIfRequired(IPath dir, IProgressMonitor monitor) throws CoreException;
}
public static class LocalCopyCallback implements IPublishCopyCallbackHandler {
@@ -111,19 +111,20 @@
}
public IStatus[] copyFile(IModuleFile mf, IPath relativePath, IProgressMonitor monitor) throws CoreException {
- //Trace.trace(Trace.PUBLISHING, "Copying: " + mf.getName() + " to " + path.toString());
File file = PublishUtil.getFile(mf);
if( file != null ) {
InputStream in = null;
try {
in = new FileInputStream(file);
} catch (IOException e) {
- throw new CoreException(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0,
- NLS.bind(Messages.errorReading, file.getAbsolutePath()), e));
+ return new IStatus[] {new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0,
+ NLS.bind(Messages.errorReading, file.getAbsolutePath()), e)};
}
- copyFile(in, deployRootFolder.append(relativePath), file.lastModified(), mf);
+ IStatus ret = copyFile(in, deployRootFolder.append(relativePath), file.lastModified(), mf);
+ if( ret != null && ret.isOK())
+ return new IStatus[] { ret };
} // else silently ignore I guess
- return new IStatus[]{Status.OK_STATUS};
+ return new IStatus[]{};
}
/**
@@ -133,7 +134,7 @@
* @param to java.lang.String
* @return a status
*/
- private IStatus copyFile(InputStream in, String to) {
+ private IStatus copyFile(InputStream in, String to) {
OutputStream out = null;
try {
@@ -172,7 +173,7 @@
* @param ts timestamp
* @throws CoreException if anything goes wrong
*/
- private void copyFile(InputStream in, IPath to, long ts, IModuleFile mf) throws CoreException {
+ private IStatus copyFile(InputStream in, IPath to, long ts, IModuleFile mf) throws CoreException {
OutputStream out = null;
File tempFile = null;
@@ -198,11 +199,10 @@
if (ts != IResource.NULL_STAMP && ts != 0)
file.setLastModified(ts);
} catch (CoreException e) {
- throw e;
+ return e.getStatus();
} catch (Exception e) {
IPath path = mf.getModuleRelativePath().append(mf.getName());
- //Trace.trace(Trace.SEVERE, "Error copying file: " + to.toOSString() + " to " + path.toOSString(), e);
- throw new CoreException(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0, NLS.bind(Messages.errorCopyingFile, path.toOSString(), e.getLocalizedMessage()), null));
+ return new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0, NLS.bind(Messages.errorCopyingFile, path.toOSString(), e.getLocalizedMessage()), null);
} finally {
if (tempFile != null && tempFile.exists())
tempFile.deleteOnExit();
@@ -219,6 +219,7 @@
// ignore
}
}
+ return null;
}
/**
@@ -229,7 +230,7 @@
* @param file
* @throws CoreException
*/
- private void moveTempFile(File tempFile, File file) throws CoreException {
+ private void moveTempFile(File tempFile, File file) throws CoreException {
if (file.exists()) {
if (!safeDelete(file, 2)) {
// attempt to rewrite an existing file with the tempFile contents if
@@ -312,7 +313,7 @@
IStatus s = new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0, NLS.bind(Messages.errorDeleting, resource.toFile().getAbsolutePath()), null);
return new IStatus[]{s};
}
- return new IStatus[] { Status.OK_STATUS};
+ return new IStatus[] {};
}
/**
@@ -404,13 +405,6 @@
}
-
-
-
-
-
-
-
private static final IStatus[] EMPTY_STATUS = new IStatus[0];
private IPublishCopyCallbackHandler handler;
public PublishCopyUtil(IPublishCopyCallbackHandler handler) {
@@ -427,7 +421,7 @@
* reporting and cancellation are not desired
* @return a possibly-empty array of error and warning status
*/
- public IStatus[] publishDelta(IModuleResourceDelta[] delta, IProgressMonitor monitor) {
+ public IStatus[] publishDelta(IModuleResourceDelta[] delta, IProgressMonitor monitor) throws CoreException {
if (delta == null)
return EMPTY_STATUS;
@@ -454,7 +448,7 @@
* reporting and cancellation are not desired
* @return a possibly-empty array of error and warning status
*/
- public IStatus[] publishDelta(IModuleResourceDelta delta, IPath path, IProgressMonitor monitor) {
+ public IStatus[] publishDelta(IModuleResourceDelta delta, IPath path, IProgressMonitor monitor) throws CoreException {
List status = new ArrayList(2);
IModuleResource resource = delta.getModuleResource();
@@ -518,11 +512,11 @@
* reporting and cancellation are not desired
* @return a possibly-empty array of error and warning status
*/
- public IStatus[] publishFull(IModuleResource[] resources, IProgressMonitor monitor) {
+ public IStatus[] publishFull(IModuleResource[] resources, IProgressMonitor monitor) throws CoreException {
return publishFull(resources, new Path("/"), monitor); //$NON-NLS-1$
}
- public IStatus[] publishFull(IModuleResource[] resources, IPath relative, IProgressMonitor monitor) {
+ public IStatus[] publishFull(IModuleResource[] resources, IPath relative, IProgressMonitor monitor) throws CoreException {
if (resources == null)
return EMPTY_STATUS;
@@ -540,7 +534,7 @@
return stat;
}
- private IStatus[] copy(IModuleResource resource, IPath path, IProgressMonitor monitor) {
+ private IStatus[] copy(IModuleResource resource, IPath path, IProgressMonitor monitor) throws CoreException {
String name = resource.getName();
//Trace.trace(Trace.PUBLISHING, "Copying: " + name + " to " + path.toString());
List status = new ArrayList(2);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPublisher.java 2009-10-23 20:27:20 UTC (rev 18271)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPublisher.java 2009-10-23 21:10:47 UTC (rev 18272)
@@ -11,6 +11,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
@@ -59,7 +60,7 @@
}
public int getPublishState() {
- return IServer.PUBLISH_STATE_NONE;
+ return publishState;
}
public IStatus publishModule(IJBossServerPublishMethod method,
@@ -100,7 +101,7 @@
// First delete it
// if the module we're publishing is a project, not a binary, clean it's folder
if( !(new Path(module.getName()).segmentCount() > 1 ))
- SSHZippedJSTPublisher.launchCommand(publishMethod.getSession(), "rm -rf " + remoteDeployPath.toString());
+ SSHZippedJSTPublisher.launchCommand(publishMethod.getSession(), "rm -rf " + remoteDeployPath.toString(), monitor);
ArrayList<IStatus> list = new ArrayList<IStatus>();
@@ -110,7 +111,7 @@
list.addAll(Arrays.asList(util.publishFull(members, monitor)));
}
else if( PublishUtil.isBinaryObject(moduleTree))
- list.addAll(Arrays.asList(copyBinaryModule(moduleTree)));
+ list.addAll(Arrays.asList(copyBinaryModule(moduleTree, monitor)));
else {
IPath deployRoot = JBossServerCorePlugin.getServerStateLocation(server.getServer()).
append(IJBossServerConstants.DEPLOY).makeAbsolute();
@@ -137,7 +138,7 @@
results = new PublishCopyUtil(handler).publishDelta(delta, monitor);
} else if( delta.length > 0 ) {
if( PublishUtil.isBinaryObject(moduleTree))
- results = copyBinaryModule(moduleTree);
+ results = copyBinaryModule(moduleTree, monitor);
else {
IPath localDeployRoot = JBossServerCorePlugin.getServerStateLocation(server.getServer()).
append(IJBossServerConstants.DEPLOY).makeAbsolute();
@@ -174,13 +175,13 @@
return ms;
}
- protected IStatus[] copyBinaryModule(IModule[] moduleTree) {
+ protected IStatus[] copyBinaryModule(IModule[] moduleTree, IProgressMonitor monitor) {
try {
IPath remoteDeployPath = getDeployPath(moduleTree, server);
IModuleResource[] members = PublishUtil.getResources(moduleTree);
File source = PublishUtil.getFile(members[0]);
if( source != null ) {
- SSHZippedJSTPublisher.launchCopyCommand(publishMethod.getSession(), source.toString(), remoteDeployPath.toString());
+ SSHZippedJSTPublisher.launchCopyCommand(publishMethod.getSession(), source.toString(), remoteDeployPath.toString(), monitor);
} else {
// IStatus s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, IEventCodes.JST_PUB_COPY_BINARY_FAIL,
// NLS.bind(Messages.CouldNotPublishModule,
@@ -189,11 +190,7 @@
// TODO
}
} catch( CoreException ce ) {
-// IStatus s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, IEventCodes.JST_PUB_COPY_BINARY_FAIL,
-// NLS.bind(Messages.CouldNotPublishModule,
-// moduleTree[moduleTree.length-1]), null);
-// return new IStatus[] {s};
- // TODO
+ return new IStatus[] {ce.getStatus()};
}
return new IStatus[]{Status.OK_STATUS};
}
@@ -201,7 +198,7 @@
protected IStatus unpublish(IDeployableServer jbServer, IModule[] module,
IProgressMonitor monitor) throws CoreException {
IPath remotePath = getDeployPath(module, server);
- SSHZippedJSTPublisher.launchCommand(publishMethod.getSession(), "rm -rf " + remotePath.toString());
+ SSHZippedJSTPublisher.launchCommand(publishMethod.getSession(), "rm -rf " + remotePath.toString(), monitor);
return Status.OK_STATUS;
}
@@ -215,8 +212,8 @@
public static void mkdirAndCopy(Session session, String localFile, String remoteFile) throws CoreException {
String parentFolder = new Path(remoteFile).removeLastSegments(1).toString();
- SSHZippedJSTPublisher.launchCommand(session, "mkdir -p " + parentFolder);
- SSHZippedJSTPublisher.launchCopyCommand(session, localFile, remoteFile);
+ SSHZippedJSTPublisher.launchCommand(session, "mkdir -p " + parentFolder, new NullProgressMonitor());
+ SSHZippedJSTPublisher.launchCopyCommand(session, localFile, remoteFile, new NullProgressMonitor());
}
public class SSHCopyCallback implements IPublishCopyCallbackHandler {
@@ -230,35 +227,28 @@
IProgressMonitor monitor) throws CoreException {
File sourceFile = PublishUtil.getFile(mf);
IPath destination = deployRoot.append(path);
- try {
- mkdirAndCopy(publishMethod.getSession(), sourceFile.getCanonicalPath(), destination.toString());
- } catch( IOException ioe) {
- throw new CoreException(new Status(IStatus.ERROR, SSHDeploymentPlugin.PLUGIN_ID, 0,
- "Error sending file: " + sourceFile.toString(), ioe));
- }
- return null;
+ mkdirAndCopy(publishMethod.getSession(), sourceFile.getAbsolutePath(), destination.toString());
+ return new IStatus[]{};
}
public IStatus[] deleteResource(IPath path, IProgressMonitor monitor) {
IPath remotePath = deployRoot.append(path);
- IStatus ret = Status.OK_STATUS;
try {
- SSHZippedJSTPublisher.launchCommand(publishMethod.getSession(), "rm -rf " + remotePath.toString());
+ SSHZippedJSTPublisher.launchCommand(publishMethod.getSession(), "rm -rf " + remotePath.toString(), monitor);
} catch( CoreException ce ) {
- ret = ce.getStatus();
+ return new IStatus[]{ce.getStatus()};
}
- return new IStatus[] { ret };
+ return new IStatus[] {};
}
public IStatus[] makeDirectoryIfRequired(IPath dir, IProgressMonitor monitor) {
IPath remotePath = deployRoot.append(dir);
- IStatus ret = Status.OK_STATUS;
try {
- SSHZippedJSTPublisher.launchCommand(publishMethod.getSession(), "mkdir -p " + remotePath.toString());
+ SSHZippedJSTPublisher.launchCommand(publishMethod.getSession(), "mkdir -p " + remotePath.toString(), monitor);
} catch( CoreException ce ) {
- ret = ce.getStatus();
+ return new IStatus[]{ce.getStatus()};
}
- return new IStatus[] { ret };
+ return new IStatus[] {};
}
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHSingleFilePublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHSingleFilePublisher.java 2009-10-23 20:27:20 UTC (rev 18271)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHSingleFilePublisher.java 2009-10-23 21:10:47 UTC (rev 18272)
@@ -1,7 +1,5 @@
package org.jboss.ide.eclipse.as.ssh.server;
-import java.io.File;
-
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -18,11 +16,9 @@
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory.SingleDeployableModuleDelegate;
-import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
-import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.ssh.server.SSHServerBehaviourDelegate.SSHPublishMethod;
@@ -80,7 +76,7 @@
return ce.getStatus();
}
} else {
- // error can't do nuffin
+ // error can't do nuffin, should never happen
publishState = IServer.PUBLISH_STATE_UNKNOWN;
}
return Status.OK_STATUS;
@@ -92,7 +88,7 @@
IPath sourcePath = delegate.getGlobalSourcePath();
String destFolder = SSHPublisher.getRemoteDeployFolder(server.getServer());
IPath destFile = new Path(destFolder).append(sourcePath.lastSegment());
- SSHZippedJSTPublisher.launchCommand(publishMethod.getSession(), "rm -rf " + destFile.toString());
+ SSHZippedJSTPublisher.launchCommand(publishMethod.getSession(), "rm -rf " + destFile.toString(), monitor);
} else {
// deleted module. o noes. Ignore it.
publishState = IServer.PUBLISH_STATE_UNKNOWN;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHZippedJSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHZippedJSTPublisher.java 2009-10-23 20:27:20 UTC (rev 18271)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHZippedJSTPublisher.java 2009-10-23 21:10:47 UTC (rev 18272)
@@ -74,10 +74,10 @@
// Am I a removal? If yes, remove me, and return
if( publishType == IJBossServerPublisher.REMOVE_PUBLISH) {
- launchRemoveCommand(method2.getSession(), deployFile);
+ launchRemoveCommand(method2.getSession(), deployFile, monitor);
} else {
launchCopyCommand(method2.getSession(),
- outputFilepath.toString(), deployFile);
+ outputFilepath.toString(), deployFile, monitor);
}
return null;
}
@@ -86,12 +86,12 @@
return ((Server)server).getAttribute(ISSHDeploymentConstants.DEPLOY_DIRECTORY, (String)null);
}
- public static void launchRemoveCommand(Session session, String remoteLocation) throws CoreException {
+ public static void launchRemoveCommand(Session session, String remoteLocation, IProgressMonitor monitor) throws CoreException {
String command = "rm " + remoteLocation;
- launchCommand(session, command);
+ launchCommand(session, command, monitor);
}
- public static void launchCommand(Session session, String command) throws CoreException {
+ public static void launchCommand(Session session, String command, IProgressMonitor monitor) throws CoreException {
Channel channel = null;
try {
channel = session.openChannel("exec");
@@ -109,7 +109,11 @@
}
- public static void launchCopyCommand(Session session, String localFile, String remoteFile) throws CoreException {
+ public static void launchCopyCommand(Session session, String localFile, String remoteFile, IProgressMonitor monitor) throws CoreException {
+ launchCopyCommandImpl(session, localFile, remoteFile, monitor);
+ }
+
+ protected static void launchCopyCommandImpl(Session session, String localFile, String remoteFile, IProgressMonitor monitor) throws CoreException {
Channel channel = null;
OutputStream out = null;
try {
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r18271 - in trunk/jbpm/features/org.jbpm.gd.jpdl.feature: sourceTemplateFeature and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-10-23 16:27:20 -0400 (Fri, 23 Oct 2009)
New Revision: 18271
Added:
trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.properties
Modified:
trunk/jbpm/features/org.jbpm.gd.jpdl.feature/build.properties
trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.xml
trunk/jbpm/features/org.jbpm.gd.jpdl.feature/sourceTemplateFeature/feature.properties
trunk/jbpm/features/org.jbpm.gd.jpdl.feature/sourceTemplatePlugin/about.properties
trunk/jbpm/features/org.jbpm.gd.jpdl.feature/sourceTemplatePlugin/plugin.properties
Log:
fix source feature name
Modified: trunk/jbpm/features/org.jbpm.gd.jpdl.feature/build.properties
===================================================================
--- trunk/jbpm/features/org.jbpm.gd.jpdl.feature/build.properties 2009-10-23 20:05:14 UTC (rev 18270)
+++ trunk/jbpm/features/org.jbpm.gd.jpdl.feature/build.properties 2009-10-23 20:27:20 UTC (rev 18271)
@@ -1 +1 @@
-bin.includes = feature.xml
+bin.includes = feature.*
Added: trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.properties (rev 0)
+++ trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.properties 2009-10-23 20:27:20 UTC (rev 18271)
@@ -0,0 +1,13 @@
+featureName=jBPM jPDL Tools
+featureProvider=JBoss by Red Hat
+description=jBPM jPDL Tools
+copyright=Copyright 2009 Red Hat, Inc.
+licenseURL=http://www.eclipse.org/legal/epl-v10.html
+license=Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+# END NON-TRANSLATABLE
\ No newline at end of file
Property changes on: trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.xml 2009-10-23 20:05:14 UTC (rev 18270)
+++ trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.xml 2009-10-23 20:27:20 UTC (rev 18271)
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.jbpm.gd.jpdl.feature"
- label="jBPM jPDL Tools"
+ label="%featureName"
version="3.2.0.qualifier"
- provider-name="JBoss by Red Hat">
+ provider-name="%featureProvider">
- <license>Red Hat, Inc. licenses these features and plugins to you under
-certain open source licenses (or aggregations of such licenses), which
-in a particular case may include the Eclipse Public License, the GNU
-Lesser General Public License, and/or certain other open source
-licenses. For precise licensing details, consult the corresponding
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
-Raleigh NC 27606 USA.
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
</license>
-
<plugin
id="org.jbpm.gd.jpdl"
download-size="0"
Modified: trunk/jbpm/features/org.jbpm.gd.jpdl.feature/sourceTemplateFeature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jbpm.gd.jpdl.feature/sourceTemplateFeature/feature.properties 2009-10-23 20:05:14 UTC (rev 18270)
+++ trunk/jbpm/features/org.jbpm.gd.jpdl.feature/sourceTemplateFeature/feature.properties 2009-10-23 20:27:20 UTC (rev 18271)
@@ -1,12 +1,12 @@
# properties file for org.jboss.tools.jmx.source
-featureName=jBPM jPDL Tools Source
+featureName=jBPM jPDL Tools Sources
featureProvider=JBoss by Red Hat
# "updateSiteName" property - label for the update site
updateSiteName=JBossTools Update Site
# "description" property - description of the feature
-description=jBPM jPDL Tools Source
+description=jBPM jPDL Tools Sources
# "licenseURL" property - URL of the "Feature License"
# do not translate value - just change to point to a locale-specific HTML page
Modified: trunk/jbpm/features/org.jbpm.gd.jpdl.feature/sourceTemplatePlugin/about.properties
===================================================================
--- trunk/jbpm/features/org.jbpm.gd.jpdl.feature/sourceTemplatePlugin/about.properties 2009-10-23 20:05:14 UTC (rev 18270)
+++ trunk/jbpm/features/org.jbpm.gd.jpdl.feature/sourceTemplatePlugin/about.properties 2009-10-23 20:27:20 UTC (rev 18271)
@@ -1,4 +1,4 @@
-blurb=jBPM jPDL Tools Source\n\
+blurb=jBPM jPDL Tools Sources\n\
\n\
Version: {featureVersion}\n\
Build id: {0}\n\
Modified: trunk/jbpm/features/org.jbpm.gd.jpdl.feature/sourceTemplatePlugin/plugin.properties
===================================================================
--- trunk/jbpm/features/org.jbpm.gd.jpdl.feature/sourceTemplatePlugin/plugin.properties 2009-10-23 20:05:14 UTC (rev 18270)
+++ trunk/jbpm/features/org.jbpm.gd.jpdl.feature/sourceTemplatePlugin/plugin.properties 2009-10-23 20:27:20 UTC (rev 18271)
@@ -1,3 +1,3 @@
-pluginName = jBPM jPDL Tools Source
+pluginName = jBPM jPDL Tools Sources
providerName = JBoss by Red Hat
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r18270 - trunk/jbpm/releng/org.jboss.tools.jbpm4.releng.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-10-23 16:05:14 -0400 (Fri, 23 Oct 2009)
New Revision: 18270
Modified:
trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties
trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.h...
trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.linux
trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.macosx
Log:
make jbpm4 depend on jbpm3 update site zip
Modified: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties 2009-10-23 18:42:05 UTC (rev 18269)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties 2009-10-23 20:05:14 UTC (rev 18270)
@@ -21,7 +21,6 @@
JAVA60_HOME=${JAVA_HOME_PARENT}
dependencyURLs=\
-http://hudson.qa.jboss.com/hudson/view/DevStudio/job/jbosstools-cbi-jbpm3/lastSuccessfulBuild/artifact/build/N-SNAPSHOT/jbpm3-Update-N-SNAPSHOT.zip,\
http://repository.jboss.org/eclipse/galileo/GEF-runtime-3.5.1.zip,\
http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\
http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\
@@ -29,6 +28,10 @@
http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.t...
#http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz
+repositoryURLs=\
+http://hudson.qa.jboss.com/hudson/view/DevStudio/job/jbosstools-cbi-jbpm3/lastSuccessfulBuild/artifact/build/N-SNAPSHOT/jbpm3-Update-N-SNAPSHOT.zip
+featureIDsToInstall=org.jboss.tools.jbpm.common.feature,org.jboss.tools.jbpm.common.source.feature
+
flattenDependencies=true
parallelCompilation=true
generateFeatureVersionSuffix=true
Modified: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.h...
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.h... 2009-10-23 18:42:05 UTC (rev 18269)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.h... 2009-10-23 20:05:14 UTC (rev 18270)
@@ -25,8 +25,13 @@
http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\
http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\
http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\
-http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz
+http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.tar.gz
+#http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz
+repositoryURLs=\
+http://hudson.qa.jboss.com/hudson/view/DevStudio/job/jbosstools-cbi-jbpm3/lastSuccessfulBuild/artifact/build/N-SNAPSHOT/jbpm3-Update-N-SNAPSHOT.zip
+featureIDsToInstall=org.jboss.tools.jbpm.common.feature,org.jboss.tools.jbpm.common.source.feature
+
flattenDependencies=true
parallelCompilation=true
generateFeatureVersionSuffix=true
Modified: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.linux
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.linux 2009-10-23 18:42:05 UTC (rev 18269)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.linux 2009-10-23 20:05:14 UTC (rev 18270)
@@ -15,7 +15,7 @@
build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup
# If using local sources, must copy or symlink jbosstools-trunk/flow/* into jbosstools-trunk/jbpm/ to find all plugins/features
-localSourceCheckoutDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/jbpm
+#localSourceCheckoutDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/jbpm
relengBuilderDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/jbpm/releng/org.jboss.tools.jbpm4.releng
relengBaseBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.releng.basebuilder
@@ -32,19 +32,23 @@
http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\
http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\
http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.t...
+#http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz
+repositoryURLs=\
+http://hudson.qa.jboss.com/hudson/view/DevStudio/job/jbosstools-cbi-jbpm3/lastSuccessfulBuild/artifact/build/N-SNAPSHOT/jbpm3-Update-N-SNAPSHOT.zip
+featureIDsToInstall=org.jboss.tools.jbpm.common.feature,org.jboss.tools.jbpm.common.source.feature
+
flattenDependencies=true
parallelCompilation=true
generateFeatureVersionSuffix=true
individualSourceBundles=true
+# do not sign or pack jars
+#skipPack=true
+skipSign=true
+
domainNamespace=*
projNamespace=org.jboss.tools.jbpm4
projRelengName=org.jboss.tools.jbpm4.releng
-# needed for Hudson, not for local?
-#projRelengRoot=svn://svn.jboss.org/repos/jbosstools/trunk/jmx
-#projRelengPath=releng
-#basebuilderBranch=R35_M6
-
## END PROJECT BUILD PROPERTIES ##
Modified: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.macosx
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.macosx 2009-10-23 18:42:05 UTC (rev 18269)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.macosx 2009-10-23 20:05:14 UTC (rev 18270)
@@ -28,12 +28,17 @@
JAVA60_HOME=/System/Library/Frameworks/JavaVM.framework/Home
dependencyURLs=\
+http://hudson.qa.jboss.com/hudson/view/DevStudio/job/jbosstools-cbi-jbpm3/lastSuccessfulBuild/artifact/build/N-SNAPSHOT/jbpm3-Update-N-SNAPSHOT.zip,\
http://repository.jboss.org/eclipse/galileo/GEF-runtime-3.5.1.zip,\
http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\
http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\
http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\
http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-macosx-carb...
+repositoryURLs=\
+http://hudson.qa.jboss.com/hudson/view/DevStudio/job/jbosstools-cbi-jbpm3/lastSuccessfulBuild/artifact/build/N-SNAPSHOT/jbpm3-Update-N-SNAPSHOT.zip
+featureIDsToInstall=org.jboss.tools.jbpm.common.feature,org.jboss.tools.jbpm.common.source.feature
+
flattenDependencies=true
parallelCompilation=true
generateFeatureVersionSuffix=true
14 years, 8 months
- 1
- 0