JBoss Tools SVN: r17695 - trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-09-22 16:14:27 -0400 (Tue, 22 Sep 2009)
New Revision: 17695
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java
Log:
JBIDE-4320 - if and else needed to be swapped
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java 2009-09-22 19:47:32 UTC (rev 17694)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java 2009-09-22 20:14:27 UTC (rev 17695)
@@ -48,9 +48,9 @@
if (node != null) {
double d = node.getDouble(IJBossESBFacetDataModelProperties.ESB_PROJECT_VERSION, 1.0);
if( d < 2.0 )
- return super.members();
+ return legacyMembers();
}
- return legacyMembers();
+ return super.members();
}
public IModuleResource[] legacyMembers() throws CoreException {
14 years, 9 months
JBoss Tools SVN: r17694 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-09-22 15:47:32 -0400 (Tue, 22 Sep 2009)
New Revision: 17694
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
JBIDE-4767 committing to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-09-22 19:01:26 UTC (rev 17693)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-09-22 19:47:32 UTC (rev 17694)
@@ -236,7 +236,7 @@
versions="1.0"/>
<moduleType
types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,5.0">
+ versions="4.2,4.3,4.4,4.5,4.6,5.0">
</moduleType>
</runtimeType>
<runtimeType
@@ -269,7 +269,7 @@
versions="1.0"/>
<moduleType
types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,5.0">
+ versions="4.2,4.3,4.4,4.5,4,6,5.0">
</moduleType>
<moduleType
types="bpel.module"
@@ -306,7 +306,7 @@
versions="1.0"/>
<moduleType
types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,5.0">
+ versions="4.2,4.3,4.4,4.5,4.6,5.0">
</moduleType>
<moduleType
types="bpel.module"
@@ -345,7 +345,7 @@
versions="1.0"/>
<moduleType
types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,5.0">
+ versions="4.2,4.3,4.4,4.5,4.6,5.0">
</moduleType>
</runtimeType>
@@ -379,7 +379,7 @@
versions="1.0"/>
<moduleType
types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,5.0">
+ versions="4.2,4.3,4.4,4.5,4.6,5.0">
</moduleType>
<moduleType
types="bpel.module"
@@ -419,7 +419,7 @@
versions="1.0"/>
<moduleType
types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,5.0">
+ versions="4.2,4.3,4.4,4.5,4.6,5.0">
</moduleType>
<moduleType
types="bpel.module"
14 years, 9 months
JBoss Tools SVN: r17693 - branches/jbosstools-3.0.x/documentation/guides/JBDS2.0-2.1-migration.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-09-22 15:01:26 -0400 (Tue, 22 Sep 2009)
New Revision: 17693
Added:
branches/jbosstools-3.0.x/documentation/guides/JBDS2.0-2.1-migration/JBDS2.0-2.1-migration-guide.doc
Log:
Doc format for PM peeps
Added: branches/jbosstools-3.0.x/documentation/guides/JBDS2.0-2.1-migration/JBDS2.0-2.1-migration-guide.doc
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.0.x/documentation/guides/JBDS2.0-2.1-migration/JBDS2.0-2.1-migration-guide.doc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 9 months
JBoss Tools SVN: r17692 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-09-22 14:48:31 -0400 (Tue, 22 Sep 2009)
New Revision: 17692
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java
Log:
JBIDE-4933: Content Assist doesn't shows proposals for JSF Resource Bundles
issue is fixed
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2009-09-22 12:11:24 UTC (rev 17691)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2009-09-22 18:48:31 UTC (rev 17692)
@@ -178,6 +178,10 @@
returnEqualedVariablesOnly);
if (resolvedVars != null && !resolvedVars.isEmpty()) {
resolvedVariables = resolvedVars;
+ ELSegmentImpl segment = new ELSegmentImpl();
+ segment.setToken(left.getFirstToken());
+ segment.setResolved(true);
+ resolution.addSegment(segment);
resolution.setLastResolvedToken(left);
break;
}
@@ -209,6 +213,7 @@
}
}
resolution.setProposals(proposals);
+ segment.setResolved(!proposals.isEmpty());
return resolution;
}
@@ -227,11 +232,13 @@
if(operand.getLength()<=varName.length()) {
TextProposal proposal = new TextProposal();
proposal.setReplacementString(varName.substring(operand.getLength()));
+ proposal.setLabel(varName);
setImage(proposal);
proposals.add(proposal);
} else if(returnEqualedVariablesOnly) {
TextProposal proposal = new TextProposal();
proposal.setReplacementString(varName);
+ proposal.setLabel(varName);
setImage(proposal);
proposals.add(proposal);
}
@@ -247,8 +254,9 @@
left = (ELInvocationExpression)left.getParent();
if (left != expr) { // inside expression
ELSegmentImpl segment = new ELSegmentImpl();
- segment.setResolved(false);
+ segment.setResolved(true);
resolution.addSegment(segment);
+ resolution.setLastResolvedToken(left);
return resolution;
} else { // Last segment
resolveLastSegment((ELInvocationExpression)operand, resolvedVariables, resolution, returnEqualedVariablesOnly);
@@ -332,7 +340,7 @@
if (proposal.equals(filter)) {
TextProposal kbProposal = new TextProposal();
kbProposal.setReplacementString(proposal);
-
+ kbProposal.setLabel(proposal);
setImage(kbProposal);
kbProposals.add(kbProposal);
@@ -343,6 +351,7 @@
// This is used for CA.
TextProposal kbProposal = new TextProposal();
kbProposal.setReplacementString(proposal.substring(filter.length()));
+ kbProposal.setLabel(proposal);
kbProposal.setImage(getELProposalImage());
kbProposals.add(kbProposal);
@@ -383,7 +392,7 @@
if (proposal.equals(filter)) {
TextProposal kbProposal = new TextProposal();
kbProposal.setReplacementString(proposal);
-
+ kbProposal.setLabel(proposal);
setImage(kbProposal);
kbProposals.add(kbProposal);
@@ -400,6 +409,7 @@
}
kbProposal.setReplacementString(replacementString);
+ kbProposal.setLabel(proposal);
kbProposal.setImage(getELProposalImage());
kbProposals.add(kbProposal);
@@ -424,12 +434,14 @@
if (key.indexOf('.') != -1) {
TextProposal proposal = new TextProposal();
proposal.setReplacementString("['" + key + "']"); //$NON-NLS-1$ //$NON-NLS-2$
+ proposal.setLabel("['" + key + "']");
setImage(proposal);
kbProposals.add(proposal);
} else {
TextProposal proposal = new TextProposal();
proposal.setReplacementString(key);
+ proposal.setLabel(key);
setImage(proposal);
kbProposals.add(proposal);
14 years, 9 months
JBoss Tools SVN: r17691 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-09-22 08:11:24 -0400 (Tue, 22 Sep 2009)
New Revision: 17691
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4932
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml 2009-09-22 10:30:58 UTC (rev 17690)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml 2009-09-22 12:11:24 UTC (rev 17691)
@@ -204,8 +204,7 @@
<component name="panelGroup">
<attribute name="layout">
<proposal type="enumeration">
- <param value="horizontal" />
- <param value="vertical" />
+ <param value="block" />
</proposal>
</attribute>
</component>
14 years, 9 months
JBoss Tools SVN: r17690 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-09-22 06:30:58 -0400 (Tue, 22 Sep 2009)
New Revision: 17690
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ChangeStructure.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/EntitiesList.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPARefactoring.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPAWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4901 - fixed - the solution was to use TextFileChange instead of DocumentChange
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java 2009-09-22 08:12:08 UTC (rev 17689)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java 2009-09-22 10:30:58 UTC (rev 17690)
@@ -26,8 +26,8 @@
import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.UndoEdit;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.jdt.ui.Activator;
import org.hibernate.eclipse.jdt.ui.internal.jpa.common.EntityInfo;
@@ -150,8 +150,8 @@
setJavaProject(project);
// get the buffer manager
ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- Iterator<Map.Entry<String, EntityInfo>> it = entities.entrySet().iterator();
- /*String outText = ""; //$NON-NLS-1$
+ /*Iterator<Map.Entry<String, EntityInfo>> it = entities.entrySet().iterator();
+ String outText = ""; //$NON-NLS-1$
String ls = System.getProperties().getProperty("line.separator", "\n"); //$NON-NLS-1$//$NON-NLS-2$
while (it.hasNext()) {
Map.Entry<String, EntityInfo> entry = it.next();
@@ -237,10 +237,10 @@
for (int i = 0; i < changes.size(); i++) {
ChangeStructure cs = changes.get(i);
try {
- if (cs.textFileBuffer != null && cs.document != null && cs.textEdit != null &&
+ if (cs.textFileBuffer != null && cs.textEdit != null &&
((cs.change != null && cs.change.isEnabled()) || (cs.change == null))) {
- cs.document = cs.textFileBuffer.getDocument();
- UndoEdit undo = cs.textEdit.apply(cs.document);
+ IDocument document = cs.textFileBuffer.getDocument();
+ cs.textEdit.apply(document);
// commit changes to underlying file
cs.textFileBuffer.commit(null, true);
}
@@ -288,7 +288,7 @@
bufferManager.connect(cs.path, LocationKind.IFILE, null);
cs.textFileBuffer = bufferManager.getTextFileBuffer(cs.path, LocationKind.IFILE);
// retrieve the buffer
- cs.document = cs.textFileBuffer.getDocument();
+ cs.icu = icu;
AST ast = cu.getAST();
ASTRewrite rewriter = ASTRewrite.create(ast);
// ... rewrite
@@ -300,8 +300,9 @@
processor.setEntities(entities);
processor.setASTRewrite(rewriter);
cu.accept(processor);
- //
- cs.textEdit = rewriter.rewriteAST(cs.document, JavaCore.getOptions());
+ ////
+ IDocument documentChange = cs.textFileBuffer.getDocument();
+ cs.textEdit = rewriter.rewriteAST(documentChange, JavaCore.getOptions());
// add change to array of changes
changes.add(cs);
} catch (JavaModelException e) {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ChangeStructure.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ChangeStructure.java 2009-09-22 08:12:08 UTC (rev 17689)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ChangeStructure.java 2009-09-22 10:30:58 UTC (rev 17690)
@@ -2,7 +2,7 @@
import org.eclipse.core.filebuffers.ITextFileBuffer;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.text.IDocument;
+import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.text.edits.TextEdit;
@@ -12,7 +12,7 @@
public class ChangeStructure {
public String fullyQualifiedName;
public IPath path;
- public IDocument document;
+ public ICompilationUnit icu;
public TextEdit textEdit;
public ITextFileBuffer textFileBuffer;
public Change change;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/EntitiesList.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/EntitiesList.java 2009-09-22 08:12:08 UTC (rev 17689)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/EntitiesList.java 2009-09-22 10:30:58 UTC (rev 17690)
@@ -41,6 +41,7 @@
*
* @author Vitali
*/
+@SuppressWarnings("restriction")
public class EntitiesList extends UserInputWizardPage {
protected IHibernateJPAWizardData data;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPARefactoring.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPARefactoring.java 2009-09-22 08:12:08 UTC (rev 17689)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPARefactoring.java 2009-09-22 10:30:58 UTC (rev 17690)
@@ -12,13 +12,14 @@
import java.util.ArrayList;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.DocumentChange;
import org.eclipse.ltk.core.refactoring.Refactoring;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.hibernate.eclipse.jdt.ui.internal.JdtUiMessages;
import org.hibernate.eclipse.jdt.ui.internal.jpa.process.ChangeStructure;
@@ -55,7 +56,8 @@
for (int i = 0; i < changes.size(); i++) {
ChangeStructure cs = changes.get(i);
String change_name = cs.fullyQualifiedName;
- DocumentChange change = new DocumentChange(change_name, cs.document);
+ TextFileChange change = new TextFileChange(change_name, (IFile)cs.icu.getResource());
+ change.setSaveMode(TextFileChange.FORCE_SAVE);
change.setEdit(cs.textEdit);
cs.change = change;
cc.add(change);
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPAWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPAWizard.java 2009-09-22 08:12:08 UTC (rev 17689)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPAWizard.java 2009-09-22 10:30:58 UTC (rev 17690)
@@ -12,9 +12,9 @@
import org.eclipse.jdt.ui.refactoring.RefactoringSaveHelper;
import org.eclipse.jdt.internal.ui.refactoring.actions.RefactoringStarter;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.hibernate.eclipse.jdt.ui.internal.JdtUiMessages;
@@ -24,6 +24,7 @@
*
* @author Vitali
*/
+@SuppressWarnings("restriction")
public class HibernateJPAWizard extends RefactoringWizard {
protected final String wizard_title = JdtUiMessages.AllEntitiesProcessor_header;
@@ -55,10 +56,11 @@
}
public boolean showWizard() {
- IWorkbenchWindow win = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- RefactoringStarter refactoringStarter = new RefactoringStarter();
- boolean res = refactoringStarter.activate(this, win.getShell(), wizard_title, RefactoringSaveHelper.SAVE_ALL);
- RefactoringStatus rs = refactoringStarter.getInitialConditionCheckingStatus();
+ final IWorkbenchWindow win = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ final Shell shell = win.getShell();
+ final RefactoringStarter refactoringStarter = new RefactoringStarter();
+ boolean res = refactoringStarter.activate(this, shell, wizard_title, RefactoringSaveHelper.SAVE_ALL);
+ //RefactoringStatus rs = refactoringStarter.getInitialConditionCheckingStatus();
return res;
}
14 years, 9 months
JBoss Tools SVN: r17689 - trunk/bpel/features/org.jboss.tools.bpel.feature.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-09-22 04:12:08 -0400 (Tue, 22 Sep 2009)
New Revision: 17689
Modified:
trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml
Log:
change the feature.xml for adding bpel cheatsheet plugin
Modified: trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2009-09-22 08:10:46 UTC (rev 17688)
+++ trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2009-09-22 08:12:08 UTC (rev 17689)
@@ -1,100 +1,107 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.bpel.feature"
- label="%featureName"
- version="1.0.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/>
- </url>
-
- <plugin
- id="org.eclipse.bpel.apache.ode.deploy.model"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.bpel.apache.ode.deploy.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.bpel.apache.ode.runtime"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.bpel.common.model"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.bpel.common.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.bpel.model"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.bpel.runtimes"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.bpel.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.bpel.validator"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.bpel.wsil.model"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.bpel.xpath10"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.bpel.as.integration"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.bpel.feature"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%providerName">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <url>
+ <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ </url>
+
+ <plugin
+ id="org.eclipse.bpel.apache.ode.deploy.model"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.bpel.apache.ode.deploy.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.bpel.apache.ode.runtime"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.bpel.common.model"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.bpel.common.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.bpel.model"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.bpel.runtimes"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.bpel.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.bpel.validator"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.bpel.wsil.model"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.bpel.xpath10"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.bpel.as.integration"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.bpel.cheatsheet"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
14 years, 9 months
JBoss Tools SVN: r17688 - in trunk/bpel/plugins: org.jboss.tools.bpel.cheatsheet and 15 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-09-22 04:10:46 -0400 (Tue, 22 Sep 2009)
New Revision: 17688
Added:
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.classpath
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.project
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.settings/
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.settings/org.eclipse.jdt.core.prefs
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin/
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin/org/
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin/org/jboss/
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin/org/jboss/tools/
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin/org/jboss/tools/bpel/
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin/org/jboss/tools/bpel/cheatsheet/
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin/org/jboss/tools/bpel/cheatsheet/Activator.class
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/build.properties
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/bpel.xml
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.xml
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/jboss/
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/jboss/tools/
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/jboss/tools/bpel/
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/jboss/tools/bpel/cheatsheet/
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/jboss/tools/bpel/cheatsheet/Activator.java
Log:
add cheatsheet for bpel
Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.classpath
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.classpath (rev 0)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.classpath 2009-09-22 08:10:46 UTC (rev 17688)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.project
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.project (rev 0)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.project 2009-09-22 08:10:46 UTC (rev 17688)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.bpel.cheatsheet</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.settings/org.eclipse.jdt.core.prefs 2009-09-22 08:10:46 UTC (rev 17688)
@@ -0,0 +1,8 @@
+#Thu Sep 17 15:54:11 CST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF (rev 0)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF 2009-09-22 08:10:46 UTC (rev 17688)
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Cheatsheet
+Bundle-SymbolicName: org.jboss.tools.bpel.cheatsheet;singleton:=true
+Bundle-Version: 1.0.0
+Bundle-Activator: org.jboss.tools.bpel.cheatsheet.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.cheatsheets
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin/org/jboss/tools/bpel/cheatsheet/Activator.class
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin/org/jboss/tools/bpel/cheatsheet/Activator.class
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/build.properties
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/build.properties (rev 0)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/build.properties 2009-09-22 08:10:46 UTC (rev 17688)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/bpel.xml
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/bpel.xml (rev 0)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/bpel.xml 2009-09-22 08:10:46 UTC (rev 17688)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<cheatsheet title="JBoss BPEL Tutorial">
+
+ <intro>
+ <description>
+ Learn how to use JBoss BPEL editor.
+ </description>
+ </intro>
+
+ <item title="Create a BPEL Project" skip="true">
+ <description>
+ If you want to deploy a bpel staff into JBoss BPEL server, the first step, you need create a BPEL project.
+Of course, if you only need to draw a BPEL process, you don't need to do the step.
+ </description>
+ <subitem
+ label="Create a BPEL project by selecting "File > New > Project... > BPEL 2.0 > BPEL Project" from the menu bar."
+ skip="false">
+ </subitem>
+ <subitem label="On the first page of the "New BPEL Project" Wizard enter a project name in the "Project Name" field. Click "Finish" button.">
+ </subitem>
+ </item>
+
+ <item title="Create a BPEL Process" skip="true">
+ <description>
+ After create a BPEL project, you can create a BPEL process file in the project.
+ </description>
+ <subitem
+ label="Create a BPEL process file by selecting "File > New > Others... > BPEL 2.0 > New BPEL Process File" from the menu bar.">
+ </subitem>
+ <subitem label="On the first page of the "Create a BPEL Process File" Wizard enter a process name in the "BPEL Process Name" field, a process's namesapce in the "Namespace" field, and a process's template in the "Template" field. Click "Next" button.">
+ </subitem>
+ <subitem label="On the second page of the "Create a BPEL Process File" Wizard select the "bpel" folder of the BPEL project. Click "Finish" button.">
+ </subitem>
+ </item>
+
+ <item title="Edit the BPEL Process file" skip="true">
+ <description>
+ For getting a useful BPEL process, you need to edit the BPEL process file by adding some BPEL elements.<br/><br/>
+From the "Palette" view, you can add a BPEL element to the BPEL process by dragging and dropping it.<br/><br/>
+From the "Properties" view, you can edit the attributes of a BPEL element.<br/><br/>
+From the "Tray of the BPEL editor", you can add a Partner link, Variable, Correlation Set or Message Exchange to the BPEL process.<br/><br/>
+If the "Properties" view and "Palette" view are not opened, you can open the views by right-clicking the BPEL editor and selecting "Show in Properties", "Show Palette in Palette view".
+
+ </description>
+ </item>
+
+ <item title="Edit the WSDL file" skip="true">
+ <description>
+ For getting a runnable BPEL staff, beside the BPEL process file, you need a WSDL to describe how to use the BPEL process. As default, the system has genereted a WSDL for the BPEL staff. You need to edit it to support your BPEL project. <br/><br/>
+Open the WSDL using the WSDL editor, add "Service" and "Binding" by right-clicking on the WSDL editor, and set the attributes of them in the "Properties" view.
+ </description>
+ </item>
+
+ <item title="Create a bpel-deploy.xml file" skip="true">
+ <description>
+ If you want to deploy a BPEL project to JBoss BPEL Runtime, you need to create a bpel-deploy.xml file.
+ </description>
+ <subitem label="Create a bpel-deploy.xml by selecting "File > New > Other... > BPEL 2.0 > Apache ODE Deployment Descriptor" from the menu bar.">
+ </subitem>
+ <subitem label="On the first page of the "Apache ODE Deployment Descriptor" Wizard choose the "bpel" folder of a bpel project in the "BPEL Project" field and enter "bpel-deploy.xml" in the "File name" field. Click "Finish" button.">
+ </subitem>
+ <subitem label="Double-click the bpel-deploy.xml file to open it in ODE Descriptor Deployment Editor. In the "Inbound Interfaces" section, click the "Associated Port" column and in the dropdown box select a BPEL port that is defined in the WSDL file.The Related Service and Binding Used columns should be automatically filled in. Save the bpel-deploy.xml file.">
+ </subitem>
+ </item>
+
+ <item title="Create a JBoss BPEL Server" skip="true">
+ <description>
+ Suppose you have installed the JBoss BPEL Runtime-RiftSaw into a JBoss server, you can create a server in JBoss Tools for JBoss BPEL runtime.
+ </description>
+ <subitem label="Open the "JBoss Server" view by selecting "Windows > Show View > Other... > Server > JBoss Server view" in the menu bar.">
+ </subitem>
+ <subitem label="Right-click the JBoss Server view and select "New > Server" to open the New Server Wizard">
+ </subitem>
+ <subitem label="On the first page of the "New Server" Wizard select "JBoss AS 5.1" in the "Select the server type" field, input a server name in the "Server name" field and select a runtime in the "Server runtime environment" field. Click "Next" button.">
+ </subitem>
+ <subitem label="On the second page of the "New Server" Wizard input your JBoss AS location in the "JBoss AS Location" field. Click "Next" button.">
+ </subitem>
+ <subitem label="On the third page of the "New Server" Wizard select a BPEL resource in the left column, click "Add >" button to add the BPEL resource to the right column. Click "Finish" button.">
+ </subitem>
+ </item>
+
+ <item title="Deploy the BPEL Process into the JBoss BPEL Server" skip="true">
+ <description>
+ If you don't add a BPEL resource into the server in the third step of "Create a JBoss BPEL Server", you can right-click on the server item in the "JBoss Server" view and select the "Add and Removes...", then you can do the step as the third step of "Create a JBoss BPEL Server".
+<br/><br/>
+After these steps, you can start the server to test your BPEL staff.
+ </description>
+ </item>
+</cheatsheet>
Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.xml
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.xml (rev 0)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.xml 2009-09-22 08:10:46 UTC (rev 17688)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.5"?>
+<plugin>
+ <extension
+ point="org.eclipse.ui.cheatsheets.cheatSheetContent">
+ <category
+ id="org.jboss.tools.bpel.cheatsheet"
+ name="JBoss BPEL Tutorial">
+ </category>
+ <cheatsheet
+ category="org.jboss.tools.bpel.cheatsheet"
+ contentFile="$nl$/cheatsheets/bpel.xml"
+ id="org.jboss.tools.bpel.cheatsheet.bpel"
+ name="JBoss BPEL Tutorial">
+ <description>
+ Learn how to use JBoss BPEL editor
+ </description>
+ </cheatsheet>
+ </extension>
+
+</plugin>
\ No newline at end of file
Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/jboss/tools/bpel/cheatsheet/Activator.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/jboss/tools/bpel/cheatsheet/Activator.java (rev 0)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/jboss/tools/bpel/cheatsheet/Activator.java 2009-09-22 08:10:46 UTC (rev 17688)
@@ -0,0 +1,50 @@
+package org.jboss.tools.bpel.cheatsheet;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.jboss.tools.bpel.cheatsheet";
+
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+}
14 years, 9 months
JBoss Tools SVN: r17687 - trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-09-22 02:11:35 -0400 (Tue, 22 Sep 2009)
New Revision: 17687
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java
Log:
JBIDE-4654: apply the patch
JBossESBFacetInstallationDelegate adds incorrect mapping
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java 2009-09-22 03:25:29 UTC (rev 17686)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java 2009-09-22 06:11:35 UTC (rev 17687)
@@ -29,6 +29,7 @@
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jst.common.frameworks.CommonFrameworksPlugin;
import org.eclipse.jst.common.project.facet.WtpUtils;
import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
import org.eclipse.wst.common.componentcore.ComponentCore;
@@ -49,12 +50,11 @@
public void execute(IProject project, IProjectFacetVersion fv,
Object config, IProgressMonitor monitor) throws CoreException {
model = (IDataModel) config;
+ final IJavaProject jproj = JavaCore.create(project);
createProjectStructure(project);
-
-
- final IJavaProject jproj = JavaCore.create(project);
+
// Add WTP natures.
WtpUtils.addNatures(project);
@@ -66,31 +66,26 @@
} catch (Exception e) {
c = ComponentCore.createComponent(project);
}
-
-
+
+ String outputLoc = jproj.readOutputLocation().removeFirstSegments(1).toString();
c.create(0, null);
- //String esbContent = model.getStringProperty(IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER);
- c.setMetaProperty("java-output-path", "/build/classes/");
+ c.setMetaProperty("java-output-path", outputLoc);
final IVirtualFolder jbiRoot = c.getRootFolder();
- // Create directory structure
- /*String srcFolder = null;
- srcFolder = model
- .getStringProperty(IJBossESBFacetDataModelProperties.ESB_SOURCE_FOLDER);
- jbiRoot.createLink(new Path("/" + srcFolder), 0, null);*/
- String resourcesFolder = model
- .getStringProperty(IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER);
+ // Map the esbcontent to root for deploy
+ String resourcesFolder = model.getStringProperty(
+ IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER);
jbiRoot.createLink(new Path("/" + resourcesFolder), 0, null);
- final IVirtualFolder jsrc = c.getRootFolder().getFolder("/esbcontent"); //$NON-NLS-1$
- final IClasspathEntry[] cp = jproj.getRawClasspath();
- for (int i = 0; i < cp.length; i++) {
- final IClasspathEntry cpe = cp[i];
+ final IVirtualFolder jsrc = c.getRootFolder().getFolder("/"); //$NON-NLS-1$
+ final IClasspathEntry[] cp2 = jproj.getRawClasspath();
+ for (int i = 0; i < cp2.length; i++) {
+ final IClasspathEntry cpe = cp2[i];
if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
if( cpe.getPath().removeFirstSegments(1).segmentCount() > 0 )
- jsrc.createLink(cpe.getPath().removeFirstSegments(1), 0, null);
+ jsrc.createLink(new Path(outputLoc), 0, null);
}
}
@@ -106,11 +101,6 @@
ClasspathHelper.removeClasspathEntries(project, fv);
ClasspathHelper.addClasspathEntries(project, fv);
-
- //String prjName = model.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
- //IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(prjName);
-
-
}
private IFile createJBossESBXML(IFolder folder) throws CoreException{
14 years, 9 months
JBoss Tools SVN: r17686 - in trunk/esb/plugins: org.jboss.tools.esb.project.core/.settings and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-09-21 23:25:29 -0400 (Mon, 21 Sep 2009)
New Revision: 17686
Added:
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/component/
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/component/ESBVirtualComponent.java
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.core/.settings/org.eclipse.jdt.core.prefs
trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/IJBossESBFacetDataModelProperties.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java
Log:
JBIDE-4320: apply the patch --ESB Projects does not respect WTP module dependency rules
JBIDE-4767: Add Support for JBoss ESB v4.6
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/.settings/org.eclipse.jdt.core.prefs 2009-09-21 21:23:29 UTC (rev 17685)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/.settings/org.eclipse.jdt.core.prefs 2009-09-22 03:25:29 UTC (rev 17686)
@@ -1,5 +1,6 @@
-#Wed Aug 27 16:17:18 CST 2008
+#Thu Sep 10 17:06:26 CST 2009
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2009-09-21 21:23:29 UTC (rev 17685)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2009-09-22 03:25:29 UTC (rev 17686)
@@ -81,6 +81,24 @@
</and>
</constraint>
</project-facet-version>
+ <project-facet-version
+ facet="jst.jboss.esb"
+ version="4.6">
+ <group-member
+ id="modules">
+ </group-member>
+ <constraint>
+ <and>
+ <conflicts
+ group="modules">
+ </conflicts>
+ <requires
+ facet="jst.java"
+ version="[5.0">
+ </requires>
+ </and>
+ </constraint>
+ </project-facet-version>
<action
facet="jst.jboss.esb"
id="jst.jboss.esb.install"
@@ -110,21 +128,21 @@
<supported>
<facet
id="jst.jboss.esb"
- version="4.2,4.3,4.4,4.5">
+ version="4.2,4.3,4.4,4.5,4.6">
</facet>
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component"
- version="4.2">
+ version="4.2,5.0,5.1">
</runtime-component>
</supported>
<supported>
<facet
id="jst.jboss.esb"
- version="4.2,4.3,4.4,4.5">
+ version="4.2,4.3,4.4,4.5,4.6">
</facet>
<runtime-component
id="org.jboss.ide.eclipse.eap.runtime.component"
- version="4.3">
+ version="4.3,5.0">
</runtime-component>
</supported>
</extension>
@@ -163,7 +181,7 @@
projects="true">
<moduleType
types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5">
+ versions="4.2,4.3,4.4,4.5,4.6">
</moduleType>
</moduleFactory>
</extension>
@@ -209,4 +227,14 @@
containerID="org.jboss.esb.runtime.classpath">
</filteredClasspathContainer>
</extension>
+
+
+ <extension
+ point="org.eclipse.wst.common.modulecore.componentimpl">
+ <componentimpl
+ typeID="jst.jboss.esb"
+ class="org.jboss.tools.esb.core.component.ESBVirtualComponent">
+ </componentimpl>
+ </extension>
+
</plugin>
Added: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/component/ESBVirtualComponent.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/component/ESBVirtualComponent.java (rev 0)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/component/ESBVirtualComponent.java 2009-09-22 03:25:29 UTC (rev 17686)
@@ -0,0 +1,7 @@
+package org.jboss.tools.esb.core.component;
+
+import org.jboss.ide.eclipse.as.wtp.core.vcf.JBTVirtualComponent;
+
+public class ESBVirtualComponent extends JBTVirtualComponent {
+
+}
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/IJBossESBFacetDataModelProperties.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/IJBossESBFacetDataModelProperties.java 2009-09-21 21:23:29 UTC (rev 17685)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/IJBossESBFacetDataModelProperties.java 2009-09-22 03:25:29 UTC (rev 17686)
@@ -27,6 +27,7 @@
public static final QualifiedName QNAME_ESB_CONTENT_FOLDER = new QualifiedName("jboss", ESB_CONTENT_FOLDER);
public static final QualifiedName QNAME_ESB_SRC_FOLDER = new QualifiedName("jboss", ESB_SOURCE_FOLDER);
+ public static final String ESB_PROJECT_VERSION = "jboss.esb.project.project.version";
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java 2009-09-21 21:23:29 UTC (rev 17685)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java 2009-09-22 03:25:29 UTC (rev 17686)
@@ -11,7 +11,6 @@
package org.jboss.tools.esb.core.facet;
import java.io.ByteArrayInputStream;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import org.eclipse.core.resources.IFile;
@@ -19,11 +18,14 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ProjectScope;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
@@ -35,6 +37,8 @@
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IDelegate;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.jboss.tools.esb.core.ESBProjectCorePlugin;
+import org.osgi.service.prefs.BackingStoreException;
public class JBossESBFacetInstallationDelegate implements IDelegate {
@@ -126,6 +130,19 @@
private void createProjectStructure(IProject project) throws CoreException{
String strContentFolder = model.getStringProperty(IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER);
project.setPersistentProperty(IJBossESBFacetDataModelProperties.QNAME_ESB_CONTENT_FOLDER, strContentFolder);
+
+ String qualifier = ESBProjectCorePlugin.getDefault().getDescriptor().getUniqueIdentifier();
+ IScopeContext context = new ProjectScope(project);
+ IEclipsePreferences node = context.getNode(qualifier);
+ if (node != null)
+ node.putDouble(IJBossESBFacetDataModelProperties.ESB_PROJECT_VERSION, 2.0);
+
+ try {
+ node.flush();
+ } catch (BackingStoreException e) {
+ e.printStackTrace();
+ }
+
IFolder esbContent = project.getFolder(strContentFolder);
if(!esbContent.exists()) {
esbContent.create(true, true, null);
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java 2009-09-21 21:23:29 UTC (rev 17685)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java 2009-09-22 03:25:29 UTC (rev 17686)
@@ -14,41 +14,51 @@
import java.util.List;
import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ProjectScope;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wst.server.core.util.ModuleFile;
-import org.eclipse.wst.server.core.util.ModuleFolder;
-import org.eclipse.wst.server.core.util.ProjectModule;
+import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule;
+import org.jboss.ide.eclipse.as.wtp.core.modules.JBTProjectModuleDelegate;
+import org.jboss.tools.esb.core.ESBProjectCorePlugin;
import org.jboss.tools.esb.core.StatusUtils;
+import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
-public class JBossESBModuleDelegate extends ProjectModule {
+public class JBossESBModuleDelegate extends JBTProjectModuleDelegate implements IJBTModule {
public JBossESBModuleDelegate(IProject project){
super(project);
}
- @Override
- public IModule[] getChildModules() {
- return null;
- }
public IModuleResource[] members() throws CoreException {
+ IProject p = getProject();
+ String qualifier = ESBProjectCorePlugin.getDefault().getDescriptor().getUniqueIdentifier();
+ IScopeContext context = new ProjectScope(p);
+ IEclipsePreferences node = context.getNode(qualifier);
+ if (node != null) {
+ double d = node.getDouble(IJBossESBFacetDataModelProperties.ESB_PROJECT_VERSION, 1.0);
+ if( d < 2.0 )
+ return super.members();
+ }
+ return legacyMembers();
+ }
+
+ public IModuleResource[] legacyMembers() throws CoreException {
IProject project = getProject();
final IVirtualComponent c = ComponentCore.createComponent(project);
IVirtualFolder vf = c.getRootFolder();
IContainer[] folders = vf.getUnderlyingFolders();
+
if(folders == null || folders.length == 0){
throw new CoreException(StatusUtils.errorStatus("The project is not a valid JBoss ESB project."));
}
@@ -57,8 +67,8 @@
//in the JBT CR1, the length of folders will be 1.
IContainer contentFolder = folders.length > 1? folders[1] : folders[0];
- IFolder configFolder = project.getFolder(contentFolder.getProjectRelativePath());
- IJavaProject javaPrj = JavaCore.create(project);
+ IFolder configFolder = getProject().getFolder(contentFolder.getProjectRelativePath());
+ IJavaProject javaPrj = JavaCore.create(getProject());
IPath output = javaPrj.getOutputLocation();
// if the jboss-esb.xml file is not in META-INF folder, try to get it from other folder of the project
// block this logic as Max's suggestion
@@ -67,7 +77,7 @@
List<IModuleResource> mrs = new ArrayList<IModuleResource>();
IModuleResource[] esbContent = getModuleResources(Path.EMPTY, configFolder);
- IModuleResource[] classes = getModuleResources(Path.EMPTY, project.getWorkspace().getRoot().getFolder(output));
+ IModuleResource[] classes = getModuleResources(Path.EMPTY, getProject().getWorkspace().getRoot().getFolder(output));
IModuleResource[] allResource = new IModuleResource[esbContent.length + classes.length + mrs.size()];
System.arraycopy(esbContent, 0, allResource, 0, esbContent.length);
System.arraycopy(classes, 0, allResource, esbContent.length, classes.length);
@@ -77,40 +87,9 @@
}
return allResource;
}
-
-
-
- @Override
- public IStatus validate() {
- return null;
- }
@Override
- protected IModuleResource[] getModuleResources(IPath path, IContainer container) throws CoreException {
-
- IResource[] resources = container.members();
- if (resources != null) {
- int size = resources.length;
- List<IModuleResource> list = new ArrayList<IModuleResource>(size);
- for (int i = 0; i < size; i++) {
- IResource resource = resources[i];
- if (resource != null && resource.exists()) {
- String name = resource.getName();
- if (resource instanceof IContainer) {
- IContainer container2 = (IContainer) resource;
- ModuleFolder mf = new ModuleFolder(container2, name, path);
- mf.setMembers(getModuleResources(path.append(name), container2));
- list.add(mf);
- } else if (resource instanceof IFile) {
- list.add(new ModuleFile((IFile) resource, name, path));
- }
- }
- }
- IModuleResource[] moduleResources = new IModuleResource[list.size()];
- list.toArray(moduleResources);
- return moduleResources;
- }
- return new IModuleResource[0];
+ protected String getFactoryId() {
+ return JBossESBModuleFactory.FACTORY_ID;
}
-
}
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java 2009-09-21 21:23:29 UTC (rev 17685)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java 2009-09-22 03:25:29 UTC (rev 17686)
@@ -10,92 +10,29 @@
******************************************************************************/
package org.jboss.tools.esb.core.module;
-import java.util.HashMap;
-
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.internal.ModuleFactory;
-import org.eclipse.wst.server.core.internal.ServerPlugin;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
+import org.jboss.ide.eclipse.as.wtp.core.modules.JBTProjectModuleDelegate;
+import org.jboss.ide.eclipse.as.wtp.core.modules.JBTProjectModuleFactory;
import org.jboss.tools.esb.core.ESBProjectConstant;
-import org.jboss.tools.esb.core.ESBProjectCorePlugin;
import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
-public class JBossESBModuleFactory extends ProjectModuleFactoryDelegate {
+public class JBossESBModuleFactory extends JBTProjectModuleFactory {
public static final String FACTORY_ID = "org.jboss.tools.esb.project.core.moduleFactory";
public static final String MODULE_TYPE = IJBossESBFacetDataModelProperties.JBOSS_ESB_FACET_ID;
- public static final String MODULE_ID_PREFIX = IJBossESBFacetDataModelProperties.JBOSS_ESB_FACET_ID + ".";
- private static ModuleFactory factory;
private static JBossESBModuleFactory factDelegate;
public static JBossESBModuleFactory getFactory() {
- if (factDelegate == null) {
- ModuleFactory[] factories = ServerPlugin.getModuleFactories();
- for (int i = 0; i < factories.length; i++) {
- if (factories[i].getId().equals(FACTORY_ID)) {
- Object o = factories[i]
- .getDelegate(new NullProgressMonitor());
- if (o instanceof JBossESBModuleFactory) {
- factory = factories[i];
- factDelegate = (JBossESBModuleFactory) o;
- return factDelegate;
- }
- }
- }
- }
+ if (factDelegate == null)
+ factDelegate = (JBossESBModuleFactory)getFactory(FACTORY_ID);
return factDelegate;
}
-
- private HashMap<IModule, JBossESBModuleDelegate> moduleToDelegate;
public JBossESBModuleFactory() {
- moduleToDelegate = new HashMap<IModule, JBossESBModuleDelegate>();
+ super(MODULE_TYPE, ESBProjectConstant.ESB_PROJECT_FACET);
}
- @Override
- protected void clearCache(IProject project) {
- super.clearCache(project);
- moduleToDelegate.remove(project);
+ protected JBTProjectModuleDelegate createDelegate(IProject project) {
+ return new JBossESBModuleDelegate(project);
}
-
- @Override
- public ModuleDelegate getModuleDelegate(IModule module) {
- return moduleToDelegate.get(module);
- }
- protected IModule[] createModules(IProject project) {
- IFacetedProject facetProject;
- try {
- facetProject = ProjectFacetsManager.create(project);
- if (facetProject == null) {
- return null;
- }
- IProjectFacet esbFacet = ProjectFacetsManager
- .getProjectFacet(ESBProjectConstant.ESB_PROJECT_FACET);
-
- if (facetProject.hasProjectFacet(esbFacet)) {
- IProjectFacetVersion version = facetProject.getProjectFacetVersion(esbFacet);
- IModule module = createModule(
- MODULE_ID_PREFIX + project.getName(),
- project.getName(),
- MODULE_TYPE,
- version.getVersionString(),
- project);
- moduleToDelegate.put(module, new JBossESBModuleDelegate(project));
- return new IModule[] { module };
- }
- } catch (CoreException e) {
- ESBProjectCorePlugin.getDefault().getLog().log(e.getStatus());
- }
- return null;
-
- }
-
}
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2009-09-21 21:23:29 UTC (rev 17685)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2009-09-22 03:25:29 UTC (rev 17686)
@@ -644,7 +644,14 @@
protected void initializeConfigVersionCombo(Combo cmVersions, String currentName, String version) {
cmVersions.removeAll();
cmVersions.add("1.0.1"); //$NON-NLS-1$
- if(version != null && version.equals("4.5")) { //$NON-NLS-1$
+ double versionNumber = 0.0;
+ try{
+ versionNumber = Double.valueOf(version);
+ }
+ catch(NumberFormatException ex){
+ versionNumber = 0.0;
+ }
+ if(versionNumber >= 4.5) { //$NON-NLS-1$
cmVersions.add("1.1.0"); //$NON-NLS-1$
}
int index = cmVersions.getItemCount() - 1;
14 years, 9 months