JBoss Tools SVN: r19074 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-12-07 07:28:33 -0500 (Mon, 07 Dec 2009)
New Revision: 19074
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java
Log:
JBIDE-5399: Update CA-related JUnit tests due to satisfy changes made in JBIDE-4877 for CA
Minor change is done due to make error message more useful
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-12-07 12:26:12 UTC (rev 19073)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2009-12-07 12:28:33 UTC (rev 19074)
@@ -33,7 +33,7 @@
protected void openEditor(String fileName) {
IEditorPart editorPart = WorkbenchUtils.openEditor(project.getName()+"/"+ fileName);
-
+// System.out.println("openEditor: " + project.getName()+"/"+ fileName);
if (editorPart instanceof JSPMultiPageEditor)
jspEditor = (JSPMultiPageEditor) editorPart;
@@ -49,7 +49,8 @@
"Cannot get the Content Assistant instance for the editor for page \""
+ fileName + "\"", (contentAssistant != null));
- assertTrue("The IDocument is not instance of IStructuredDocument",
+ assertTrue("The IDocument is not instance of IStructuredDocument for page \""
+ + fileName + "\"",
(document instanceof IStructuredDocument));
}
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19073 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-12-07 07:26:12 -0500 (Mon, 07 Dec 2009)
New Revision: 19073
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
Log:
JBIDE-5399: Update CA-related JUnit tests due to satisfy changes made in JBIDE-4877 for CA
org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test JUnit Test case is fixed
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2009-12-07 10:23:58 UTC (rev 19072)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2009-12-07 12:26:12 UTC (rev 19073)
@@ -308,8 +308,15 @@
for (int i = 0; i < results.length; i++) {
if(results[i] instanceof AutoContentAssistantProposal ) {
String displayString = ((ICompletionProposal) results[i]).getDisplayString();
+ // Fixed due to satisfy the changes performed by fix for JBIDE-4877
+ // The proposal is valid if:
+ // - the display string starts with the mask specified
+ // - the tag name part (without a prefix and ":"-character) starts with the mask specified
+ String tagNamePart = displayString.indexOf(":") == -1 ?
+ displayString :
+ displayString.substring(displayString.indexOf(":") + 1);
assertNotNull(displayString);
- assertEquals(true, displayString.startsWith(partOfString));
+ assertEquals(true, displayString.startsWith(partOfString) || tagNamePart.startsWith(partOfString));
}
}
}
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19070 - trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-12-07 04:06:49 -0500 (Mon, 07 Dec 2009)
New Revision: 19070
Modified:
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/To.java
Log:
JBIDE-5392:BPEL validation errors in simple_invoke riftsaw quickstart sample
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/To.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/To.java 2009-12-07 08:44:35 UTC (rev 19069)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/To.java 2009-12-07 09:06:49 UTC (rev 19070)
@@ -15,6 +15,7 @@
import org.eclipse.bpel.xpath10.Expr;
import org.eclipse.bpel.xpath10.PathExpr;
+import org.eclipse.bpel.xpath10.UnaryExpr;
import org.eclipse.bpel.xpath10.VariableReferenceExpr;
/**
@@ -45,7 +46,9 @@
IProblem problem;
Expr expr = xpathExpr;
-
+ if(expr instanceof UnaryExpr){
+ expr = ((UnaryExpr)expr).getExpr();
+ }
if (expr instanceof VariableReferenceExpr) {
mVisitor.visit( expr );
} else if (expr instanceof PathExpr) {
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19069 - in trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator: xpath and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-12-07 03:44:35 -0500 (Mon, 07 Dec 2009)
New Revision: 19069
Modified:
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/TransitionConditionValidator.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/TransitionCondition.java
Log:
JBIDE-5391:BPEL validation errors in Quickstart_bpel_loan_approval riftsaw quickstart sample
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/TransitionConditionValidator.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/TransitionConditionValidator.java 2009-12-07 06:42:34 UTC (rev 19068)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/TransitionConditionValidator.java 2009-12-07 08:44:35 UTC (rev 19069)
@@ -28,7 +28,7 @@
*/
@SuppressWarnings("hiding")
- static public IFilter<INode> PARENTS = new NodeNameFilter( ND_SOURCES );
+ static public IFilter<INode> PARENTS = new NodeNameFilter( ND_SOURCE );
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/TransitionCondition.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/TransitionCondition.java 2009-12-07 06:42:34 UTC (rev 19068)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/TransitionCondition.java 2009-12-07 08:44:35 UTC (rev 19069)
@@ -29,7 +29,8 @@
sa = 1022,
desc = "Checks for boolean expression on transitionCondition",
author = "michal.chmielewski(a)oracle.com",
- date = "01/30/2007"
+ date = "01/30/2007",
+ order = 999
)
@Override
public void checkBooleanExpression () {
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19068 - trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-12-07 01:42:34 -0500 (Mon, 07 Dec 2009)
New Revision: 19068
Modified:
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Builder.java
Log:
JBIDE-5398:BPEL Editor should re-validate artifacts wsdl when updating PartnerLinkTypes, etc. on save
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Builder.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Builder.java 2009-12-07 05:33:39 UTC (rev 19067)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Builder.java 2009-12-07 06:42:34 UTC (rev 19068)
@@ -198,10 +198,12 @@
p("File Resource : " + file.getName() );
// TODO: This should be a better check
- if ( file.getName().endsWith(".bpel")) {
- file.deleteMarkers(IBPELMarker.ID, true, IResource.DEPTH_INFINITE);
- deleteMarkersInReferencialResources(file);
- makeMarkers ( validate ( file, monitor ) );
+ if ( file.getName().endsWith(".bpel") || file.getName().endsWith(".wsdl")) {
+ IProject project = file.getProject();
+ validate(project, monitor);
+// file.deleteMarkers(IBPELMarker.ID, true, IResource.DEPTH_INFINITE);
+// deleteMarkersInReferencialResources(file);
+// makeMarkers ( validate ( file, monitor ) );
}
break;
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19067 - trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-12-07 00:33:39 -0500 (Mon, 07 Dec 2009)
New Revision: 19067
Modified:
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java
Log:
JBIDE-5336:Wait duration gives error
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java 2009-12-07 05:14:33 UTC (rev 19066)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java 2009-12-07 05:33:39 UTC (rev 19067)
@@ -364,6 +364,11 @@
IProblem problem;
Expr expr = xpathExpr ;
+
+ if( expr instanceof UnaryExpr){
+ expr = ((UnaryExpr)expr).getExpr();
+ }
+
if (expr instanceof LiteralExpr) {
LiteralExpr lexpr = (LiteralExpr) expr;
try {
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19066 - in trunk/esb/plugins: org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-12-07 00:14:33 -0500 (Mon, 07 Dec 2009)
New Revision: 19066
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_42.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/IESBRuntimeResolver.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntime.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeListConverter.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeManager.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUIMessages.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossESBRuntimePreferencePage.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java
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/JBossESBRuntimeContainerPage.java
Log:
JBIDE-5108:JBossRuntimeManager has hard-coded the configuration to default
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF 2009-12-05 08:43:49 UTC (rev 19065)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF 2009-12-07 05:14:33 UTC (rev 19066)
@@ -30,7 +30,8 @@
org.eclipse.wst.common.emfworkbench.integration,
org.eclipse.emf.ecore,
org.jboss.ide.eclipse.as.classpath.core,
- org.jboss.ide.eclipse.as.wtp.core;bundle-version="1.0.0"
+ org.jboss.ide.eclipse.as.wtp.core;bundle-version="1.0.0",
+ org.jboss.ide.eclipse.as.core;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Export-Package: org.jboss.tools.esb.core,
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java 2009-12-05 08:43:49 UTC (rev 19065)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java 2009-12-07 05:14:33 UTC (rev 19066)
@@ -14,13 +14,18 @@
protected final static String SOAP_AS_LOCATION = "jboss-as"; //$NON-NLS-1$
protected final static String ROSETTA_JAR = "jbossesb-rosetta.jar"; //$NON-NLS-1$
- public List<IPath> getJarDirectories(String runtimeLocation) {
+ public List<IPath> getJarDirectories(String runtimeLocation, String configuration) {
+
+ if("".equals(configuration)){
+ configuration = "default";
+ }
+
List<IPath> directories = new ArrayList<IPath>();
IPath rtHome = new Path(runtimeLocation);
IPath soapDeployPath = rtHome.append(SOAP_AS_LOCATION).append("server").append("default").append(
"deploy");
- IPath deployPath = rtHome.append("server").append("default").append(
+ IPath deployPath = rtHome.append("server").append(configuration).append(
"deploy");
IPath esbPath = deployPath.append(JBOSSESB_ESB);
@@ -39,10 +44,10 @@
return directories;
}
- public List<File> getAllRuntimeJars(String runtimeLocation) {
+ public List<File> getAllRuntimeJars(String runtimeLocation, String configuration) {
List<File> jarList = new ArrayList<File>();
- for(IPath dir : getJarDirectories(runtimeLocation)){
+ for(IPath dir : getJarDirectories(runtimeLocation, configuration)){
List<File> tmpJarList = new ArrayList<File>();
if(dir.toFile().exists()){
tmpJarList = getJarsOfFolder(dir.toFile());
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_42.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_42.java 2009-12-05 08:43:49 UTC (rev 19065)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_42.java 2009-12-07 05:14:33 UTC (rev 19066)
@@ -13,10 +13,10 @@
private final static String CONFIG_MODEL_JAR = "jbossesb-config-model-1.1.0.jar";
- public boolean isValidESBRuntime(String location, String version){
+ public boolean isValidESBRuntime(String location, String version, String configuration){
List<String> jarNames = new ArrayList<String>();
- for(File file : getAllRuntimeJars(location)){
+ for(File file : getAllRuntimeJars(location, configuration)){
jarNames.add(file.getName());
}
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java 2009-12-05 08:43:49 UTC (rev 19065)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java 2009-12-07 05:14:33 UTC (rev 19066)
@@ -14,10 +14,10 @@
private final static String CONFIG_MODEL_JAR_12 = "jbossesb-config-model-1.2.0.jar";
- public boolean isValidESBRuntime(String location, String version){
+ public boolean isValidESBRuntime(String location, String version, String configuration){
List<String> jarNames = new ArrayList<String>();
- for(File file : getAllRuntimeJars(location)){
+ for(File file : getAllRuntimeJars(location, configuration)){
jarNames.add(file.getName());
}
@@ -27,8 +27,8 @@
}
- public List<IPath> getJarDirectories(String runtimeLocation) {
- List<IPath> directories = super.getJarDirectories(runtimeLocation);
+ public List<IPath> getJarDirectories(String runtimeLocation, String configuration) {
+ List<IPath> directories = super.getJarDirectories(runtimeLocation, configuration);
IPath rtHome = new Path(runtimeLocation);
IPath soapDeployPath = rtHome.append(SOAP_AS_LOCATION).append("server").append("default").append(
"deployers").append("esb.deployer").append("lib");
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/IESBRuntimeResolver.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/IESBRuntimeResolver.java 2009-12-05 08:43:49 UTC (rev 19065)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/IESBRuntimeResolver.java 2009-12-07 05:14:33 UTC (rev 19066)
@@ -8,9 +8,9 @@
public interface IESBRuntimeResolver {
- public boolean isValidESBRuntime(String location, String version);
+ public boolean isValidESBRuntime(String location, String version, String configuration);
- public List<IPath> getJarDirectories(String runtimeLocation);
+ public List<IPath> getJarDirectories(String runtimeLocation, String configuration);
- public List<File> getAllRuntimeJars(String runtimeLocation);
+ public List<File> getAllRuntimeJars(String runtimeLocation, String configuration);
}
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntime.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntime.java 2009-12-05 08:43:49 UTC (rev 19065)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntime.java 2009-12-07 05:14:33 UTC (rev 19066)
@@ -24,6 +24,8 @@
String homeDir = null;
String version = null;
+
+ String configuration = "";
boolean defaultRt = false;
@@ -55,6 +57,16 @@
public String getHomeDir() {
return homeDir;
}
+
+
+ /**
+ * Get jboss server configuration
+ *
+ * @return JBoss configuration as string
+ */
+ public String getConfiguration(){
+ return configuration;
+ }
/**
* Set JBossWSRuntime name
@@ -75,6 +87,18 @@
public void setHomeDir(String homeDir) {
this.homeDir = homeDir;
}
+
+
+
+ /**
+ * Set JBoss server configuration, it is only for jboss AS contained ESB runtime
+ *
+ * @param configuration
+ * new JBossWSRuntime's configuration
+ */
+ public void setConfiguration(String configuration){
+ this.configuration = configuration;
+ }
/**
* Mark runtime as default
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java 2009-12-05 08:43:49 UTC (rev 19065)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java 2009-12-07 05:14:33 UTC (rev 19066)
@@ -16,6 +16,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IAccessRule;
import org.eclipse.jdt.core.IClasspathAttribute;
@@ -23,17 +24,12 @@
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
-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.IRuntime;
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.classpath.core.jee.AbstractClasspathContainer;
import org.jboss.ide.eclipse.as.classpath.core.jee.AbstractClasspathContainerInitializer;
import org.jboss.ide.eclipse.as.classpath.core.xpl.ClasspathDecorations;
-import org.jboss.tools.esb.core.ESBProjectCorePlugin;
-import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.tools.esb.core.messages.JBossFacetCoreMessages;
/**
@@ -146,8 +142,10 @@
unbound = false;
String runtimeLocation = serverRuntime.getLocation()
.toOSString();
+ IJBossServerRuntime jbossRuntime = (IJBossServerRuntime)serverRuntime.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
+
jars = JBossRuntimeManager.getInstance().getAllRuntimeJars(
- runtimeLocation, serverRuntime.getRuntimeType().getId());
+ runtimeLocation, serverRuntime.getRuntimeType().getId(), jbossRuntime.getJBossConfiguration());
} else {
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeListConverter.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeListConverter.java 2009-12-05 08:43:49 UTC (rev 19065)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeListConverter.java 2009-12-07 05:14:33 UTC (rev 19066)
@@ -36,6 +36,7 @@
private static final String DEFAULT = "default";
private static final String HOME_DIR = "homeDir";
private static final String VERSION = "version";
+ private static final String CONFIGURATION = "configuration";
private static final String NAME = "name";
private static final String USER_CONFIG_CLASSPATH = "userConfig";
private static final String LIBRARY = "libraries";
@@ -71,7 +72,9 @@
rt.setHomeDir(value);
} else if (VERSION.equals(name)) {
rt.setVersion(value);
- } else if (DEFAULT.equals(name)) {
+ }else if (CONFIGURATION.equals(name)) {
+ rt.setConfiguration(value);
+ }else if (DEFAULT.equals(name)) {
rt.setDefault(Boolean.parseBoolean(value));
}else if(USER_CONFIG_CLASSPATH.equals(name)){
rt.setUserConfigClasspath(Boolean.parseBoolean(value));
@@ -134,6 +137,9 @@
buffer.append(FIELD_SEPARATOR).append(HOME_DIR).append(
FIELD_SEPARATOR);
buffer.append(runtimes[i].getHomeDir());
+ buffer.append(FIELD_SEPARATOR).append(CONFIGURATION).append(
+ FIELD_SEPARATOR);
+ buffer.append(runtimes[i].getConfiguration());
buffer.append(FIELD_SEPARATOR).append(DEFAULT).append(
FIELD_SEPARATOR);
buffer.append(runtimes[i].isDefault());
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeManager.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeManager.java 2009-12-05 08:43:49 UTC (rev 19065)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeManager.java 2009-12-07 05:14:33 UTC (rev 19066)
@@ -23,8 +23,6 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.core.runtime.Status;
@@ -169,14 +167,14 @@
} else {
- jarList = getAllRuntimeJars(rt.getHomeDir(), esbVersion);
+ jarList = getAllRuntimeJars(rt.getHomeDir(), esbVersion, rt.getConfiguration());
}
}
return jarList;
}
- public List<String> getAllRuntimeJars(String runtimeLocation, String esbVersion) {
+ public List<String> getAllRuntimeJars(String runtimeLocation, String esbVersion, String configuration) {
List<String> jarList = new ArrayList<String>();
IESBRuntimeResolver resolver = null;
if(parserMap.get(esbVersion) != null){
@@ -184,7 +182,7 @@
}
if( resolver != null){
- List<File> jars = resolver.getAllRuntimeJars(runtimeLocation);
+ List<File> jars = resolver.getAllRuntimeJars(runtimeLocation, configuration);
for(File file : jars){
jarList.add(file.getAbsolutePath());
}
@@ -357,9 +355,9 @@
runtimes = converter.getMap(runtimeListString);
}
- public static boolean isValidESBServer(String path, String version){
+ public static boolean isValidESBServer(String path, String version, String configuration){
- return isValidESBStandaloneRuntimeDir(path, version);
+ return isValidESBStandaloneRuntimeDir(path, version, configuration);
}
// private static boolean isValidSoapContainedESBRuntime(String path, String version){
@@ -367,21 +365,21 @@
// }
@Deprecated
- public static boolean getResttaJar(String path, String asFoldername, String version){
- return isValidESBStandaloneRuntimeDir(path, version);
+ public static boolean getResttaJar(String path, String asFoldername, String version, String configuration){
+ return isValidESBStandaloneRuntimeDir(path, version, configuration);
}
- public static boolean isValidESBStandaloneRuntimeDir(String path, String version) {
+ public static boolean isValidESBStandaloneRuntimeDir(String path, String version, String configuration) {
IESBRuntimeResolver resolver = null;
if( parserMap.get(version) != null){
resolver = (IESBRuntimeResolver)parserMap.get(version);
}
if(resolver != null){
- return resolver.isValidESBRuntime(path, version);
+ return resolver.isValidESBRuntime(path, version, configuration);
}
else{
ESBProjectCorePlugin.log("No ESB runtime resolver defined for ESB "+ version, null, Status.WARNING);
@@ -410,11 +408,6 @@
// return true;
}
- private static boolean isVersion45(IPath sarLocation){
- IPath libPath = sarLocation.append("lib");
- File jbossesbConfigModel110 = libPath.append("jbossesb-config-model-1.1.0.jar").toFile();
- return jbossesbConfigModel110 != null && jbossesbConfigModel110.exists();
- }
public String getESBVersionNumber(File rosettaJar){
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF 2009-12-05 08:43:49 UTC (rev 19065)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF 2009-12-07 05:14:33 UTC (rev 19066)
@@ -33,7 +33,8 @@
org.jboss.tools.esb.project.core;bundle-version="1.0.0",
org.eclipse.jdt.ui;bundle-version="3.4.1",
org.jboss.ide.eclipse.as.ui;bundle-version="1.0.0",
- org.jboss.ide.eclipse.as.wtp.core;bundle-version="1.0.0"
+ org.jboss.ide.eclipse.as.wtp.core;bundle-version="1.0.0",
+ org.jboss.ide.eclipse.as.core;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.esb.project.ui
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties 2009-12-05 08:43:49 UTC (rev 19065)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties 2009-12-07 05:14:33 UTC (rev 19066)
@@ -4,7 +4,8 @@
Error_JBoss_Basic_Editor_Support=Editor supports only grid layout
Error_JBoss_Basic_Editor_Different=Parent for label is different
JBoss_Runtime_List_Field_Editor_Name=Name
-JBoss_Runtime_List_Field_Editor_Version=Version
+JBoss_Runtime_List_Field_Editor_Version=Version:
+JBoss_Runtime_List_Field_Editor_Configuration=Configuration:
JBoss_Runtime_List_Field_Editor_Path=Path
JBoss_Runtime_List_Field_Editor_Inputelement_Must_Be_List=inputElement must be an instance of List<JBossRuntime>.
JBoss_Runtime_Delete_Confirm_Title=Confirm Runtime Delete
@@ -13,6 +14,7 @@
JBoss_Runtime_List_Field_Editor_Edit_Runtime=Edit JBoss ESB Runtime
JBoss_Runtime_List_Field_Editor_Modify_Runtime=Input new values
JBoss_Runtime_List_Field_Editor_New_Runtime=New JBoss ESB Runtime
+JBoss_Runtime_List_Field_Editor_Configuration_Description=Only for JBoss AS contained ESB runtime
Error_JBoss_Runtime_List_Field_Editor_Path_To_Home_Diretory_Cannot_Be_Empty=Path to JBoss ESB runtime home directory cannot be empty
JBoss_Runtime_List_Field_Editor_Runtime_Already_Exists=JBoss ESB Runtime ''{0}'' already exists
JBoss_Runtime_List_Field_Editor_Runtime=JBoss ESB Runtime
@@ -72,4 +74,4 @@
ESBExportWizard_NotValidProject=Project "{0}" is not a valid ESB Project
ESBExportWizard_Title=ESB Export
ESBExportWizard_Description=Export an ESB project to the local file system.
-ESBExportWizard_ESBProject=ESB Project:
\ No newline at end of file
+ESBExportWizard_ESBProject=ESB Project\:
\ No newline at end of file
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUIMessages.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUIMessages.java 2009-12-05 08:43:49 UTC (rev 19065)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUIMessages.java 2009-12-07 05:14:33 UTC (rev 19066)
@@ -37,6 +37,7 @@
public static String JBoss_Runtime_Delete_Confirm_Title;
public static String JBoss_Runtime_Delete_Used_Confirm;
public static String JBoss_Runtime_Delete_Not_Used_Confirm;
+ public static String JBoss_Runtime_List_Field_Editor_Configuration_Description;
public static String JBoss_Runtime_List_Field_Editor_Edit_Runtime;
public static String JBoss_Runtime_List_Field_Editor_Modify_Runtime;
public static String JBoss_Runtime_List_Field_Editor_New_Runtime;
@@ -51,6 +52,7 @@
public static String JBoss_Composite_Editor_This_Method_Can_Be_Invoked;
public static String JBoss_Button_Field_Editor_Browse;
public static String JBoss_ESBRuntime_Classpath_Container_5;
+ public static String JBoss_Runtime_List_Field_Editor_Configuration;
public static String JBoss_ESBRuntime_Classpath_Container_Description;
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossESBRuntimePreferencePage.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossESBRuntimePreferencePage.java 2009-12-05 08:43:49 UTC (rev 19065)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossESBRuntimePreferencePage.java 2009-12-07 05:14:33 UTC (rev 19066)
@@ -99,6 +99,7 @@
JBossRuntime o = changed.get(c);
o.setHomeDir(c.getHomeDir());
o.setVersion(c.getVersion());
+ o.setConfiguration(c.getConfiguration());
String oldName = o.getName();
String newName = c.getName();
if (!oldName.equals(newName)) {
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java 2009-12-05 08:43:49 UTC (rev 19065)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java 2009-12-07 05:14:33 UTC (rev 19066)
@@ -43,6 +43,8 @@
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Image;
@@ -52,10 +54,12 @@
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.DirectoryDialog;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
@@ -424,6 +428,10 @@
IFieldEditor version = createComboEditor(SRT_VERSION,
JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Version, getESBFacetVersions(), ""); //$NON-NLS-1$
+
+// IFieldEditor configuration = createComboEditor(SRT_CONFIGURATION,
+// JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Configuration, getESBFacetVersions(), ""); //$NON-NLS-1$
+ Combo configuration;
IFieldEditor homeDir = createBrowseFolderEditor(
SRT_HOMEDIR,
@@ -431,16 +439,17 @@
""); //$NON-NLS-1$
JBossRuntime current = null;
-
+ JBossRuntime source = null;
IFieldEditor jars = null;
- public JBossWSRuntimeWizardPage(List<JBossRuntime> editedList) {
+ public JBossWSRuntimeWizardPage(List<JBossRuntime> editedList, JBossRuntime source) {
super(
JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_New_Runtime);
setMessage(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Create_A_Runtime);
setTitle(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Runtime);
value = editedList;
+ this.source = source;
}
/**
@@ -464,12 +473,32 @@
version.addPropertyChangeListener(this);
homeDir.doFillIntoGrid(root);
homeDir.addPropertyChangeListener(this);
+
+ new Label(root, SWT.NONE).setText(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Configuration);
+ Composite cfgComposite = new Composite(root, SWT.NONE);
+ cfgComposite.setLayout(new GridLayout(2, false));
+ cfgComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ configuration = new Combo(cfgComposite, SWT.READ_ONLY);
+ GridData gd = new GridData();
+ gd.widthHint = 150;
+ configuration.setLayoutData(gd);
+ new Label(cfgComposite, SWT.NONE).setText(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Configuration_Description);
+ configuration.addModifyListener(new ModifyListener() {
+
+ public void modifyText(ModifyEvent e) {
+ checkPageComplete();
+ }
+ });
+
+
jars = new JBossLibraryListFieldEditor("", "", current); //$NON-NLS-1$ //$NON-NLS-2$
jars.doFillIntoGrid(root);
jars.addPropertyChangeListener(this);
setPageComplete(false);
setControl(root);
+
+ updateConfigrations(homeDir.getValueAsString());
}
/**
@@ -491,7 +520,13 @@
}
name.setValue(homeDirName);
}
+ updateConfigrations(homeDir.getValueAsString());
}
+
+ checkPageComplete();
+ }
+
+ private void checkPageComplete(){
if (name.getValueAsString() == null || "".equals(//$NON-NLS-1$
name.getValueAsString().toString().trim())) {
@@ -532,6 +567,7 @@
&& current.getVersion().equals(version.getValueAsString())
&& current.isUserConfigClasspath() == jarJbws
.isUserConfigClasspath()
+ && current.getConfiguration().equals(configuration.getText())
&& (!jarJbws.isUserConfigClasspath() || hasSameLibraies(
current.getLibraries(), jarJbws.getLibraries()))) {
@@ -554,7 +590,7 @@
return;
}
- if (!runtimeExist(homeDir.getValueAsString(), (String)version.getValue())) {
+ if (!runtimeExist(homeDir.getValueAsString(), (String)version.getValue(), configuration.getText())) {
setErrorMessage(NLS.bind(JBossESBUIMessages.Label_JBoss_Runtime_Load_Error, version.getValue()));
setPageComplete(false);
return;
@@ -584,6 +620,59 @@
return versions;
}
+
+
+ private List<String> updateConfigrations(String location){
+
+ ArrayList<String> configList = new ArrayList<String>();
+ IPath locationPath = new Path(location);
+ IPath asPath = locationPath.append("jboss-as").append("server");
+ if(!asPath.toFile().exists()){
+ asPath = locationPath.append("server");
+ }
+
+// IPath asPath = locationPath.append("server");
+ File serverDirectory = asPath.toFile();
+
+ if (serverDirectory.exists()) {
+
+ File types[] = serverDirectory.listFiles();
+ for (int i = 0; i < types.length; i++) {
+ File serviceDescriptor = new File(types[i]
+ .getAbsolutePath()
+ + File.separator
+ + "conf" //$NON-NLS-1$
+ + File.separator
+ + "jboss-service.xml"); //$NON-NLS-1$
+
+ if (types[i].isDirectory() && serviceDescriptor.exists()) {
+ String configuration = types[i].getName();
+ configList.add(configuration);
+ }
+ }
+
+ if (configList.size() > 0) {
+ getControl().setEnabled(true);
+ }
+ }
+
+ if(configuration != null && !configuration.isDisposed()){
+ configuration.removeAll();
+
+ for(String config : configList){
+ configuration.add(config);
+ if("default".equals(config)){
+ configuration.select(configList.indexOf(config));
+ }
+ }
+ if(source != null && source.getConfiguration() != null){
+ configuration.setText(source.getConfiguration());
+ }
+ }
+
+ return configList;
+
+ }
/**
* Return JBossWS Runtime instance initialized by user input
*
@@ -594,6 +683,7 @@
newRt.setName(name.getValueAsString());
newRt.setVersion(version.getValueAsString());
newRt.setHomeDir(homeDir.getValueAsString());
+ newRt.setConfiguration(configuration.getText());
JBossRuntime rt = (JBossRuntime) jars.getValue();
newRt.setLibraries(rt.getLibraries());
newRt.setUserConfigClasspath(rt.isUserConfigClasspath());
@@ -654,14 +744,14 @@
};
}
- private boolean runtimeExist(String path, String version) {
+ private boolean runtimeExist(String path, String version, String configuration) {
File jbosswsHomeDir = new File(path);
if (!jbosswsHomeDir.isDirectory())
return false;
- if(!JBossRuntimeManager.isValidESBStandaloneRuntimeDir(path, version)
- && !JBossRuntimeManager.isValidESBServer(path, version)){
+ if(!JBossRuntimeManager.isValidESBStandaloneRuntimeDir(path, version, configuration)
+ && !JBossRuntimeManager.isValidESBServer(path, version, configuration)){
return false;
}
@@ -689,7 +779,7 @@
List<JBossRuntime> added) {
super();
setWindowTitle(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_New_Runtime);
- page1 = new JBossWSRuntimeWizardPage(exist);
+ page1 = new JBossWSRuntimeWizardPage(exist, null);
addPage(page1);
this.value = exist;
this.added = added;
@@ -745,7 +835,7 @@
Map<JBossRuntime, JBossRuntime> changed) {
super();
setWindowTitle(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Edit_Runtime);
- page1 = new JBossWSRuntimeWizardPage(existing);
+ page1 = new JBossWSRuntimeWizardPage(existing, source);
page1
.setMessage(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Modify_Runtime);
page1
@@ -774,6 +864,7 @@
source.setName(rt.getName());
source.setHomeDir(rt.getHomeDir());
source.setVersion(rt.getVersion());
+ source.setConfiguration(rt.getConfiguration());
source.setUserConfigClasspath(rt.isUserConfigClasspath());
source.setLibraries(rt.getLibraries());
} else {
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-12-05 08:43:49 UTC (rev 19065)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2009-12-07 05:14:33 UTC (rev 19066)
@@ -20,6 +20,7 @@
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.dialogs.Dialog;
@@ -56,6 +57,7 @@
import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage;
import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage;
import org.eclipse.wst.server.core.ServerCore;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.tools.esb.core.ESBProjectConstant;
import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
import org.jboss.tools.esb.core.runtime.JBossRuntime;
@@ -364,8 +366,10 @@
org.eclipse.wst.server.core.IRuntime serverRuntime = ServerCore
.findRuntime(runtime.getProperty("id")); //$NON-NLS-1$
+ IJBossServerRuntime jbossRuntime = (IJBossServerRuntime)serverRuntime.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
+
if (!JBossRuntimeManager.isValidESBServer(serverRuntime
- .getLocation().toOSString(), getSelectedESBVersion().getVersionString())) {
+ .getLocation().toOSString(), getSelectedESBVersion().getVersionString(), jbossRuntime.getJBossConfiguration())) {
hasRuntime = true;
setMessage(NLS.bind(JBossESBUIMessages.ESBFacetInstallationPage_Error_Message_Invalid_ESB_Runtime, getSelectedESBVersion().getVersionString()), WARNING);
setPageComplete(isPageComplete());
@@ -388,8 +392,10 @@
}
org.eclipse.wst.server.core.IRuntime serverRuntime = ServerCore
.findRuntime(runtime.getProperty("id"));
+ IJBossServerRuntime jbossRuntime = (IJBossServerRuntime)serverRuntime.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
+
if (!JBossRuntimeManager.isValidESBServer(serverRuntime
- .getLocation().toOSString(), getSelectedESBVersion().getVersionString())) {
+ .getLocation().toOSString(), getSelectedESBVersion().getVersionString(), jbossRuntime.getJBossConfiguration())) {
setMessage(NLS.bind(JBossESBUIMessages.ESBFacetInstallationPage_Error_Message_Invalid_ESB_Runtime, getSelectedESBVersion().getVersionString()), WARNING);
hasRuntime = true;
setPageComplete(isPageComplete());
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java 2009-12-05 08:43:49 UTC (rev 19065)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java 2009-12-07 05:14:33 UTC (rev 19066)
@@ -15,6 +15,7 @@
import java.util.List;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.JavaCore;
@@ -44,6 +45,7 @@
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.ui.ServerUICore;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.tools.esb.core.runtime.JBossRuntime;
import org.jboss.tools.esb.core.runtime.JBossRuntimeClassPathInitializer;
import org.jboss.tools.esb.core.runtime.JBossRuntimeManager;
@@ -167,8 +169,9 @@
IPath location = ((IRuntime)element).getLocation();
String runtimeType = ((IRuntime)element).getRuntimeType().getId();
if(location == null) return false;
-
- return JBossRuntimeManager.isValidESBServer(location.toOSString(), runtimeType);
+ IJBossServerRuntime jbossRuntime = (IJBossServerRuntime)((IRuntime)element).loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
+
+ return JBossRuntimeManager.isValidESBServer(location.toOSString(), runtimeType, jbossRuntime.getJBossConfiguration());
}
return true;
}
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19065 - trunk/vpe/features/org.jboss.tools.xulrunner.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-12-05 03:43:49 -0500 (Sat, 05 Dec 2009)
New Revision: 19065
Modified:
trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4523 Visual Page Editor doesn't work with Eclipse 3.5 OSX Cocoa
cocoa plug-in is back into feature
Modified: trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml
===================================================================
--- trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2009-12-04 19:51:44 UTC (rev 19064)
+++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2009-12-05 08:43:49 UTC (rev 19065)
@@ -32,10 +32,18 @@
<plugin
id="org.mozilla.xulrunner.carbon.macosx"
os="macosx"
- ws="carbon,cocoa"
+ ws="carbon"
download-size="0"
install-size="0"
version="0.0.0"/>
+
+ <plugin
+ id="org.mozilla.xulrunner.cocoa.macosx"
+ os="macosx"
+ ws="cocoa"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
<plugin
id="org.mozilla.xulrunner.gtk.linux.x86"
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19064 - trunk/documentation/jboss-tools-docs.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-12-04 14:51:44 -0500 (Fri, 04 Dec 2009)
New Revision: 19064
Modified:
trunk/documentation/jboss-tools-docs/settings.xml
Log:
fix for documentation nightly build on hudson
Modified: trunk/documentation/jboss-tools-docs/settings.xml
===================================================================
--- trunk/documentation/jboss-tools-docs/settings.xml 2009-12-04 19:23:16 UTC (rev 19063)
+++ trunk/documentation/jboss-tools-docs/settings.xml 2009-12-04 19:51:44 UTC (rev 19064)
@@ -18,6 +18,11 @@
<id>jboss</id>
<repositories>
<repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/1</url>
+ <layout>legacy</layout>
+ </repository>
+ <repository>
<releases>
<enabled>true</enabled>
</releases>
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19063 - in trunk/bpel/plugins: org.eclipse.bpel.apache.ode.deploy.model/META-INF and 17 other directories.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2009-12-04 14:23:16 -0500 (Fri, 04 Dec 2009)
New Revision: 19063
Added:
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.properties
trunk/bpel/plugins/org.eclipse.bpel.common.ui/plugin.properties
trunk/bpel/plugins/org.eclipse.bpel.validator/plugin.properties
trunk/bpel/plugins/org.eclipse.bpel.xpath10/plugin.properties
Modified:
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/plugin.properties
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.common.ui/build.properties
trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.model/build.properties
trunk/bpel/plugins/org.eclipse.bpel.model/plugin.properties
trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.ui/build.properties
trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.properties
trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.validator/build.properties
trunk/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.wsil.model/plugin.properties
trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.xpath10/build.properties
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.properties
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties
Log:
JBIDE-5375: Fix the forking license files and provider name in the forked up BPEL plugins
https://jira.jboss.org/jira/browse/JBIDE-5375
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: ODE Deploy Descriptor EMF Model
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.model; singleton:=true
Bundle-Version: 0.4.0.qualifier
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.bpel.apache.ode.deploy.model.dd,
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/plugin.properties 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/plugin.properties 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,4 +1,14 @@
-
+###############################################################################
+# Copyright (c) 2009 JBoss by Red Hat and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+# JBoss by Red Hat - subsequent contributions and maintenance
+###############################################################################
# <copyright>
# </copyright>
#
@@ -16,5 +26,5 @@
# %%% END OF TRANSLATED PROPERTIES %%%
# ====================================================================
-pluginName = OdeDeploymentDescriptor Model
-providerName = www.example.org
+pluginName = ODE Deploy Descriptor EMF Model
+providerName = JBoss by Red Hat
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: ODE Deploy Descriptor UI Plug-in
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.ui; singleton:=true
Bundle-Version: 0.4.0.qualifier
Bundle-Activator: org.eclipse.bpel.apache.ode.deploy.ui.Activator
@@ -23,5 +23,5 @@
org.eclipse.jdt.core;bundle-version="3.5.0",
org.eclipse.wst.common.modulecore;bundle-version="1.1.300"
Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Added: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.properties (rev 0)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.properties 2009-12-04 19:23:16 UTC (rev 19063)
@@ -0,0 +1,30 @@
+###############################################################################
+# Copyright (c) 2009 JBoss by Red Hat and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+# JBoss by Red Hat - subsequent contributions and maintenance
+###############################################################################
+# <copyright>
+# </copyright>
+#
+# $Id: plugin.properties,v 1.1 2008/08/12 17:27:58 smoser Exp $
+
+# ====================================================================
+# To code developer:
+# Do NOT change the properties between this line and the
+# "%%% END OF TRANSLATED PROPERTIES %%%" line.
+# Make a new property name, append to the end of the file and change
+# the code to use the new property.
+# ====================================================================
+
+# ====================================================================
+# %%% END OF TRANSLATED PROPERTIES %%%
+# ====================================================================
+
+pluginName = ODE Deploy Descriptor UI Plug-in
+providerName = JBoss by Red Hat
Property changes on: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Common UI (Incubation)
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.common.ui; singleton:=true
-Bundle-Version: 0.5.0
+Bundle-Version: 0.5.0.qualifier
Bundle-Activator: org.eclipse.bpel.common.ui.CommonUIPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
@@ -30,4 +30,4 @@
org.eclipse.bpel.common.ui.palette,
org.eclipse.bpel.common.ui.tray
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: eclipse.org
+Bundle-Vendor: %providerName
Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/build.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.common.ui/build.properties 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/build.properties 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,17 +1,19 @@
###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
+# Copyright (c) 2009 JBoss by Red Hat and others.
+# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-#
+#
# Contributors:
# IBM Corporation - initial API and implementation
+# JBoss by Red Hat - subsequent contributions and maintenance
###############################################################################
bin.includes = META-INF/,\
plugin.xml,\
schema/,\
- icons/
+ icons/,\
+ plugin.properties
src.includes = .classpath,\
.cvsignore,\
.project,\
@@ -20,7 +22,8 @@
icons/,\
plugin.xml,\
schema/,\
- src/
+ src/,\
+ plugin.properties
output.code.jar = bin/
jars.compile.order = bpel-ui.jar
source.. = src/
Added: trunk/bpel/plugins/org.eclipse.bpel.common.ui/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.common.ui/plugin.properties (rev 0)
+++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/plugin.properties 2009-12-04 19:23:16 UTC (rev 19063)
@@ -0,0 +1,31 @@
+###############################################################################
+# Copyright (c) 2009 JBoss by Red Hat, and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+# JBoss by Red Hat - subsequent contributions and maintenance
+###############################################################################
+# <copyright>
+# </copyright>
+#
+# $Id: plugin.properties,v 1.1 2005/11/29 18:50:08 james Exp $
+
+# ====================================================================
+# To code developer:
+# Do NOT change the properties between this line and the
+# "%%% END OF TRANSLATED PROPERTIES %%%" line.
+# Make a new property name, append to the end of the file and change
+# the code to use the new property.
+# ====================================================================
+
+# ====================================================================
+# %%% END OF TRANSLATED PROPERTIES %%%
+# ====================================================================
+
+pluginName = Common UI (Incubation)
+providerName = JBoss by Red Hat
+
Property changes on: trunk/bpel/plugins/org.eclipse.bpel.common.ui/plugin.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: BPEL Model (Incubation)
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.model; singleton:=true
-Bundle-Version: 0.5.0
+Bundle-Version: 0.5.0.qualifier
Bundle-Activator: org.eclipse.bpel.model.BPELPlugin$Implementation
-Bundle-Vendor: eclipse.org
+Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
Modified: trunk/bpel/plugins/org.eclipse.bpel.model/build.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.model/build.properties 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.eclipse.bpel.model/build.properties 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,12 +1,13 @@
###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
+# Copyright (c) 2009 JBoss by Red Hat and others.
+# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-#
+#
# Contributors:
# IBM Corporation - initial API and implementation
+# JBoss by Red Hat - subsequent contributions and maintenance
###############################################################################
bin.includes = META-INF/,\
plugin.xml,\
Modified: trunk/bpel/plugins/org.eclipse.bpel.model/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.model/plugin.properties 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.eclipse.bpel.model/plugin.properties 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,12 +1,13 @@
###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
+# Copyright (c) 2009 JBoss by Red Hat and others.
+# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-#
+#
# Contributors:
# IBM Corporation - initial API and implementation
+# JBoss by Red Hat - subsequent contributions and maintenance
###############################################################################
# <copyright>
# </copyright>
@@ -26,6 +27,6 @@
# ====================================================================
-pluginName = BPEL Model
-providerName = Eclipse.org
+pluginName = BPEL Model (Incubation)
+providerName = JBoss by Red Hat
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: BPEL Editor (Incubation)
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.ui; singleton:=true
-Bundle-Version: 0.5.0
+Bundle-Version: 0.5.0.qualifier
Bundle-Activator: org.eclipse.bpel.ui.BPELUIPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/build.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/build.properties 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/build.properties 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,12 +1,13 @@
###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
+# Copyright (c) 2009 JBoss by Red Hat and others.
+# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-#
+#
# Contributors:
# IBM Corporation - initial API and implementation
+# JBoss by Red Hat - subsequent contributions and maintenance
###############################################################################
bin.includes = META-INF/,\
plugin.xml,\
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.properties 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.properties 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,12 +1,13 @@
###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
+# Copyright (c) 2009 JBoss by Red Hat and others.
+# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-#
+#
# Contributors:
# IBM Corporation - initial API and implementation
+# JBoss by Red Hat - subsequent contributions and maintenance
###############################################################################
PLUGIN_NAME=BPEL Editor
BPEL_EDITOR_NAME=Business Process Editor
@@ -53,5 +54,5 @@
# ====================================================================
-pluginName = Uiextensionmodel Model
-providerName = www.example.org
+pluginName = BPEL Editor (Incubation)
+providerName = JBoss by Red Hat
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Validator Plug-in (Incubation)
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.validator;singleton:=true
Bundle-Version: 0.4.0.qualifier
Bundle-Activator: org.eclipse.bpel.validator.Activator
-Bundle-Vendor: Eclipse
+Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)",
org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/build.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/build.properties 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/build.properties 2009-12-04 19:23:16 UTC (rev 19063)
@@ -6,7 +6,8 @@
intro/,\
schema/,\
.,\
- src-exclude.xsl
+ src-exclude.xsl,\
+ plugin.properties
jars.compile.order = code.jar,\
bpel-validator.jar
src.includes = .classpath,\
@@ -26,7 +27,8 @@
schema/,\
meta/,\
src-exclude.xsl,\
- customBuildCallbacks.xml
+ customBuildCallbacks.xml,\
+ plugin.properties
output.code.jar = bin/
source.bpel-validator.jar = src/,\
meta/
Added: trunk/bpel/plugins/org.eclipse.bpel.validator/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/plugin.properties (rev 0)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/plugin.properties 2009-12-04 19:23:16 UTC (rev 19063)
@@ -0,0 +1,32 @@
+###############################################################################
+# Copyright (c) 2009 JBoss by Red Hat and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+# JBoss by Red Hat - subsequent contributions and maintenance
+###############################################################################
+# <copyright>
+# </copyright>
+#
+# $Id: plugin.properties,v 1.1 2005/11/29 18:50:28 james Exp $
+
+# ====================================================================
+# To code developer:
+# Do NOT change the properties between this line and the
+# "%%% END OF TRANSLATED PROPERTIES %%%" line.
+# Make a new property name, append to the end of the file and change
+# the code to use the new property.
+# ====================================================================
+
+# ====================================================================
+# %%% END OF TRANSLATED PROPERTIES %%%
+# ====================================================================
+
+
+pluginName = Validator Plug-in (Incubation)
+providerName = JBoss by Red Hat
+
Property changes on: trunk/bpel/plugins/org.eclipse.bpel.validator/plugin.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: WSIL Model (Incubation)
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.wsil.model; singleton:=true
-Bundle-Version: 0.5.0
+Bundle-Version: 0.5.0.qualifier
Bundle-ClassPath: wsli-model.jar
-Bundle-Vendor: eclispe.org
+Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.bpel.wsil.model.inspection;uses:="org.eclipse.emf.ecore.util,org.eclipse.emf.ecore,org.eclipse.emf.common.util",
org.eclipse.bpel.wsil.model.inspection.impl;
Modified: trunk/bpel/plugins/org.eclipse.bpel.wsil.model/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.wsil.model/plugin.properties 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.eclipse.bpel.wsil.model/plugin.properties 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,3 +1,14 @@
+###############################################################################
+# Copyright (c) 2009 JBoss by Red Hat and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+# JBoss by Red Hat - subsequent contributions and maintenance
+###############################################################################
# <copyright>
# </copyright>
#
@@ -15,6 +26,6 @@
# %%% END OF TRANSLATED PROPERTIES %%%
# ====================================================================
-pluginName = Wsil Model
-providerName = www.example.org
+pluginName = WSIL Model (Incubation)
+providerName = JBoss by Red Hat
Modified: trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,8 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: XPath Parser 1.0 (Incubation)
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.xpath10
Bundle-Version: 0.4.0.qualifier
+Bundle-Localization: plugin
Bundle-ClassPath: .,
lib/antlr-runtime-3.0.1.jar
Export-Package: org.antlr.runtime;uses:="org.antlr.runtime.tree",
@@ -11,5 +12,5 @@
org.antlr.runtime.tree;uses:="org.antlr.runtime,org.antlr.stringtemplate",
org.eclipse.bpel.xpath10,
org.eclipse.bpel.xpath10.parser;uses:="org.antlr.runtime.tree,org.antlr.runtime,org.eclipse.bpel.xpath10"
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/bpel/plugins/org.eclipse.bpel.xpath10/build.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.xpath10/build.properties 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.eclipse.bpel.xpath10/build.properties 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,10 +1,12 @@
bin.includes = META-INF/,\
lib/,\
- .
+ .,\
+ plugin.properties
src.includes = .classpath,\
.project,\
META-INF/,\
build.properties,\
lib/,\
- src/
+ src/,\
+ plugin.properties
source.. = src/
Added: trunk/bpel/plugins/org.eclipse.bpel.xpath10/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.xpath10/plugin.properties (rev 0)
+++ trunk/bpel/plugins/org.eclipse.bpel.xpath10/plugin.properties 2009-12-04 19:23:16 UTC (rev 19063)
@@ -0,0 +1,32 @@
+###############################################################################
+# Copyright (c) 2009 JBoss by Red Hat and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+# JBoss by Red Hat - subsequent contributions and maintenance
+###############################################################################
+# <copyright>
+# </copyright>
+#
+# $Id: plugin.properties,v 1.1 2005/11/29 18:50:28 james Exp $
+
+# ====================================================================
+# To code developer:
+# Do NOT change the properties between this line and the
+# "%%% END OF TRANSLATED PROPERTIES %%%" line.
+# Make a new property name, append to the end of the file and change
+# the code to use the new property.
+# ====================================================================
+
+# ====================================================================
+# %%% END OF TRANSLATED PROPERTIES %%%
+# ====================================================================
+
+
+pluginName = XPath Parser 1.0 (Incubation)
+providerName = JBoss by Red Hat
+
Property changes on: trunk/bpel/plugins/org.eclipse.bpel.xpath10/plugin.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF 2009-12-04 19:23:16 UTC (rev 19063)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.jboss.tools.bpel.cheatsheet;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.jboss.tools.bpel.cheatsheet.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.properties 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.properties 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,2 +1,12 @@
+###############################################################################
+# Copyright (c) 2009 JBoss by Red Hat and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# JBoss by Red Hat - Initial implementation.
+###############################################################################
pluginName=BPEL Cheatsheet
providerName=JBoss by Red Hat
\ No newline at end of file
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties 2009-12-04 17:26:03 UTC (rev 19062)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties 2009-12-04 19:23:16 UTC (rev 19063)
@@ -1,13 +1,16 @@
###############################################################################
-# Copyright (c) 2006 University College London.
+# Copyright (c) 2009 JBoss by Red Hat and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-#
+#
+# Contributors:
+# University College London - initial API and implementation
+# JBoss by Red Hat - subsequent contributions and maintenance
###############################################################################
pluginName = Eclipse BPEL Designer Runtimes
-providerName = University College London Software Systems Engineering
+providerName = JBoss by Red Hat
MODULE_TYPE_NAME=BPEL 2.0 Process
MODULE_TYPE_DESCRIPTION=Module representing a BPEL process
15 years, 1 month
- 1
- 0