JBoss Tools SVN: r34441 - branches/jbosstools-3.3.0.M3/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-08-31 13:35:29 -0400 (Wed, 31 Aug 2011)
New Revision: 34441
Modified:
branches/jbosstools-3.3.0.M3/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java
Log:
JBIDE-9515
EL code completion is broken
issue is fixed. commit to branch jbosstools-3.3.0.M3
Modified: branches/jbosstools-3.3.0.M3/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java
===================================================================
--- branches/jbosstools-3.3.0.M3/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2011-08-31 17:26:22 UTC (rev 34440)
+++ branches/jbosstools-3.3.0.M3/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2011-08-31 17:35:29 UTC (rev 34441)
@@ -349,6 +349,7 @@
if(!isFinal || onlyEqualNames) {
if(!name.equals(varName)) continue;
}
+ if(!name.startsWith(varName)) continue;
Variable v = new Variable(name, basename, file);
result.add(v);
}
12 years, 8 months
JBoss Tools SVN: r34440 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-08-31 13:26:22 -0400 (Wed, 31 Aug 2011)
New Revision: 34440
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java
Log:
JBIDE-9515
EL code completion is broken
issue is fixed. commit to trunk
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 2011-08-31 11:01:38 UTC (rev 34439)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2011-08-31 17:26:22 UTC (rev 34440)
@@ -349,6 +349,7 @@
if(!isFinal || onlyEqualNames) {
if(!name.equals(varName)) continue;
}
+ if(!name.startsWith(varName)) continue;
Variable v = new Variable(name, basename, file);
result.add(v);
}
12 years, 8 months
JBoss Tools SVN: r34439 - branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.egit.core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-31 07:01:38 -0400 (Wed, 31 Aug 2011)
New Revision: 34439
Modified:
branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.xml
Log:
JBIDE-9510 commenting out much of the unfinished behaviour as per max
Modified: branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.xml
===================================================================
--- branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.xml 2011-08-31 09:35:19 UTC (rev 34438)
+++ branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.xml 2011-08-31 11:01:38 UTC (rev 34439)
@@ -2,6 +2,14 @@
<?eclipse version="3.2"?>
<plugin>
<extension
+ point="org.eclipse.wst.server.core.moduleTypes">
+ <moduleType
+ id="jbt.egit"
+ name="Egit">
+ </moduleType>
+ </extension>
+ <!--
+ <extension
point="org.eclipse.wst.server.core.moduleFactories">
<moduleFactory
class="org.jboss.ide.eclipse.as.egit.core.module.GitProjectModuleFactoryDelegate"
@@ -14,13 +22,6 @@
</moduleFactory>
</extension>
<extension
- point="org.eclipse.wst.server.core.moduleTypes">
- <moduleType
- id="jbt.egit"
- name="Egit">
- </moduleType>
- </extension>
- <extension
point="org.jboss.ide.eclipse.as.core.publishMethod">
<publishMethod
class="org.jboss.ide.eclipse.as.egit.core.EgitPublishMethod"
@@ -29,5 +30,5 @@
serverTypes="org.jboss.ide.eclipse.as.systemCopyServer">
</publishMethod>
</extension>
-
+ -->
</plugin>
12 years, 8 months
JBoss Tools SVN: r34438 - in branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-31 05:35:19 -0400 (Wed, 31 Aug 2011)
New Revision: 34438
Added:
branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java
Removed:
branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java
Modified:
branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties
branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
/JBIDE-9609 - as7 server and runtime workflow failures. 3.3.0.m3
Added: branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java
===================================================================
--- branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java (rev 0)
+++ branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java 2011-08-31 09:35:19 UTC (rev 34438)
@@ -0,0 +1,130 @@
+package org.jboss.ide.eclipse.as.ui.wizards;
+
+import java.io.File;
+import java.text.MessageFormat;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Preferences;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
+import org.eclipse.wst.server.core.TaskModel;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType;
+import org.jboss.ide.eclipse.as.ui.IPreferenceKeys;
+import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
+import org.jboss.ide.eclipse.as.ui.Messages;
+
+public class JBoss7RuntimeWizardFragment extends JBossRuntimeWizardFragment {
+
+ @Override
+ public boolean hasComposite() {
+ return true;
+ }
+
+ @Override
+ protected void updateModels() {
+ updateJREs();
+ }
+
+ @Override
+ protected void createWidgets(Composite main) {
+ createExplanation(main);
+ createNameComposite(main);
+ createHomeComposite(main);
+ createJREComposite(main);
+ }
+
+ protected void fillWidgets() {
+ IRuntime rt = (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
+
+ if (rt != null) {
+ try {
+ fillNameWidgets(rt);
+ fillHomeDir(rt);
+ fillJREWidgets(rt);
+ } catch (Exception e) {
+ IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, MessageFormat.format(Messages.JBoss7ServerWizardFragment_could_not_create_ui, rt.getName()), e);
+ JBossServerUIPlugin.getDefault().getLog().log(status);
+ }
+ }
+ }
+
+ @Override
+ protected void updatePage() {
+ int sel = jreCombo.getSelectionIndex();
+ int offset = -1;
+ if( sel + offset >= 0 )
+ selectedVM = installedJREs.get(sel + offset);
+ else // if sel < 0 or sel == 0 and offset == -1
+ selectedVM = null;
+ updateErrorMessage();
+ }
+
+ protected String getErrorString() {
+ if (nameText == null)
+ // not yet initialized. no errors
+ return null;
+
+ if (getRuntime(name) != null)
+ return Messages.rwf_NameInUse;
+
+ if (!isHomeValid())
+ return NLS.bind(Messages.rwf_homeMissingFiles, getSystemJarPath());
+
+ if (name == null || name.equals("")) //$NON-NLS-1$
+ return Messages.rwf_nameTextBlank;
+
+ return null;
+ }
+
+ @Override
+ protected boolean isHomeValid() {
+ if (homeDir == null || homeDir.length() == 0 || !(new File(homeDir).exists()))
+ return false;
+ return standaloneScriptExists();
+ }
+
+ private boolean standaloneScriptExists() {
+ String standaloneScriptPath = new StringBuilder(homeDir)
+ .append(File.separator)
+ .append("bin") //$NON-NLS-1$
+ .append(File.separator)
+ .append("standalone.sh") //$NON-NLS-1$
+ .toString();
+ return new File(standaloneScriptPath).exists();
+ }
+ @Override
+ protected String getSystemJarPath() {
+ return JBossServerType.AS7.getSystemJarPath();
+ }
+
+ @Override
+ public void performFinish(IProgressMonitor monitor) throws CoreException {
+ IRuntime rt = (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
+ ((IRuntimeWorkingCopy) rt).setLocation(new Path(homeDir));
+ }
+
+ @Override
+ public void exit() {
+ IRuntime r = (IRuntime) getTaskModel()
+ .getObject(TaskModel.TASK_RUNTIME);
+ IRuntimeWorkingCopy runtimeWC = r.isWorkingCopy() ? ((IRuntimeWorkingCopy) r)
+ : r.createWorkingCopy();
+
+ runtimeWC.setName(name);
+ runtimeWC.setLocation(new Path(homeDir));
+ IJBossServerRuntime srt = (IJBossServerRuntime) runtimeWC.loadAdapter(
+ IJBossServerRuntime.class, new NullProgressMonitor());
+ srt.setVM(selectedVM);
+
+ getTaskModel().putObject(TaskModel.TASK_RUNTIME, runtimeWC);
+ }
+}
Deleted: branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java
===================================================================
--- branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java 2011-08-31 09:33:10 UTC (rev 34437)
+++ branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java 2011-08-31 09:35:19 UTC (rev 34438)
@@ -1,130 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.wizards;
-
-import java.io.File;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.TaskModel;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
-import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType;
-import org.jboss.ide.eclipse.as.ui.IPreferenceKeys;
-import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
-import org.jboss.ide.eclipse.as.ui.Messages;
-
-public class JBoss7ServerWizardFragment extends JBossRuntimeWizardFragment {
-
- @Override
- public boolean hasComposite() {
- return true;
- }
-
- @Override
- protected void updateModels() {
- updateJREs();
- }
-
- @Override
- protected void createWidgets(Composite main) {
- createExplanation(main);
- createNameComposite(main);
- createHomeComposite(main);
- createJREComposite(main);
- }
-
- protected void fillWidgets() {
- IRuntime rt = (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
-
- if (rt != null) {
- try {
- fillNameWidgets(rt);
- fillHomeDir(rt);
- fillJREWidgets(rt);
- } catch (Exception e) {
- IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, MessageFormat.format(Messages.JBoss7ServerWizardFragment_could_not_create_ui, rt.getName()), e);
- JBossServerUIPlugin.getDefault().getLog().log(status);
- }
- }
- }
-
- @Override
- protected void updatePage() {
- int sel = jreCombo.getSelectionIndex();
- int offset = -1;
- if( sel + offset >= 0 )
- selectedVM = installedJREs.get(sel + offset);
- else // if sel < 0 or sel == 0 and offset == -1
- selectedVM = null;
- updateErrorMessage();
- }
-
- protected String getErrorString() {
- if (nameText == null)
- // not yet initialized. no errors
- return null;
-
- if (getRuntime(name) != null)
- return Messages.rwf_NameInUse;
-
- if (!isHomeValid())
- return NLS.bind(Messages.rwf_homeMissingFiles, getSystemJarPath());
-
- if (name == null || name.equals("")) //$NON-NLS-1$
- return Messages.rwf_nameTextBlank;
-
- return null;
- }
-
- @Override
- protected boolean isHomeValid() {
- if (homeDir == null || homeDir.length() == 0 || !(new File(homeDir).exists()))
- return false;
- return standaloneScriptExists();
- }
-
- private boolean standaloneScriptExists() {
- String standaloneScriptPath = new StringBuilder(homeDir)
- .append(File.separator)
- .append("bin") //$NON-NLS-1$
- .append(File.separator)
- .append("standalone.sh") //$NON-NLS-1$
- .toString();
- return new File(standaloneScriptPath).exists();
- }
- @Override
- protected String getSystemJarPath() {
- return JBossServerType.AS7.getSystemJarPath();
- }
-
- @Override
- public void performFinish(IProgressMonitor monitor) throws CoreException {
- IRuntime rt = (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
- ((IRuntimeWorkingCopy) rt).setLocation(new Path(homeDir));
- }
-
- @Override
- public void exit() {
- IRuntime r = (IRuntime) getTaskModel()
- .getObject(TaskModel.TASK_RUNTIME);
- IRuntimeWorkingCopy runtimeWC = r.isWorkingCopy() ? ((IRuntimeWorkingCopy) r)
- : r.createWorkingCopy();
-
- runtimeWC.setName(name);
- runtimeWC.setLocation(new Path(homeDir));
- IJBossServerRuntime srt = (IJBossServerRuntime) runtimeWC.loadAdapter(
- IJBossServerRuntime.class, new NullProgressMonitor());
- srt.setVM(selectedVM);
-
- getTaskModel().putObject(TaskModel.TASK_RUNTIME, runtimeWC);
- }
-}
Modified: branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties
===================================================================
--- branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties 2011-08-31 09:33:10 UTC (rev 34437)
+++ branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties 2011-08-31 09:35:19 UTC (rev 34438)
@@ -29,4 +29,5 @@
RuntimeTypesJBoss6OrLower=org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.60,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50
ServerTypesJBoss6OrLower=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50
ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70
-ServerTypesJBoss7=org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.60
\ No newline at end of file
+ServerTypesJBoss7=org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.60
+RuntimeTypesJBoss7=org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.eap.60
\ No newline at end of file
Modified: branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-08-31 09:33:10 UTC (rev 34437)
+++ branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-08-31 09:35:19 UTC (rev 34438)
@@ -34,14 +34,18 @@
typeIds="%RuntimeTypesJBoss6OrLower"
id="org.jboss.ide.eclipse.as.ui.JBossRuntimeWizardFragment"/>
<fragment
- class="org.jboss.ide.eclipse.as.ui.wizards.JBoss7ServerWizardFragment"
- id="org.jboss.ide.eclipse.as.ui.jboss7ServerWizardFragment"
- typeIds="%ServerTypesJBoss7"/>
- <fragment
class="org.jboss.ide.eclipse.as.ui.wizards.JBossServerWizardFragment"
id="org.jboss.ide.eclipse.as.ui.jbossServerWizardFragment"
typeIds="%ServerTypesJBoss6OrLower"/>
<fragment
+ class="org.jboss.ide.eclipse.as.ui.wizards.JBoss7RuntimeWizardFragment"
+ id="org.jboss.ide.eclipse.as.ui.jboss7RuntimeWizardFragment"
+ typeIds="%RuntimeTypesJBoss7"/>
+ <fragment
+ class="org.jboss.ide.eclipse.as.ui.wizards.JBossServerWizardFragment"
+ id="org.jboss.ide.eclipse.as.ui.jboss7ServerWizardFragment"
+ typeIds="%ServerTypesJBoss7"/>
+ <fragment
class="org.jboss.ide.eclipse.as.ui.wizards.StrippedServerWizardFragment"
id="org.jboss.ide.eclipse.as.ui.strippedServerWizardFragment"
typeIds="org.jboss.ide.eclipse.as.systemCopyServer"/>
12 years, 8 months
JBoss Tools SVN: r34437 - branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-31 05:33:10 -0400 (Wed, 31 Aug 2011)
New Revision: 34437
Modified:
branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF
Log:
/JBIDE-9607 - management service error, 3.3.0 m3
Modified: branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-08-31 09:26:48 UTC (rev 34436)
+++ branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-08-31 09:33:10 UTC (rev 34437)
@@ -7,6 +7,7 @@
Require-Bundle: org.jboss.ide.eclipse.as.core;bundle-version="2.3.0",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.wst.server.core;bundle-version="1.1.302"
+Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .,
jboss-as-controller-client-7.0.0.Final.jar,
12 years, 8 months
JBoss Tools SVN: r34436 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-31 05:26:48 -0400 (Wed, 31 Aug 2011)
New Revision: 34436
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-9609 - as7 ui workflow, JBIDE-9607 management poller failing, TRUNK
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-08-31 07:51:55 UTC (rev 34435)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-08-31 09:26:48 UTC (rev 34436)
@@ -7,6 +7,7 @@
Require-Bundle: org.jboss.ide.eclipse.as.core;bundle-version="2.3.0",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.wst.server.core;bundle-version="1.1.302"
+Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .,
jboss-as-controller-client-7.0.0.Final.jar,
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java (from rev 34380, trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java)
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java 2011-08-31 09:26:48 UTC (rev 34436)
@@ -0,0 +1,130 @@
+package org.jboss.ide.eclipse.as.ui.wizards;
+
+import java.io.File;
+import java.text.MessageFormat;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Preferences;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
+import org.eclipse.wst.server.core.TaskModel;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType;
+import org.jboss.ide.eclipse.as.ui.IPreferenceKeys;
+import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
+import org.jboss.ide.eclipse.as.ui.Messages;
+
+public class JBoss7RuntimeWizardFragment extends JBossRuntimeWizardFragment {
+
+ @Override
+ public boolean hasComposite() {
+ return true;
+ }
+
+ @Override
+ protected void updateModels() {
+ updateJREs();
+ }
+
+ @Override
+ protected void createWidgets(Composite main) {
+ createExplanation(main);
+ createNameComposite(main);
+ createHomeComposite(main);
+ createJREComposite(main);
+ }
+
+ protected void fillWidgets() {
+ IRuntime rt = (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
+
+ if (rt != null) {
+ try {
+ fillNameWidgets(rt);
+ fillHomeDir(rt);
+ fillJREWidgets(rt);
+ } catch (Exception e) {
+ IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, MessageFormat.format(Messages.JBoss7ServerWizardFragment_could_not_create_ui, rt.getName()), e);
+ JBossServerUIPlugin.getDefault().getLog().log(status);
+ }
+ }
+ }
+
+ @Override
+ protected void updatePage() {
+ int sel = jreCombo.getSelectionIndex();
+ int offset = -1;
+ if( sel + offset >= 0 )
+ selectedVM = installedJREs.get(sel + offset);
+ else // if sel < 0 or sel == 0 and offset == -1
+ selectedVM = null;
+ updateErrorMessage();
+ }
+
+ protected String getErrorString() {
+ if (nameText == null)
+ // not yet initialized. no errors
+ return null;
+
+ if (getRuntime(name) != null)
+ return Messages.rwf_NameInUse;
+
+ if (!isHomeValid())
+ return NLS.bind(Messages.rwf_homeMissingFiles, getSystemJarPath());
+
+ if (name == null || name.equals("")) //$NON-NLS-1$
+ return Messages.rwf_nameTextBlank;
+
+ return null;
+ }
+
+ @Override
+ protected boolean isHomeValid() {
+ if (homeDir == null || homeDir.length() == 0 || !(new File(homeDir).exists()))
+ return false;
+ return standaloneScriptExists();
+ }
+
+ private boolean standaloneScriptExists() {
+ String standaloneScriptPath = new StringBuilder(homeDir)
+ .append(File.separator)
+ .append("bin") //$NON-NLS-1$
+ .append(File.separator)
+ .append("standalone.sh") //$NON-NLS-1$
+ .toString();
+ return new File(standaloneScriptPath).exists();
+ }
+ @Override
+ protected String getSystemJarPath() {
+ return JBossServerType.AS7.getSystemJarPath();
+ }
+
+ @Override
+ public void performFinish(IProgressMonitor monitor) throws CoreException {
+ IRuntime rt = (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
+ ((IRuntimeWorkingCopy) rt).setLocation(new Path(homeDir));
+ }
+
+ @Override
+ public void exit() {
+ IRuntime r = (IRuntime) getTaskModel()
+ .getObject(TaskModel.TASK_RUNTIME);
+ IRuntimeWorkingCopy runtimeWC = r.isWorkingCopy() ? ((IRuntimeWorkingCopy) r)
+ : r.createWorkingCopy();
+
+ runtimeWC.setName(name);
+ runtimeWC.setLocation(new Path(homeDir));
+ IJBossServerRuntime srt = (IJBossServerRuntime) runtimeWC.loadAdapter(
+ IJBossServerRuntime.class, new NullProgressMonitor());
+ srt.setVM(selectedVM);
+
+ getTaskModel().putObject(TaskModel.TASK_RUNTIME, runtimeWC);
+ }
+}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java 2011-08-31 07:51:55 UTC (rev 34435)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java 2011-08-31 09:26:48 UTC (rev 34436)
@@ -1,130 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.wizards;
-
-import java.io.File;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.TaskModel;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
-import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType;
-import org.jboss.ide.eclipse.as.ui.IPreferenceKeys;
-import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
-import org.jboss.ide.eclipse.as.ui.Messages;
-
-public class JBoss7ServerWizardFragment extends JBossRuntimeWizardFragment {
-
- @Override
- public boolean hasComposite() {
- return true;
- }
-
- @Override
- protected void updateModels() {
- updateJREs();
- }
-
- @Override
- protected void createWidgets(Composite main) {
- createExplanation(main);
- createNameComposite(main);
- createHomeComposite(main);
- createJREComposite(main);
- }
-
- protected void fillWidgets() {
- IRuntime rt = (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
-
- if (rt != null) {
- try {
- fillNameWidgets(rt);
- fillHomeDir(rt);
- fillJREWidgets(rt);
- } catch (Exception e) {
- IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, MessageFormat.format(Messages.JBoss7ServerWizardFragment_could_not_create_ui, rt.getName()), e);
- JBossServerUIPlugin.getDefault().getLog().log(status);
- }
- }
- }
-
- @Override
- protected void updatePage() {
- int sel = jreCombo.getSelectionIndex();
- int offset = -1;
- if( sel + offset >= 0 )
- selectedVM = installedJREs.get(sel + offset);
- else // if sel < 0 or sel == 0 and offset == -1
- selectedVM = null;
- updateErrorMessage();
- }
-
- protected String getErrorString() {
- if (nameText == null)
- // not yet initialized. no errors
- return null;
-
- if (getRuntime(name) != null)
- return Messages.rwf_NameInUse;
-
- if (!isHomeValid())
- return NLS.bind(Messages.rwf_homeMissingFiles, getSystemJarPath());
-
- if (name == null || name.equals("")) //$NON-NLS-1$
- return Messages.rwf_nameTextBlank;
-
- return null;
- }
-
- @Override
- protected boolean isHomeValid() {
- if (homeDir == null || homeDir.length() == 0 || !(new File(homeDir).exists()))
- return false;
- return standaloneScriptExists();
- }
-
- private boolean standaloneScriptExists() {
- String standaloneScriptPath = new StringBuilder(homeDir)
- .append(File.separator)
- .append("bin") //$NON-NLS-1$
- .append(File.separator)
- .append("standalone.sh") //$NON-NLS-1$
- .toString();
- return new File(standaloneScriptPath).exists();
- }
- @Override
- protected String getSystemJarPath() {
- return JBossServerType.AS7.getSystemJarPath();
- }
-
- @Override
- public void performFinish(IProgressMonitor monitor) throws CoreException {
- IRuntime rt = (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
- ((IRuntimeWorkingCopy) rt).setLocation(new Path(homeDir));
- }
-
- @Override
- public void exit() {
- IRuntime r = (IRuntime) getTaskModel()
- .getObject(TaskModel.TASK_RUNTIME);
- IRuntimeWorkingCopy runtimeWC = r.isWorkingCopy() ? ((IRuntimeWorkingCopy) r)
- : r.createWorkingCopy();
-
- runtimeWC.setName(name);
- runtimeWC.setLocation(new Path(homeDir));
- IJBossServerRuntime srt = (IJBossServerRuntime) runtimeWC.loadAdapter(
- IJBossServerRuntime.class, new NullProgressMonitor());
- srt.setVM(selectedVM);
-
- getTaskModel().putObject(TaskModel.TASK_RUNTIME, runtimeWC);
- }
-}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties 2011-08-31 07:51:55 UTC (rev 34435)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties 2011-08-31 09:26:48 UTC (rev 34436)
@@ -29,4 +29,5 @@
RuntimeTypesJBoss6OrLower=org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.60,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50
ServerTypesJBoss6OrLower=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50
ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70
-ServerTypesJBoss7=org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.60
\ No newline at end of file
+ServerTypesJBoss7=org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.60
+RuntimeTypesJBoss7=org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.eap.60
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-08-31 07:51:55 UTC (rev 34435)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-08-31 09:26:48 UTC (rev 34436)
@@ -34,14 +34,18 @@
typeIds="%RuntimeTypesJBoss6OrLower"
id="org.jboss.ide.eclipse.as.ui.JBossRuntimeWizardFragment"/>
<fragment
- class="org.jboss.ide.eclipse.as.ui.wizards.JBoss7ServerWizardFragment"
- id="org.jboss.ide.eclipse.as.ui.jboss7ServerWizardFragment"
- typeIds="%ServerTypesJBoss7"/>
- <fragment
class="org.jboss.ide.eclipse.as.ui.wizards.JBossServerWizardFragment"
id="org.jboss.ide.eclipse.as.ui.jbossServerWizardFragment"
typeIds="%ServerTypesJBoss6OrLower"/>
<fragment
+ class="org.jboss.ide.eclipse.as.ui.wizards.JBoss7RuntimeWizardFragment"
+ id="org.jboss.ide.eclipse.as.ui.jboss7RuntimeWizardFragment"
+ typeIds="%RuntimeTypesJBoss7"/>
+ <fragment
+ class="org.jboss.ide.eclipse.as.ui.wizards.JBossServerWizardFragment"
+ id="org.jboss.ide.eclipse.as.ui.jboss7ServerWizardFragment"
+ typeIds="%ServerTypesJBoss7"/>
+ <fragment
class="org.jboss.ide.eclipse.as.ui.wizards.StrippedServerWizardFragment"
id="org.jboss.ide.eclipse.as.ui.strippedServerWizardFragment"
typeIds="org.jboss.ide.eclipse.as.systemCopyServer"/>
12 years, 8 months
JBoss Tools SVN: r34434 - trunk/build/aggregate/bottests-site/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-31 03:51:55 -0400 (Wed, 31 Aug 2011)
New Revision: 34434
Modified:
trunk/build/aggregate/bottests-site/site/.gitignore
Log:
.gitignore file
Modified: trunk/build/aggregate/bottests-site/site/.gitignore
===================================================================
--- trunk/build/aggregate/bottests-site/site/.gitignore 2011-08-31 07:38:51 UTC (rev 34433)
+++ trunk/build/aggregate/bottests-site/site/.gitignore 2011-08-31 07:51:55 UTC (rev 34434)
@@ -2,3 +2,4 @@
.project
target/
.classpath
+zips/
12 years, 8 months
JBoss Tools SVN: r34435 - branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-31 03:51:55 -0400 (Wed, 31 Aug 2011)
New Revision: 34435
Modified:
branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/.gitignore
Log:
.gitignore file
Modified: branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/.gitignore
===================================================================
--- branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/.gitignore 2011-08-31 07:51:55 UTC (rev 34434)
+++ branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/.gitignore 2011-08-31 07:51:55 UTC (rev 34435)
@@ -2,3 +2,4 @@
.project
target/
.classpath
+zips/
12 years, 8 months
JBoss Tools SVN: r34433 - branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-31 03:38:51 -0400 (Wed, 31 Aug 2011)
New Revision: 34433
Modified:
branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/build.xml
Log:
one extra level of nesting here - add '../' accordingly (JBIDE-8734)
Modified: branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/build.xml
===================================================================
--- branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/build.xml 2011-08-31 07:35:27 UTC (rev 34432)
+++ branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/build.xml 2011-08-31 07:38:51 UTC (rev 34433)
@@ -19,11 +19,11 @@
<condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml">
<available file="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml" type="file" />
</condition>
- <condition property="build.xml" value="${basedir}/../../build/build.xml">
- <available file="${basedir}/../../build/build.xml" type="file" />
+ <condition property="build.xml" value="${basedir}/../../../build/build.xml">
+ <available file="${basedir}/../../../build/build.xml" type="file" />
</condition>
- <condition property="build.xml" value="${basedir}/../../build.xml">
- <available file="${basedir}/../../build.xml" type="file" />
+ <condition property="build.xml" value="${basedir}/../../../build.xml">
+ <available file="${basedir}/../../../build.xml" type="file" />
</condition>
<!-- if can't calculate where build/build.xml is located, must pass in path from parent when calling this script -->
12 years, 8 months
JBoss Tools SVN: r34432 - trunk/build/aggregate/bottests-site/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-31 03:35:27 -0400 (Wed, 31 Aug 2011)
New Revision: 34432
Modified:
trunk/build/aggregate/bottests-site/site/build.xml
Log:
one extra level of nesting here - add '../' accordingly (JBIDE-8734)
Modified: trunk/build/aggregate/bottests-site/site/build.xml
===================================================================
--- trunk/build/aggregate/bottests-site/site/build.xml 2011-08-31 06:52:38 UTC (rev 34431)
+++ trunk/build/aggregate/bottests-site/site/build.xml 2011-08-31 07:35:27 UTC (rev 34432)
@@ -19,11 +19,11 @@
<condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml">
<available file="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml" type="file" />
</condition>
- <condition property="build.xml" value="${basedir}/../../build/build.xml">
- <available file="${basedir}/../../build/build.xml" type="file" />
+ <condition property="build.xml" value="${basedir}/../../../build/build.xml">
+ <available file="${basedir}/../../../build/build.xml" type="file" />
</condition>
- <condition property="build.xml" value="${basedir}/../../build.xml">
- <available file="${basedir}/../../build.xml" type="file" />
+ <condition property="build.xml" value="${basedir}/../../../build.xml">
+ <available file="${basedir}/../../../build.xml" type="file" />
</condition>
<!-- if can't calculate where build/build.xml is located, must pass in path from parent when calling this script -->
12 years, 8 months