JBoss Tools SVN: r31001 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-02 15:03:27 -0400 (Mon, 02 May 2011)
New Revision: 31001
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/XMLNodeReference.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
Log:
JBIDE-8832
https://issues.jboss.org/browse/JBIDE-8832
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-05-02 18:49:41 UTC (rev 31000)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-05-02 19:03:27 UTC (rev 31001)
@@ -869,7 +869,7 @@
* @param range
* @return
*/
- public static ITextSourceReference convertToSourceReference(final ISourceRange range) {
+ public static ITextSourceReference convertToSourceReference(final ISourceRange range, final IResource resource) {
return new ITextSourceReference() {
public int getStartPosition() {
@@ -879,6 +879,10 @@
public int getLength() {
return range.getLength();
}
+
+ public IResource getResource() {
+ return resource;
+ }
};
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java 2011-05-02 18:49:41 UTC (rev 31000)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java 2011-05-02 19:03:27 UTC (rev 31001)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
+import org.eclipse.core.resources.IResource;
import org.jboss.tools.cdi.core.ITypeDeclaration;
/**
@@ -49,4 +50,8 @@
public int getStartPosition() {
return startPosition;
}
+
+ public IResource getResource() {
+ return type.getResource();
+ }
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2011-05-02 18:49:41 UTC (rev 31000)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2011-05-02 19:03:27 UTC (rev 31001)
@@ -16,6 +16,7 @@
import java.util.List;
import java.util.Set;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.IMethod;
@@ -127,6 +128,7 @@
v.setValue(params[i]);
v.valueStartPosition = start + pi;
v.valueLength = p.length();
+ v.setResource((IFile)resource);
pd.setPosition(v);
String[] tokens = getParamTokens(p);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/XMLNodeReference.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/XMLNodeReference.java 2011-05-02 18:49:41 UTC (rev 31000)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/XMLNodeReference.java 2011-05-02 19:03:27 UTC (rev 31001)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl.definition;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.PositionHolder;
import org.jboss.tools.common.text.INodeReference;
@@ -58,4 +60,8 @@
return object;
}
+ public IFile getResource() {
+ return (IFile)object.getAdapter(IFile.class);
+ }
+
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java 2011-05-02 18:49:41 UTC (rev 31000)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java 2011-05-02 19:03:27 UTC (rev 31001)
@@ -187,7 +187,7 @@
void validateRetentionAnnotation(ICDIAnnotation type, String message, IResource resource) throws JavaModelException {
IAnnotationDeclaration retention = type.getAnnotationDeclaration(CDIConstants.RETENTION_ANNOTATION_TYPE_NAME);
if(retention == null) {
- validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, CDIUtil.convertToSourceReference(type.getSourceType().getNameRange()), resource);
+ validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, CDIUtil.convertToSourceReference(type.getSourceType().getNameRange(), resource), resource);
} else {
boolean ok = false;
Object o = retention.getMemberValue(null);
@@ -220,7 +220,7 @@
private void validateTargetAnnotation(ICDIAnnotation annotationType, String[][] variants, String message, IResource resource) throws JavaModelException {
IAnnotationDeclaration target = annotationType.getAnnotationDeclaration(CDIConstants.TARGET_ANNOTATION_TYPE_NAME);
if(target==null) {
- validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, CDIUtil.convertToSourceReference(annotationType.getSourceType().getNameRange()), resource);
+ validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, CDIUtil.convertToSourceReference(annotationType.getSourceType().getNameRange(), resource), resource);
} else if(!CDIUtil.checkTargetAnnotation(target, variants)) {
validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, target, resource);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-05-02 18:49:41 UTC (rev 31000)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-05-02 19:03:27 UTC (rev 31001)
@@ -626,14 +626,14 @@
try {
if(hasConflictedInterceptorBindings(bean)) {
//TODO consider putting markers to interceptor bindings/stereotype declarations.
- ITextSourceReference reference = CDIUtil.convertToSourceReference(bean.getBeanClass().getNameRange());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(bean.getBeanClass().getNameRange(), bean.getResource());
addError(CDIValidationMessages.CONFLICTING_INTERCEPTOR_BINDINGS, CDIPreferences.CONFLICTING_INTERCEPTOR_BINDINGS, reference, bean.getResource());
}
Set<IBeanMethod> methods = bean.getAllMethods();
for (IBeanMethod method : methods) {
if(hasConflictedInterceptorBindings(method)) {
//TODO consider putting markers to interceptor bindings/stereotype declarations.
- ITextSourceReference reference = CDIUtil.convertToSourceReference(method.getMethod().getNameRange());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(method.getMethod().getNameRange(), bean.getResource());
addError(CDIValidationMessages.CONFLICTING_INTERCEPTOR_BINDINGS, CDIPreferences.CONFLICTING_INTERCEPTOR_BINDINGS, reference, bean.getResource());
}
}
@@ -1625,7 +1625,7 @@
IField[] fields = type.getFields();
for (IField field : fields) {
if (Flags.isPublic(field.getFlags()) && !Flags.isStatic(field.getFlags())) {
- ITextSourceReference fieldReference = CDIUtil.convertToSourceReference(field.getNameRange());
+ ITextSourceReference fieldReference = CDIUtil.convertToSourceReference(field.getNameRange(), bean.getResource());
addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_PUBLIC_FIELD, CDIPreferences.ILLEGAL_SCOPE_FOR_MANAGED_BEAN,
fieldReference, bean.getResource(), ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_PUBLIC_FIELD_ID);
}
@@ -1693,14 +1693,14 @@
Set<IInterceptorBinding> bindings = bean.getInterceptorBindings();
if(!bindings.isEmpty()) {
if(Flags.isFinal(bean.getBeanClass().getFlags())) {
- ITextSourceReference reference = CDIUtil.convertToSourceReference(bean.getBeanClass().getNameRange());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(bean.getBeanClass().getNameRange(), bean.getResource());
addError(CDIValidationMessages.ILLEGAL_INTERCEPTOR_BINDING_CLASS, CDIPreferences.ILLEGAL_INTERCEPTOR_BINDING_METHOD, reference, bean.getResource());
} else {
IMethod[] methods = bean.getBeanClass().getMethods();
for (int i = 0; i < methods.length; i++) {
int flags = methods[i].getFlags();
if(Flags.isFinal(flags) && !Flags.isStatic(flags) && !Flags.isPrivate(flags)) {
- ITextSourceReference reference = CDIUtil.convertToSourceReference(methods[i].getNameRange());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(methods[i].getNameRange(), bean.getResource());
addError(CDIValidationMessages.ILLEGAL_INTERCEPTOR_BINDING_METHOD, CDIPreferences.ILLEGAL_INTERCEPTOR_BINDING_METHOD, reference, bean.getResource());
}
}
@@ -1710,13 +1710,13 @@
for (IBeanMethod method : beanMethods) {
if(!method.getInterceptorBindings().isEmpty()) {
if(Flags.isFinal(bean.getBeanClass().getFlags())) {
- ITextSourceReference reference = CDIUtil.convertToSourceReference(bean.getBeanClass().getNameRange());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(bean.getBeanClass().getNameRange(), bean.getResource());
addError(CDIValidationMessages.ILLEGAL_INTERCEPTOR_BINDING_CLASS, CDIPreferences.ILLEGAL_INTERCEPTOR_BINDING_METHOD, reference, bean.getResource());
} else {
IMethod sourceMethod = method.getMethod();
int flags = sourceMethod.getFlags();
if(Flags.isFinal(flags) && !Flags.isStatic(flags) && !Flags.isPrivate(flags)) {
- ITextSourceReference reference = CDIUtil.convertToSourceReference(sourceMethod.getNameRange());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(sourceMethod.getNameRange(), bean.getResource());
addError(CDIValidationMessages.ILLEGAL_INTERCEPTOR_BINDING_METHOD, CDIPreferences.ILLEGAL_INTERCEPTOR_BINDING_METHOD, reference, bean.getResource());
}
}
@@ -1743,7 +1743,7 @@
}
}
if(!passivatingCapable) {
- ITextSourceReference reference = CDIUtil.convertToSourceReference(bean.getBeanClass().getNameRange());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(bean.getBeanClass().getNameRange(), bean.getResource());
addError(MessageFormat.format(CDIValidationMessages.NOT_PASSIVATION_CAPABLE_BEAN, bean.getSimpleJavaName(), scope.getSourceType().getElementName()), CDIPreferences.NOT_PASSIVATION_CAPABLE_BEAN, reference, bean.getResource(), NOT_PASSIVATION_CAPABLE_BEAN_ID);
}
}
@@ -2242,7 +2242,7 @@
int kind = Signature.getTypeSignatureKind(returnTypeSignature);
if(kind == Signature.ARRAY_TYPE_SIGNATURE) {
if(!annotation.getNonBindingMethods().contains(method)) {
- ITextSourceReference reference = CDIUtil.convertToSourceReference(method.getNameRange());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(method.getNameRange(), annotation.getResource());
addError(arrayMessageErrorKey, preferencesKey, reference, annotation.getResource());
}
} else if(kind == Signature.CLASS_TYPE_SIGNATURE) {
@@ -2257,7 +2257,7 @@
IType memberType = type.getJavaProject().findType(typeName);
if(memberType!=null && memberType.isAnnotation()) {
if(!annotation.getNonBindingMethods().contains(method)) {
- ITextSourceReference reference = CDIUtil.convertToSourceReference(method.getNameRange());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(method.getNameRange(), annotation.getResource());
addError(annotationValueErrorKey, preferencesKey, reference, annotation.getResource());
}
}
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r31000 - trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-05-02 14:49:41 -0400 (Mon, 02 May 2011)
New Revision: 31000
Modified:
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/CommandRecorder.java
Log:
initial support for prettyfaces
Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/CommandRecorder.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/CommandRecorder.java 2011-05-02 18:15:46 UTC (rev 30999)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/CommandRecorder.java 2011-05-02 18:49:41 UTC (rev 31000)
@@ -3,6 +3,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.ICompilationUnit;
@@ -85,6 +86,8 @@
return "entity";
} else if ("field".equals(candidateCommand)) {
return "field";
+ } else if ("prettyfaces".equals(candidateCommand)) {
+ return "prettyfaces";
} else {
return null;
}
@@ -94,11 +97,14 @@
IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
String projectName = currentPrompt.substring(1, currentPrompt.indexOf(']'));
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (CoreException e) {
- ForgePlugin.log(e);
+ if (project != null) {
+ try {
+ project.refreshLocal(IResource.DEPTH_INFINITE, null);
+ } catch (CoreException e) {
+ ForgePlugin.log(e);
+ }
}
if ("pwd".equals(currentCommand)) {
// do nothing
@@ -208,6 +214,30 @@
} catch (PartInitException e) {
ForgePlugin.log(e);
}
+ } else if ("prettyfaces".equals(currentCommand)) {
+ int index = beforePrompt.lastIndexOf("***SUCCESS*** Installed [com.ocpsoft.prettyfaces] successfully.");
+ if (index == -1) return;
+ String str = beforePrompt.substring(0, index - 1);
+ index = str.lastIndexOf("Wrote ");
+ if (index == -1) return;
+ if (index + 6 > str.length()) return;
+ str = str.substring(index + 6);
+ String projectLocation = project.getLocation().toString();
+ index = str.lastIndexOf(projectLocation);
+ if (index != 0) return;
+ str = str.substring(projectLocation.length());
+ IFile file = project.getFile(str);
+ if (file == null) return;
+ Object objectToSelect = file;
+ try {
+ IDE.openEditor(workbenchPage, file);
+ IViewPart packageExplorer = workbenchPage.showView("org.eclipse.jdt.ui.PackageExplorer");
+ if (packageExplorer instanceof ISetSelectionTarget) {
+ ((ISetSelectionTarget)packageExplorer).selectReveal(new StructuredSelection(objectToSelect));
+ }
+ } catch (PartInitException e) {
+ ForgePlugin.log(e);
+ }
} else {
}
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r30999 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal: v7 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-02 14:15:46 -0400 (Mon, 02 May 2011)
New Revision: 30999
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeClasspathUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeLaunchConfigBuilder.java
Log:
[JBIDE-8793] extracted methods to util class
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-05-02 18:10:44 UTC (rev 30998)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-05-02 18:15:46 UTC (rev 30999)
@@ -231,7 +231,7 @@
protected static IRuntimeClasspathEntry getRunJarRuntimeCPEntry(IServer server) throws CoreException {
if (server.getServerType().getId().endsWith("70")) { //$NON-NLS-1$
- return JBossRuntimeClasspathUtil.getRunJarRuntimeCPEntry(server);
+ return JBossRuntimeClasspathUtil.getModulesClasspathEntry(server);
} else {
IPath containerPath = new Path(RunJarContainerWrapper.ID).append(server.getName());
return JavaRuntime.newRuntimeContainerClasspathEntry(containerPath, IRuntimeClasspathEntry.USER_CLASSES);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeClasspathUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeClasspathUtil.java 2011-05-02 18:10:44 UTC (rev 30998)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeClasspathUtil.java 2011-05-02 18:15:46 UTC (rev 30999)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.v7;
import java.util.ArrayList;
@@ -19,16 +29,17 @@
public static List<String> getClasspath(IServer server, IVMInstall vmInstall) throws CoreException {
List<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>();
- classpath.add(getRunJarRuntimeCPEntry(server));
+ classpath.add(getModulesClasspathEntry(server));
AbstractJBossLaunchConfigType.addJREEntry(classpath, vmInstall);
List<String> runtimeClassPaths = AbstractJBossLaunchConfigType.convertClasspath(classpath);
return runtimeClassPaths;
}
- public static IRuntimeClasspathEntry getRunJarRuntimeCPEntry(IServer server) throws CoreException {
- IPath location = server.getRuntime().getLocation();
+ public static IRuntimeClasspathEntry getModulesClasspathEntry(IServer server) throws CoreException {
+ IPath runtimeLocation = server.getRuntime().getLocation();
+ IPath modulesLocation = runtimeLocation.append(JBOSS_MODULES_JAR);
IClasspathEntry entry =
- JavaRuntime.newArchiveRuntimeClasspathEntry(location.append(JBOSS_MODULES_JAR)).getClasspathEntry();
+ JavaRuntime.newArchiveRuntimeClasspathEntry(modulesLocation).getClasspathEntry();
return new RuntimeClasspathEntry(entry);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeLaunchConfigBuilder.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeLaunchConfigBuilder.java 2011-05-02 18:10:44 UTC (rev 30998)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeLaunchConfigBuilder.java 2011-05-02 18:15:46 UTC (rev 30999)
@@ -1,15 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.v7;
-import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.internal.launching.RuntimeClasspathEntry;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.wst.server.core.IRuntime;
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r30998 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal: v7 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-02 14:10:44 -0400 (Mon, 02 May 2011)
New Revision: 30998
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeClasspathUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeLaunchConfigBuilder.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
Log:
[JBIDE-8793] extracted methods to util class
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2011-05-02 16:43:50 UTC (rev 30997)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2011-05-02 18:10:44 UTC (rev 30998)
@@ -14,6 +14,7 @@
import java.io.FilenameFilter;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import org.eclipse.core.runtime.CoreException;
@@ -178,7 +179,7 @@
list.add(JavaRuntime.newArchiveRuntimeClasspathEntry(path));
}
- public static void addJREEntry(ArrayList<IRuntimeClasspathEntry> cp, IVMInstall vmInstall) {
+ public static void addJREEntry(List<IRuntimeClasspathEntry> cp, IVMInstall vmInstall) {
if (vmInstall != null) {
try {
cp.add(JavaRuntime.newRuntimeContainerClasspathEntry(
@@ -201,7 +202,7 @@
addCPEntry(cp, new Path(c2.getAbsolutePath()));
}
- public static ArrayList<String> convertClasspath(ArrayList<IRuntimeClasspathEntry> cp) {
+ public static ArrayList<String> convertClasspath(List<IRuntimeClasspathEntry> cp) {
Iterator<IRuntimeClasspathEntry> cpi = cp.iterator();
ArrayList<String> list = new ArrayList<String>();
while (cpi.hasNext()) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-05-02 16:43:50 UTC (rev 30997)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-05-02 18:10:44 UTC (rev 30998)
@@ -46,7 +46,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.IStartLaunchSetupParticipant;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.StartLaunchDelegate;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBossRuntimeClasspathUtil;
import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
import org.jboss.ide.eclipse.as.core.util.IConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
@@ -231,7 +231,7 @@
protected static IRuntimeClasspathEntry getRunJarRuntimeCPEntry(IServer server) throws CoreException {
if (server.getServerType().getId().endsWith("70")) { //$NON-NLS-1$
- return JBoss7ServerBehavior.getRunJarRuntimeCPEntry(server);
+ return JBossRuntimeClasspathUtil.getRunJarRuntimeCPEntry(server);
} else {
IPath containerPath = new Path(RunJarContainerWrapper.ID).append(server.getName());
return JavaRuntime.newRuntimeContainerClasspathEntry(containerPath, IRuntimeClasspathEntry.USER_CLASSES);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-05-02 16:43:50 UTC (rev 30997)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-05-02 18:10:44 UTC (rev 30998)
@@ -18,33 +18,24 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.internal.launching.RuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService;
-import org.jboss.ide.eclipse.as.core.server.internal.AbstractLocalJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
-import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractJBossLaunchConfigType;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
-import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
public class JBoss7ServerBehavior extends JBossServerBehavior {
- private static final String DEFAULT_CP_PROVIDER_ID = "org.jboss.ide.eclipse.as.core.server.internal.launch.serverClasspathProvider"; //$NON-NLS-1$
+ public static final String DEFAULT_CP_PROVIDER_ID = "org.jboss.ide.eclipse.as.core.server.internal.launch.serverClasspathProvider"; //$NON-NLS-1$
private IJBoss7ManagerService service;
@@ -77,46 +68,22 @@
return false;
}
- public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IProgressMonitor monitor)
+ public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy launchConfig, IProgressMonitor monitor)
throws CoreException {
- IRuntime rt = getServer().getRuntime();
- LocalJBoss7ServerRuntime runtime = (LocalJBoss7ServerRuntime)
- rt.loadAdapter(LocalJBoss7ServerRuntime.class, null);
-
- IPath p = rt.getLocation();
- IVMInstall vmInstall = runtime.getVM();
- if (vmInstall != null)
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, JavaRuntime
- .newJREContainerPath(vmInstall).toPortableString());
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, DEFAULT_CP_PROVIDER_ID);
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, getClasspath());
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, runtime.getDefaultRunArgs());
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, runtime.getDefaultRunVMArgs());
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME,
- IJBossRuntimeConstants.START7_MAIN_TYPE);
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY,
- p.append(IJBossRuntimeResourceConstants.BIN).toString());
- workingCopy.setAttribute(AbstractJBossLaunchConfigType.SERVER_ID, getServer().getId());
+ IServer server = getServer();
+ IRuntime runtime = server.getRuntime();
+ IJBossServerRuntime serverRuntime =
+ (IJBossServerRuntime) runtime.loadAdapter(LocalJBoss7ServerRuntime.class, null);
+ new JBossRuntimeLaunchConfigBuilder(launchConfig, serverRuntime)
+ .setVmContainer()
+ .setClassPath(server)
+ .setDefaultArguments()
+ .setMainType(IJBossRuntimeConstants.START7_MAIN_TYPE)
+ .setWorkingDirectory(runtime)
+ .setServerId(server);
}
- protected ArrayList<String> getClasspath() throws CoreException {
- AbstractLocalJBossServerRuntime jbrt = (AbstractLocalJBossServerRuntime) getServer().getRuntime().loadAdapter(
- AbstractLocalJBossServerRuntime.class, new NullProgressMonitor());
- ArrayList<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>();
- classpath.add(getRunJarRuntimeCPEntry(getServer()));
- AbstractJBossLaunchConfigType.addJREEntry(classpath, jbrt.getVM());
- ArrayList<String> runtimeClassPaths = AbstractJBossLaunchConfigType.convertClasspath(classpath);
- return runtimeClassPaths;
- }
- public static IRuntimeClasspathEntry getRunJarRuntimeCPEntry(IServer server) throws CoreException {
- IPath loc = server.getRuntime().getLocation();
- IClasspathEntry e = JavaRuntime.newArchiveRuntimeClasspathEntry(
- loc.append("jboss-modules.jar")).getClasspathEntry(); //$NON-NLS-1$
- return new RuntimeClasspathEntry(e);
- }
-
@Override
protected void publishModule(int kind, int deltaKind, IModule[] module, IProgressMonitor monitor)
throws CoreException {
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeClasspathUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeClasspathUtil.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeClasspathUtil.java 2011-05-02 18:10:44 UTC (rev 30998)
@@ -0,0 +1,35 @@
+package org.jboss.ide.eclipse.as.core.server.internal.v7;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.internal.launching.RuntimeClasspathEntry;
+import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractJBossLaunchConfigType;
+
+public class JBossRuntimeClasspathUtil {
+
+ private static final String JBOSS_MODULES_JAR = "jboss-modules.jar"; //$NON-NLS-1$
+
+ public static List<String> getClasspath(IServer server, IVMInstall vmInstall) throws CoreException {
+ List<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>();
+ classpath.add(getRunJarRuntimeCPEntry(server));
+ AbstractJBossLaunchConfigType.addJREEntry(classpath, vmInstall);
+ List<String> runtimeClassPaths = AbstractJBossLaunchConfigType.convertClasspath(classpath);
+ return runtimeClassPaths;
+ }
+
+ public static IRuntimeClasspathEntry getRunJarRuntimeCPEntry(IServer server) throws CoreException {
+ IPath location = server.getRuntime().getLocation();
+ IClasspathEntry entry =
+ JavaRuntime.newArchiveRuntimeClasspathEntry(location.append(JBOSS_MODULES_JAR)).getClasspathEntry();
+ return new RuntimeClasspathEntry(entry);
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeClasspathUtil.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeLaunchConfigBuilder.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeLaunchConfigBuilder.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeLaunchConfigBuilder.java 2011-05-02 18:10:44 UTC (rev 30998)
@@ -0,0 +1,76 @@
+package org.jboss.ide.eclipse.as.core.server.internal.v7;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.internal.launching.RuntimeClasspathEntry;
+import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
+import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractJBossLaunchConfigType;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
+
+public class JBossRuntimeLaunchConfigBuilder {
+
+ private ILaunchConfigurationWorkingCopy launchConfig;
+ private IJBossServerRuntime jbossRuntime;
+
+ public JBossRuntimeLaunchConfigBuilder(ILaunchConfigurationWorkingCopy launchConfig, IJBossServerRuntime runtime) {
+ this.launchConfig = launchConfig;
+ this.jbossRuntime = runtime;
+ }
+
+ public JBossRuntimeLaunchConfigBuilder setVmContainer() {
+ IVMInstall vmInstall = jbossRuntime.getVM();
+ if (vmInstall != null) {
+ launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH,
+ JavaRuntime.newJREContainerPath(vmInstall).toPortableString());
+ }
+ return this;
+ }
+
+ public JBossRuntimeLaunchConfigBuilder setDefaultArguments() {
+ launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,
+ jbossRuntime.getDefaultRunArgs());
+ launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,
+ jbossRuntime.getDefaultRunVMArgs());
+ return this;
+ }
+
+ public JBossRuntimeLaunchConfigBuilder setClassPath(IServer server) throws CoreException {
+ return setClassPath(JBossRuntimeClasspathUtil.getClasspath(server, jbossRuntime.getVM()));
+ }
+
+ public JBossRuntimeLaunchConfigBuilder setClassPath(List<String> entries) throws CoreException {
+ launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER,
+ JBoss7ServerBehavior.DEFAULT_CP_PROVIDER_ID);
+ launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, entries);
+ launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
+ return this;
+ }
+
+ public JBossRuntimeLaunchConfigBuilder setMainType(String mainType) {
+ launchConfig.setAttribute(
+ IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, mainType);
+ return this;
+ }
+
+ public JBossRuntimeLaunchConfigBuilder setWorkingDirectory(IRuntime runtime) {
+ IPath location = runtime.getLocation();
+ launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY,
+ location.append(IJBossRuntimeResourceConstants.BIN).toString());
+ return this;
+ }
+
+ public void setServerId(IServer server) {
+ launchConfig.setAttribute(AbstractJBossLaunchConfigType.SERVER_ID, server.getId());
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeLaunchConfigBuilder.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r30997 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-02 12:43:50 -0400 (Mon, 02 May 2011)
New Revision: 30997
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/messages.properties
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/messages_ja.properties
Log:
JBIDE-8821
https://issues.jboss.org/browse/JBIDE-8821
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/messages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/messages.properties 2011-05-02 13:58:01 UTC (rev 30996)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/messages.properties 2011-05-02 16:43:50 UTC (rev 30997)
@@ -24,8 +24,8 @@
PROJECT_ALREADY_EXISTS_IN_THE_WORKSPACE=Project {0} already exists in the workspace.
WEBDESCRIPTOR_FILE_IS_CORRUPTED=Web descriptor file is corrupted {0}.
SERVLET_VERSION_WARNING=Servlet version is not consistent with web.xml version.
-SERVLET_VERSION_ISNOT_CONSISTENT_WITH_WEBXML_VERSION=You have selected a different servlet version than in project''s web.xml file. Click Yes if you would like to convert the current web.xml file to servlet version {0}. Please note that during conversion you might lose some web.xml information that is not available in the new version as well as formatting or comments.
-SAVE_OLD_SERVLET=Do you want to save a copy of your current web.xml file? It will be saved as web.xml.{0}.old
+SERVLET_VERSION_ISNOT_CONSISTENT_WITH_WEBXML_VERSION=You have selected a different servlet version than in project''s web.xml file. Would you like to convert web.xml file to servlet version {0}. Please note that during conversion you might lose some web.xml information that is not available in the new version as well as formatting or comments.
+SAVE_OLD_SERVLET=Save a copy of current web.xml file as web.xml.{0}.old
RUNTIME_IS_REQUIRED=Runtime is required.
SPECIFIED_RUNTIME_DOESNOT_EXIST=Specified runtime does not exist.
SPECIFIED_FOLDER_DOESNOT_EXIST=Specified folder does not exist.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/messages_ja.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/messages_ja.properties 2011-05-02 13:58:01 UTC (rev 30996)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/messages_ja.properties 2011-05-02 16:43:50 UTC (rev 30997)
@@ -19,7 +19,7 @@
PROJECT_ALREADY_EXISTS_IN_THE_WORKSPACE=Project {0} already exists in the workspace.
WEBDESCRIPTOR_FILE_IS_CORRUPTED=Web descriptor file is corrupted {0}.
SERVLET_VERSION_WARNING=Servlet version is not consistent with web.xml version.
-SAVE_OLD_SERVLET=Do you want to save a copy of your current web.xml file? It will be saved as web.xml.{0}.old
+SAVE_OLD_SERVLET=Save a copy of current web.xml file as web.xml.{0}.old
RUNTIME_IS_REQUIRED=Runtime is required.
SPECIFIED_RUNTIME_DOESNOT_EXIST=Specified runtime does not exist.
SPECIFIED_FOLDER_DOESNOT_EXIST=\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A9\u30EB\u30C0\u30FC\u304C\u5B58\u5728\u3057\u307E\u305B\u3093.
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r30996 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui/editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-02 09:58:01 -0400 (Mon, 02 May 2011)
New Revision: 30996
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
[JBIDE-8611] disabled autodetect option for web port in as7 editor
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2011-05-02 12:50:27 UTC (rev 30995)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2011-05-02 13:58:01 UTC (rev 30996)
@@ -130,6 +130,17 @@
}
}
+ public static class JBoss7WebPortEditorExtension extends PortEditorExtension {
+ public JBoss7WebPortEditorExtension() {
+ super(Messages.EditorWebPort,
+ null,
+ IJBossServerConstants.WEB_PORT_DETECT,
+ IJBossServerConstants.WEB_PORT,
+ null,
+ Messages.EditorChangeWebCommandName);
+ }
+ }
+
public static class JBoss6JMXRMIPortEditorExtension extends PortEditorExtension {
public JBoss6JMXRMIPortEditorExtension() {
super(Messages.EditorJMXRMIPort,
@@ -213,6 +224,7 @@
protected void initialize() {
boolean shouldDetect = helper.getAttribute(detectXPathKey, true);
detect.setSelection(shouldDetect);
+ detect.setEnabled(defaultXPath != null);
link.setEnabled(shouldDetect);
text.setEnabled(!shouldDetect);
text.setEditable(!shouldDetect);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties 2011-05-02 12:50:27 UTC (rev 30995)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties 2011-05-02 13:58:01 UTC (rev 30996)
@@ -27,4 +27,5 @@
AllJBossServerTypes=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.70,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50
JBossServer6AndBelow=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
AllJBTServerTypes=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.70,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.systemCopyServer
-ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60
+ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70
+ServerTypesJBoss7=org.jboss.ide.eclipse.as.70
\ 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-05-02 12:50:27 UTC (rev 30995)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-05-02 13:58:01 UTC (rev 30996)
@@ -275,9 +275,13 @@
</section>
<section
class="org.jboss.ide.eclipse.as.ui.editor.PortSection$WebPortEditorExtension"
- serverIds="%AllJBossServerTypes">
+ serverIds="%JBossServer6AndBelow">
</section>
<section
+ class="org.jboss.ide.eclipse.as.ui.editor.PortSection$JBoss7WebPortEditorExtension"
+ serverIds="%ServerTypesJBoss7">
+ </section>
+ <section
class="org.jboss.ide.eclipse.as.ui.editor.PortSection$JBoss6JMXRMIPortEditorExtension"
serverIds="org.jboss.ide.eclipse.as.60">
</section>
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r30995 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-02 08:50:27 -0400 (Mon, 02 May 2011)
New Revision: 30995
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java
Log:
[JBIDE-8609] added check for standalone script file
Modified: 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-05-02 12:25:39 UTC (rev 30994)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java 2011-05-02 12:50:27 UTC (rev 30995)
@@ -12,7 +12,7 @@
import org.jboss.ide.eclipse.as.ui.Messages;
public class JBoss7ServerWizardFragment extends JBossRuntimeWizardFragment {
-
+
@Override
public boolean hasComposite() {
return true;
@@ -29,18 +29,19 @@
createNameComposite(main);
createHomeComposite(main);
}
-
+
protected void fillWidgets() {
- IRuntime rt = (IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME);
+ IRuntime rt = (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
if (rt != null) {
try {
fillNameWidgets(rt);
fillHomeDir(rt);
- } catch(Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
}
}
}
+
@Override
protected void updatePage() {
// Do Nothing
@@ -54,37 +55,47 @@
if (getRuntime(name) != null)
return Messages.rwf_NameInUse;
-
+
if (!isHomeValid())
return Messages.rwf_homeMissingFiles;
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()))
+ if (homeDir == null || homeDir.length() == 0 || !(new File(homeDir).exists()))
return false;
- return true;
+ 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 getVersionString(File loc) {
// TODO clean this up for later
return "7.0"; //$NON-NLS-1$
}
-
+
@Override
public void performFinish(IProgressMonitor monitor) throws CoreException {
- IRuntime rt = (IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME);
- ((IRuntimeWorkingCopy)rt).setLocation(new Path(homeDir));
+ IRuntime rt = (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
+ ((IRuntimeWorkingCopy) rt).setLocation(new Path(homeDir));
}
-
+
@Override
- public void exit() {
+ public void exit() {
IRuntime r = (IRuntime) getTaskModel()
.getObject(TaskModel.TASK_RUNTIME);
IRuntimeWorkingCopy runtimeWC = r.isWorkingCopy() ? ((IRuntimeWorkingCopy) r)
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r30994 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-02 08:25:39 -0400 (Mon, 02 May 2011)
New Revision: 30994
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java
Log:
corrected warnings
Modified: 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-05-02 09:47:13 UTC (rev 30993)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java 2011-05-02 12:25:39 UTC (rev 30994)
@@ -9,7 +9,6 @@
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.ui.Messages;
public class JBoss7ServerWizardFragment extends JBossRuntimeWizardFragment {
@@ -67,7 +66,7 @@
@Override
protected boolean isHomeValid() {
- if( homeDir == null || homeDir.equals("") || !(new File(homeDir).exists()))
+ if( homeDir == null || homeDir.length() == 0 || !(new File(homeDir).exists()))
return false;
return true;
}
@@ -75,7 +74,7 @@
@Override
protected String getVersionString(File loc) {
// TODO clean this up for later
- return "7.0";
+ return "7.0"; //$NON-NLS-1$
}
@Override
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r30993 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: server/internal/launch and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-02 05:47:13 -0400 (Mon, 02 May 2011)
New Revision: 30993
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeConstants.java
Log:
[JBIDE-8793] implemented #start
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-05-02 02:52:53 UTC (rev 30992)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-05-02 09:47:13 UTC (rev 30993)
@@ -117,6 +117,7 @@
}
protected transient IDebugEventSetListener processListener;
+
public synchronized void setProcess(final IProcess newProcess) {
if (process != null) {
return;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2011-05-02 02:52:53 UTC (rev 30992)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2011-05-02 09:47:13 UTC (rev 30993)
@@ -7,7 +7,7 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.launch;
import java.io.File;
@@ -42,24 +42,30 @@
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.internal.AbstractLocalJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
import org.jboss.ide.eclipse.as.core.util.IConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+/**
+ * @author Rob Stryker
+ */
public abstract class AbstractJBossLaunchConfigType extends AbstractJavaLaunchConfigurationDelegate {
public static final String SERVER_ID = "server-id"; //$NON-NLS-1$
// we have no need to do anything in pre-launch check
- public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
+ public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor)
+ throws CoreException {
return true;
}
- public void preLaunch(ILaunchConfiguration configuration,
+ public void preLaunch(ILaunchConfiguration configuration,
String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
// override me
}
- public void postLaunch(ILaunchConfiguration configuration,
+
+ public void postLaunch(ILaunchConfiguration configuration,
String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
// override me
}
@@ -70,39 +76,40 @@
actualLaunch(configuration, mode, launch, monitor);
postLaunch(configuration, mode, launch, monitor);
}
-
- protected void actualLaunch(ILaunchConfiguration configuration,
+
+ protected void actualLaunch(ILaunchConfiguration configuration,
String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
// And off we go!
IVMInstall vm = verifyVMInstall(configuration);
IVMRunner runner = vm.getVMRunner(mode);
-
- if(runner == null && ILaunchManager.PROFILE_MODE.equals(mode)){
+
+ if (runner == null && ILaunchManager.PROFILE_MODE.equals(mode)) {
runner = vm.getVMRunner(ILaunchManager.RUN_MODE);
}
- if(runner == null){
- throw new CoreException(new Status(IStatus.ERROR,JBossServerCorePlugin.PLUGIN_ID,0,Messages.runModeNotSupported,null));
+ if (runner == null) {
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, 0,
+ Messages.runModeNotSupported, null));
}
-
+
File workingDir = verifyWorkingDirectory(configuration);
String workingDirName = null;
if (workingDir != null)
workingDirName = workingDir.getAbsolutePath();
-
+
// Program & VM args
String pgmArgs = getProgramArguments(configuration);
String vmArgs = getVMArguments(configuration);
ExecutionArguments execArgs = new ExecutionArguments(vmArgs, pgmArgs);
-
+
// VM-specific attributes
- Map vmAttributesMap = getVMSpecificAttributesMap(configuration);
-
+ Map<?, ?> vmAttributesMap = getVMSpecificAttributesMap(configuration);
+
// Classpath
String[] classpath = getClasspath(configuration);
-
+
// Environment
String[] environment = getEnvironment(configuration);
-
+
// Create VM config
String mainType = getMainTypeName(configuration);
VMRunnerConfiguration runConfig = new VMRunnerConfiguration(mainType, classpath);
@@ -116,9 +123,9 @@
String[] bootpath = getBootpath(configuration);
if (bootpath != null && bootpath.length > 0)
runConfig.setBootClassPath(bootpath);
-
+
setDefaultSourceLocator(launch, configuration);
-
+
if (ILaunchManager.PROFILE_MODE.equals(mode)) {
try {
ServerProfilerDelegate.configureProfiling(launch, vm, runConfig, monitor);
@@ -126,7 +133,7 @@
IServer server = ServerUtil.getServer(configuration);
JBossServerBehavior jbsb = (JBossServerBehavior) server.getAdapter(JBossServerBehavior.class);
jbsb.stop(true);
- //genericServer.stopImpl();
+ // genericServer.stopImpl();
throw ce;
}
}
@@ -134,49 +141,49 @@
runner.run(runConfig, launch, monitor);
}
-
public static JBossServer findJBossServer(String serverId) throws CoreException {
- if( serverId == null )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ if (serverId == null)
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
NLS.bind(Messages.ServerNotFound, serverId)));
IServer s = ServerCore.findServer(serverId);
- if( s == null )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ if (s == null)
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
NLS.bind(Messages.ServerNotFound, serverId)));
JBossServer jbs = ServerConverter.getJBossServer(s);
- if( jbs == null )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
- NLS.bind(Messages.ServerNotFound, serverId)));
-
+ if (jbs == null)
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ NLS.bind(Messages.ServerNotFound, serverId)));
+
return jbs;
}
-
+
public static IJBossServerRuntime findJBossServerRuntime(IServer server) throws CoreException {
IRuntime rt = server.getRuntime();
IJBossServerRuntime jbrt = null;
- if( rt != null )
- jbrt = (IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
- if( jbrt == null )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
- NLS.bind(Messages.ServerRuntimeNotFound, server.getName())));
+ if (rt != null)
+ jbrt = (IJBossServerRuntime) rt.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
+ if (jbrt == null)
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ NLS.bind(Messages.ServerRuntimeNotFound, server.getName())));
return jbrt;
}
-
+
public static void addCPEntry(ArrayList<IRuntimeClasspathEntry> list, JBossServer jbs, String relative) {
addCPEntry(list, new Path(getServerHome(jbs)).append(relative));
}
+
public static void addCPEntry(ArrayList<IRuntimeClasspathEntry> list, IPath path) {
list.add(JavaRuntime.newArchiveRuntimeClasspathEntry(path));
}
-
+
public static void addJREEntry(ArrayList<IRuntimeClasspathEntry> cp, IVMInstall vmInstall) {
if (vmInstall != null) {
try {
cp.add(JavaRuntime.newRuntimeContainerClasspathEntry(
- new Path(JavaRuntime.JRE_CONTAINER)
- .append(vmInstall.getVMInstallType().getId()).append(vmInstall.getName()),
+ new Path(JavaRuntime.JRE_CONTAINER)
+ .append(vmInstall.getVMInstallType().getId()).append(vmInstall.getName()),
IRuntimeClasspathEntry.BOOTSTRAP_CLASSES));
} catch (CoreException e) {
IStatus s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
@@ -185,16 +192,15 @@
}
}
}
-
+
public static void addToolsJar(ArrayList<IRuntimeClasspathEntry> cp, IVMInstall vmInstall) {
File f = vmInstall.getInstallLocation();
File c1 = new File(f, IConstants.LIB);
File c2 = new File(c1, IConstants.TOOLS_JAR);
- if( c2.exists())
+ if (c2.exists())
addCPEntry(cp, new Path(c2.getAbsolutePath()));
}
-
public static ArrayList<String> convertClasspath(ArrayList<IRuntimeClasspathEntry> cp) {
Iterator<IRuntimeClasspathEntry> cpi = cp.iterator();
ArrayList<String> list = new ArrayList<String>();
@@ -230,16 +236,16 @@
}
}
-
public static String getServerHome(JBossServer jbs) {
return jbs.getServer().getRuntime().getLocation().toOSString();
}
-
+
public IVMInstall getVMInstall(ILaunchConfiguration configuration) throws CoreException {
- String serverId = configuration.getAttribute(SERVER_ID, (String)null);
+ String serverId = configuration.getAttribute(SERVER_ID, (String) null);
JBossServer jbs = findJBossServer(serverId);
- IJBossServerRuntime jbrt = findJBossServerRuntime(jbs.getServer());
- return jbrt.getVM();
+ AbstractLocalJBossServerRuntime rt = (AbstractLocalJBossServerRuntime)
+ jbs.getServer().getRuntime()
+ .loadAdapter(AbstractLocalJBossServerRuntime.class, new NullProgressMonitor());
+ return rt.getVM();
}
-
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-05-02 02:52:53 UTC (rev 30992)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-05-02 09:47:13 UTC (rev 30993)
@@ -7,7 +7,7 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.launch;
import java.net.MalformedURLException;
@@ -40,11 +40,13 @@
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.internal.AbstractLocalJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.IStartLaunchSetupParticipant;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.StartLaunchDelegate;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerBehavior;
import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
import org.jboss.ide.eclipse.as.core.util.IConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
@@ -53,29 +55,31 @@
public class LocalJBossServerStartupLaunchUtil implements StartLaunchDelegate, IStartLaunchSetupParticipant {
- static final String DEFAULTS_SET = "jboss.defaults.been.set"; //$NON-NLS-1$
- static final String START_JAR_LOC = IJBossRuntimeResourceConstants.BIN + Path.SEPARATOR + IJBossRuntimeResourceConstants.START_JAR;
+ public static final String DEFAULTS_SET = "jboss.defaults.been.set"; //$NON-NLS-1$
+ static final String START_JAR_LOC = IJBossRuntimeResourceConstants.BIN + Path.SEPARATOR
+ + IJBossRuntimeResourceConstants.START_JAR;
static final String START_MAIN_TYPE = IJBossRuntimeConstants.START_MAIN_TYPE;
-
+
public void setupLaunchConfiguration(
ILaunchConfigurationWorkingCopy workingCopy, IServer server) throws CoreException {
- if(!workingCopy.getAttributes().containsKey(DEFAULTS_SET)) {
+ if (!workingCopy.getAttributes().containsKey(DEFAULTS_SET)) {
forceDefaultsSet(workingCopy, server);
}
-
+
// Upgrade old launch configs
JBossServer jbs = AbstractJBossLaunchConfigType.findJBossServer(server.getId());
- if( jbs == null )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ if (jbs == null)
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
NLS.bind(Messages.CannotSetUpImproperServer, server.getName())));
- String cpProvider = workingCopy.getAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, (String)null);
- if( !DEFAULT_CP_PROVIDER_ID.equals(cpProvider)) {
+ String cpProvider = workingCopy.getAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER,
+ (String) null);
+ if (!DEFAULT_CP_PROVIDER_ID.equals(cpProvider)) {
workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, DEFAULT_CP_PROVIDER_ID);
workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, getClasspath(jbs));
workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
}
-
+
// Force the launch to get certain fields from the runtime
updateMandatedFields(workingCopy, jbs);
}
@@ -84,67 +88,71 @@
* Ensures that the working directory and classpath are 100% accurate.
* Merges proper required params into args and vm args
*/
-
- protected static void updateMandatedFields(ILaunchConfigurationWorkingCopy wc, JBossServer jbs) throws CoreException{
+
+ protected static void updateMandatedFields(ILaunchConfigurationWorkingCopy wc, JBossServer jbs)
+ throws CoreException {
String serverHome = AbstractJBossLaunchConfigType.getServerHome(jbs);
- if( serverHome == null )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ if (serverHome == null)
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
NLS.bind(Messages.CannotLocateServerHome, jbs.getServer().getName())));
-
+
IRuntime rt = jbs.getServer().getRuntime();
IJBossServerRuntime jbrt = null;
- if( rt != null )
- jbrt = (IJBossServerRuntime)rt.getAdapter(IJBossServerRuntime.class);
-
- if( jbrt == null )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ if (rt != null)
+ jbrt = (IJBossServerRuntime) rt.getAdapter(IJBossServerRuntime.class);
+
+ if (jbrt == null)
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
NLS.bind(Messages.ServerRuntimeNotFound, jbs.getServer().getName())));
/* Args and vm args */
-
+
String args = wc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$
String vmArgs = wc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, ""); //$NON-NLS-1$
String host = jbs.getServer().getHost();
- String host2 = ArgsUtil.getValue(args,
- IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT,
+ String host2 = ArgsUtil.getValue(args,
+ IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT,
IJBossRuntimeConstants.STARTUP_ARG_HOST_LONG);
- if( !host.equals(host2))
- args = ArgsUtil.setArg(args,
- IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT,
+ if (!host.equals(host2))
+ args = ArgsUtil.setArg(args,
+ IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT,
IJBossRuntimeConstants.STARTUP_ARG_HOST_LONG, host);
IJBossServerRuntime runtime = (IJBossServerRuntime)
- jbs.getServer().getRuntime().loadAdapter(IJBossServerRuntime.class, null);
+ jbs.getServer().getRuntime().loadAdapter(IJBossServerRuntime.class, null);
String config = runtime.getJBossConfiguration();
- args = ArgsUtil.setArg(args,
- IJBossRuntimeConstants.STARTUP_ARG_CONFIG_SHORT,
- IJBossRuntimeConstants.STARTUP_ARG_CONFIG_LONG, config);
-
+ args = ArgsUtil.setArg(args,
+ IJBossRuntimeConstants.STARTUP_ARG_CONFIG_SHORT,
+ IJBossRuntimeConstants.STARTUP_ARG_CONFIG_LONG, config);
+
try {
- if( !runtime.getConfigLocation().equals(IConstants.SERVER)) {
- args = ArgsUtil.setArg(args, null,
+ if (!runtime.getConfigLocation().equals(IConstants.SERVER)) {
+ args = ArgsUtil.setArg(args, null,
IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.JBOSS_SERVER_HOME_URL,
runtime.getConfigLocationFullPath().toFile().toURL().toString());
}
- } catch( MalformedURLException murle) {}
+ } catch (MalformedURLException murle) {
+ }
- vmArgs= ArgsUtil.setArg(vmArgs, null,
+ vmArgs = ArgsUtil.setArg(vmArgs, null,
IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.ENDORSED_DIRS,
runtime.getRuntime().getLocation().append(
IJBossRuntimeResourceConstants.LIB).append(
- IJBossRuntimeResourceConstants.ENDORSED).toOSString(), true);
+ IJBossRuntimeResourceConstants.ENDORSED).toOSString(), true);
/* Claspath */
List<String> cp = wc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, new ArrayList<String>());
List<String> newCP = fixCP(cp, jbs);
-
+
IVMInstall vmInstall = runtime.getVM();
- if( vmInstall != null )
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, JavaRuntime.newJREContainerPath(vmInstall).toPortableString());
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR + IJBossRuntimeResourceConstants.BIN);
+ if (vmInstall != null)
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH,
+ JavaRuntime.newJREContainerPath(vmInstall).toPortableString());
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR
+ + IJBossRuntimeResourceConstants.BIN);
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, args.trim());
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, vmArgs.trim());
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, newCP);
- wc.setAttribute(AbstractJBossLaunchConfigType.SERVER_ID,jbs.getServer().getId());
+ wc.setAttribute(AbstractJBossLaunchConfigType.SERVER_ID, jbs.getServer().getId());
}
@@ -152,50 +160,52 @@
try {
boolean found = false;
String[] asString = (String[]) list.toArray(new String[list.size()]);
- for( int i = 0; i < asString.length; i++ ) {
- if( asString[i].contains(RunJarContainerWrapper.ID)) {
+ for (int i = 0; i < asString.length; i++) {
+ if (asString[i].contains(RunJarContainerWrapper.ID)) {
found = true;
- asString[i] = getRunJarRuntimeCPEntry(jbs).getMemento();
+ asString[i] = getRunJarRuntimeCPEntry(jbs.getServer()).getMemento();
}
}
ArrayList<String> result = new ArrayList<String>();
result.addAll(Arrays.asList(asString));
- if( !found )
- result.add(getRunJarRuntimeCPEntry(jbs).getMemento());
+ if (!found)
+ result.add(getRunJarRuntimeCPEntry(jbs.getServer()).getMemento());
return result;
- } catch( CoreException ce) {
+ } catch (CoreException ce) {
return list;
}
}
-
+
protected static void forceDefaultsSet(ILaunchConfigurationWorkingCopy wc, IServer server) throws CoreException {
JBossServer jbs = AbstractJBossLaunchConfigType.findJBossServer(server.getId());
- if( jbs == null )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ if (jbs == null)
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
NLS.bind(Messages.CannotSetUpImproperServer, server.getName())));
-
+
String serverHome = AbstractJBossLaunchConfigType.getServerHome(jbs);
- if( serverHome == null )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ if (serverHome == null)
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
NLS.bind(Messages.CannotLocateServerHome, server.getName())));
-
+
IRuntime rt = jbs.getServer().getRuntime();
IJBossServerRuntime jbrt = null;
- if( rt != null ) {
- jbrt = (IJBossServerRuntime)rt.getAdapter(IJBossServerRuntime.class);
+ if (rt != null) {
+ jbrt = (IJBossServerRuntime) rt.getAdapter(IJBossServerRuntime.class);
}
-
- if( jbrt == null )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
- NLS.bind(Messages.ServerRuntimeNotFound, jbs.getServer().getName())));
-
+
+ if (jbrt == null)
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ NLS.bind(Messages.ServerRuntimeNotFound, jbs.getServer().getName())));
+
IVMInstall vmInstall = jbrt.getVM();
- if( vmInstall != null )
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, JavaRuntime.newJREContainerPath(vmInstall).toPortableString());
+ if (vmInstall != null)
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH,
+ JavaRuntime.newJREContainerPath(vmInstall).toPortableString());
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, getDefaultArgs(jbs));
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, jbrt.getDefaultRunVMArgs());
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, START_MAIN_TYPE);
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR + IJBossRuntimeResourceConstants.BIN);
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR
+ + IJBossRuntimeResourceConstants.BIN);
wc.setAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, jbrt.getDefaultRunEnvVars());
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, getClasspath(jbs));
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, DEFAULT_CP_PROVIDER_ID);
@@ -207,74 +217,83 @@
protected static ArrayList<String> getClasspath(JBossServer jbs) throws CoreException {
IJBossServerRuntime jbrt = AbstractJBossLaunchConfigType.findJBossServerRuntime(jbs.getServer());
ArrayList<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>();
- classpath.add(getRunJarRuntimeCPEntry(jbs));
+ classpath.add(getRunJarRuntimeCPEntry(jbs.getServer()));
AbstractJBossLaunchConfigType.addJREEntry(classpath, jbrt.getVM());
-
+
String version = jbs.getServer().getRuntime().getRuntimeType().getVersion();
- if( version.equals(IJBossToolingConstants.AS_40))
+ if (version.equals(IJBossToolingConstants.AS_40))
AbstractJBossLaunchConfigType.addToolsJar(classpath, jbrt.getVM());
-
+
ArrayList<String> runtimeClassPaths = AbstractJBossLaunchConfigType.convertClasspath(classpath);
return runtimeClassPaths;
}
-
- protected static IRuntimeClasspathEntry getRunJarRuntimeCPEntry(JBossServer jbs) throws CoreException {
- IPath containerPath = new Path(RunJarContainerWrapper.ID).append(jbs.getServer().getName());
+
+ protected static IRuntimeClasspathEntry getRunJarRuntimeCPEntry(IServer server) throws CoreException {
+ if (server.getServerType().getId().endsWith("70")) { //$NON-NLS-1$
+ return JBoss7ServerBehavior.getRunJarRuntimeCPEntry(server);
+ } else {
+ IPath containerPath = new Path(RunJarContainerWrapper.ID).append(server.getName());
return JavaRuntime.newRuntimeContainerClasspathEntry(containerPath, IRuntimeClasspathEntry.USER_CLASSES);
+ }
}
-
+
protected static String getDefaultArgs(JBossServer jbs) throws CoreException {
IJBossServerRuntime rt = AbstractJBossLaunchConfigType.findJBossServerRuntime(jbs.getServer());
if (rt != null) {
- return rt.getDefaultRunArgs() +
- IJBossRuntimeConstants.SPACE + IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT +
- IJBossRuntimeConstants.SPACE + jbs.getServer().getHost();
+ return rt.getDefaultRunArgs() +
+ IJBossRuntimeConstants.SPACE + IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT +
+ IJBossRuntimeConstants.SPACE + jbs.getServer().getHost();
}
return null;
}
-
public static JBossServerBehavior getServerBehavior(ILaunchConfiguration configuration) throws CoreException {
IServer server = ServerUtil.getServer(configuration);
JBossServerBehavior jbossServerBehavior = (JBossServerBehavior) server.getAdapter(JBossServerBehavior.class);
return jbossServerBehavior;
}
-
+
/* For "restore defaults" functionality */
private static final String DEFAULT_CP_PROVIDER_ID = "org.jboss.ide.eclipse.as.core.server.internal.launch.serverClasspathProvider"; //$NON-NLS-1$
+
public static class JBossServerDefaultClasspathProvider extends StandardClasspathProvider {
- public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration) throws CoreException {
- boolean useDefault = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, true);
+ public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration)
+ throws CoreException {
+ boolean useDefault = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH,
+ true);
if (useDefault) {
return defaultEntries(configuration);
}
return super.computeUnresolvedClasspath(configuration);
}
-
+
protected IRuntimeClasspathEntry[] defaultEntries(ILaunchConfiguration config) {
try {
- String server = config.getAttribute(AbstractJBossLaunchConfigType.SERVER_ID, (String)null);
+ String server = config.getAttribute(AbstractJBossLaunchConfigType.SERVER_ID, (String) null);
IServer s = ServerCore.findServer(server);
- IJBossServerRuntime ibjsrt = (IJBossServerRuntime)s.getRuntime().loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
- JBossServer jbs = (JBossServer)s.loadAdapter(JBossServer.class, new NullProgressMonitor());
+ AbstractLocalJBossServerRuntime ibjsrt = (AbstractLocalJBossServerRuntime)
+ s.getRuntime().loadAdapter(AbstractLocalJBossServerRuntime.class, new NullProgressMonitor());
+ JBossServer jbs = (JBossServer) s.loadAdapter(JBossServer.class, new NullProgressMonitor());
IVMInstall install = ibjsrt.getVM();
ArrayList<IRuntimeClasspathEntry> list = new ArrayList<IRuntimeClasspathEntry>();
AbstractJBossLaunchConfigType.addJREEntry(list, install);
- list.add(getRunJarRuntimeCPEntry(jbs));
+ list.add(getRunJarRuntimeCPEntry(s));
return (IRuntimeClasspathEntry[]) list
.toArray(new IRuntimeClasspathEntry[list.size()]);
- } catch( CoreException ce) {
+ } catch (CoreException ce) {
+ // ignore
}
+
try {
return super.computeUnresolvedClasspath(config);
- } catch( CoreException ce ) {}
- return new IRuntimeClasspathEntry[]{};
+ } catch (CoreException ce) {
+ // ignore
+ }
+ return new IRuntimeClasspathEntry[] {};
}
}
-
-
-
+
/*
* Actual instance methods
*/
@@ -284,21 +303,22 @@
IProgressMonitor monitor) throws CoreException {
launchConfig.superActualLaunch(configuration, mode, launch, monitor);
}
-
- public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
+
+ public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor)
+ throws CoreException {
JBossServerBehavior jbsBehavior = getServerBehavior(configuration);
- if( !jbsBehavior.canStart(mode).isOK())
+ if (!jbsBehavior.canStart(mode).isOK())
throw new CoreException(jbsBehavior.canStart(mode));
return true;
}
- public void preLaunch(ILaunchConfiguration configuration,
+ public void preLaunch(ILaunchConfiguration configuration,
String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
try {
JBossServerBehavior jbsBehavior = getServerBehavior(configuration);
jbsBehavior.setRunMode(mode);
jbsBehavior.serverStarting();
- } catch( CoreException ce ) {
+ } catch (CoreException ce) {
// report it
}
}
@@ -306,10 +326,10 @@
public void postLaunch(ILaunchConfiguration configuration, String mode,
ILaunch launch, IProgressMonitor monitor) throws CoreException {
try {
- IProcess[] processes = launch.getProcesses();
+ IProcess[] processes = launch.getProcesses();
JBossServerBehavior jbsBehavior = getServerBehavior(configuration);
- ((LocalJBossBehaviorDelegate)(jbsBehavior.getDelegate())).setProcess(processes[0]);
- } catch( CoreException ce ) {
+ ((LocalJBossBehaviorDelegate) (jbsBehavior.getDelegate())).setProcess(processes[0]);
+ } catch (CoreException ce) {
// report
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java 2011-05-02 02:52:53 UTC (rev 30992)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java 2011-05-02 09:47:13 UTC (rev 30993)
@@ -19,7 +19,7 @@
public static final String SERVICE_VERSION_70 = "org.jboss.ide.eclipse.as.management.as7.service"; //$NON-NLS-1$
- public static IJBoss7ManagerService findManagementService(IServer server) throws Exception {
+ public static IJBoss7ManagerService getService(IServer server) throws Exception {
BundleContext context = JBossServerCorePlugin.getContext();
JBoss7ManagerServiceProxy proxy = new JBoss7ManagerServiceProxy(context, getRequiredVersion(server));
proxy.open();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-05-02 02:52:53 UTC (rev 30992)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-05-02 09:47:13 UTC (rev 30993)
@@ -7,7 +7,7 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.v7;
import java.util.ArrayList;
@@ -18,19 +18,34 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.internal.launching.RuntimeClasspathEntry;
+import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
+import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService;
+import org.jboss.ide.eclipse.as.core.server.internal.AbstractLocalJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractJBossLaunchConfigType;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
public class JBoss7ServerBehavior extends JBossServerBehavior {
+ private static final String DEFAULT_CP_PROVIDER_ID = "org.jboss.ide.eclipse.as.core.server.internal.launch.serverClasspathProvider"; //$NON-NLS-1$
+
private IJBoss7ManagerService service;
private static HashMap<String, Class> delegateClassMap;
@@ -38,14 +53,15 @@
delegateClassMap = new HashMap<String, Class>();
delegateClassMap.put(LocalPublishMethod.LOCAL_PUBLISH_METHOD, LocalJBoss7BehaviorDelegate.class);
}
+
public static void addDelegateMapping(String s, Class c) {
delegateClassMap.put(s, c);
}
+
protected HashMap<String, Class> getDelegateMap() {
return delegateClassMap;
}
-
public void stop(boolean force) {
try {
IJBoss7ManagerService service = getService();
@@ -56,51 +72,89 @@
e.printStackTrace();
}
}
-
+
public boolean shouldSuspendScanner() {
return false;
}
-
- public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IProgressMonitor monitor) throws CoreException {
- //super.setupLaunchConfiguration(workingCopy, monitor);
+
+ public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IProgressMonitor monitor)
+ throws CoreException {
+ IRuntime rt = getServer().getRuntime();
+ LocalJBoss7ServerRuntime runtime = (LocalJBoss7ServerRuntime)
+ rt.loadAdapter(LocalJBoss7ServerRuntime.class, null);
+
+ IPath p = rt.getLocation();
+ IVMInstall vmInstall = runtime.getVM();
+ if (vmInstall != null)
+ workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, JavaRuntime
+ .newJREContainerPath(vmInstall).toPortableString());
+ workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, DEFAULT_CP_PROVIDER_ID);
+ workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, getClasspath());
+ workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
+ workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, runtime.getDefaultRunArgs());
+ workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, runtime.getDefaultRunVMArgs());
+ workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME,
+ IJBossRuntimeConstants.START7_MAIN_TYPE);
+ workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY,
+ p.append(IJBossRuntimeResourceConstants.BIN).toString());
+ workingCopy.setAttribute(AbstractJBossLaunchConfigType.SERVER_ID, getServer().getId());
}
+ protected ArrayList<String> getClasspath() throws CoreException {
+ AbstractLocalJBossServerRuntime jbrt = (AbstractLocalJBossServerRuntime) getServer().getRuntime().loadAdapter(
+ AbstractLocalJBossServerRuntime.class, new NullProgressMonitor());
+ ArrayList<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>();
+ classpath.add(getRunJarRuntimeCPEntry(getServer()));
+ AbstractJBossLaunchConfigType.addJREEntry(classpath, jbrt.getVM());
+ ArrayList<String> runtimeClassPaths = AbstractJBossLaunchConfigType.convertClasspath(classpath);
+ return runtimeClassPaths;
+ }
+
+ public static IRuntimeClasspathEntry getRunJarRuntimeCPEntry(IServer server) throws CoreException {
+ IPath loc = server.getRuntime().getLocation();
+ IClasspathEntry e = JavaRuntime.newArchiveRuntimeClasspathEntry(
+ loc.append("jboss-modules.jar")).getClasspathEntry(); //$NON-NLS-1$
+ return new RuntimeClasspathEntry(e);
+ }
+
@Override
- protected void publishModule(int kind, int deltaKind, IModule[] module, IProgressMonitor monitor) throws CoreException {
- if( method == null )
+ protected void publishModule(int kind, int deltaKind, IModule[] module, IProgressMonitor monitor)
+ throws CoreException {
+ if (method == null)
throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Not publishing")); //$NON-NLS-1$
int result = method.publishModule(this, kind, deltaKind, module, monitor);
setModulePublishState(module, result);
}
-
+
@Override
protected void publishFinish(IProgressMonitor monitor) throws CoreException {
- if( method == null )
+ if (method == null)
throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Not publishing")); //$NON-NLS-1$
- // Handle the dodeploy
+ // Handle the dodeploy
DeployableServerBehavior beh = ServerConverter.getDeployableServerBehavior(getServer());
Object o = beh.getPublishData(JBoss7JSTPublisher.MARK_DO_DEPLOY);
- if( o != null && (o instanceof ArrayList<?>)) {
- ArrayList<IPath> l = (ArrayList<IPath>)o;
+ if (o != null && (o instanceof ArrayList<?>)) {
+ ArrayList<IPath> l = (ArrayList<IPath>) o;
int size = l.size();
- monitor.beginTask("Completing Publishes", size+1); //$NON-NLS-1$
+ monitor.beginTask("Completing Publishes", size + 1); //$NON-NLS-1$
Iterator<IPath> i = l.iterator();
IPath p;
- while(i.hasNext()) {
- JBoss7JSTPublisher.addDoDeployMarkerFile(method, getServer(), i.next(), new SubProgressMonitor(monitor, 1));
+ while (i.hasNext()) {
+ JBoss7JSTPublisher.addDoDeployMarkerFile(method, getServer(), i.next(), new SubProgressMonitor(monitor,
+ 1));
}
super.publishFinish(new SubProgressMonitor(monitor, 1));
- } else
+ } else
super.publishFinish(monitor);
}
private IJBoss7ManagerService getService() throws Exception {
if (service == null) {
- service = JBoss7ManagerUtil.findManagementService(getServer());
+ service = JBoss7ManagerUtil.getService(getServer());
}
return service;
}
-
+
@Override
public void dispose() {
super.dispose();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-05-02 02:52:53 UTC (rev 30992)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-05-02 09:47:13 UTC (rev 30993)
@@ -7,7 +7,7 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.v7;
import org.eclipse.core.runtime.CoreException;
@@ -19,38 +19,48 @@
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.server.internal.launch.LocalJBossServerStartupLaunchUtil;
-public class JBoss7ServerStartupLaunchConfiguration extends
- JBossServerStartupLaunchConfiguration implements
+/**
+ * @author Rob Stryker
+ */
+public class JBoss7ServerStartupLaunchConfiguration extends JBossServerStartupLaunchConfiguration implements
ILaunchConfigurationDelegate {
- public void actualLaunch(ILaunchConfiguration configuration,
+
+ public String[] getJavaLibraryPath(ILaunchConfiguration configuration) throws CoreException {
+ return new String[] {};
+ }
+
+ public void actualLaunch(ILaunchConfiguration configuration,
String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
- //super.actualLaunch(configuration, mode, launch, monitor);
+ super.actualLaunch(configuration, mode, launch, monitor);
}
- public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
- //super.preLaunch(configuration, mode, launch, monitor);
+
+ public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor)
+ throws CoreException {
+ // return super.preLaunchCheck(configuration, mode, monitor);
return true;
}
- public void preLaunch(ILaunchConfiguration configuration,
+
+ public void preLaunch(ILaunchConfiguration configuration,
String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
- //super.preLaunch(configuration, mode, launch, monitor);
+ // super.preLaunch(configuration, mode, launch, monitor);
try {
JBossServerBehavior jbsBehavior = LocalJBossServerStartupLaunchUtil.getServerBehavior(configuration);
jbsBehavior.setRunMode(mode);
jbsBehavior.serverStarting();
- } catch( CoreException ce ) {
+ } catch (CoreException ce) {
// report it
}
}
+
public void postLaunch(ILaunchConfiguration configuration, String mode,
ILaunch launch, IProgressMonitor monitor) throws CoreException {
- //super.postLaunch(configuration, mode, launch, monitor);
+ // super.postLaunch(configuration, mode, launch, monitor);
try {
JBossServerBehavior jbsBehavior = LocalJBossServerStartupLaunchUtil.getServerBehavior(configuration);
jbsBehavior.setRunMode(mode);
jbsBehavior.setServerStarted();
- } catch( CoreException ce ) {
+ } catch (CoreException ce) {
// report it
}
}
-
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2011-05-02 02:52:53 UTC (rev 30992)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2011-05-02 09:47:13 UTC (rev 30993)
@@ -7,19 +7,22 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.v7;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.jboss.ide.eclipse.as.core.server.internal.AbstractLocalJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime;
-public class LocalJBoss7ServerRuntime extends AbstractLocalJBossServerRuntime {
+public class LocalJBoss7ServerRuntime extends LocalJBossServerRuntime {
+
@Override
public void setDefaults(IProgressMonitor monitor) {
super.setDefaults(monitor);
}
+
@Override
public IStatus validate() {
return Status.OK_STATUS;
@@ -27,13 +30,22 @@
@Override
public String getDefaultRunArgs() {
- // TODO Auto-generated method stub
- return null;
+ IPath loc = getRuntime().getLocation();
+ return "-mp " //$NON-NLS-1$
+ + loc.append("modules").toString() //$NON-NLS-1$
+ + " -logmodule org.jboss.logmanager -jaxpmodule javax.xml.jaxp-provider org.jboss.as.standalone"; //$NON-NLS-1$
}
@Override
public String getDefaultRunVMArgs() {
- // TODO Auto-generated method stub
- return null;
+ IPath loc = getRuntime().getLocation();
+ IPath bootLog = loc.append("standalone").append("log").append("boot.log"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ IPath logConfig = loc.append("standalone").append("configuration").append("logging.properties"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ return "-server -Xms64m -Xmx512m -XX:MaxPermSize=256m " //$NON-NLS-1$
+ + "-Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 " //$NON-NLS-1$
+ + "-Dsun.rmi.dgc.server.gcInterval=3600000 " //$NON-NLS-1$
+ + "-Dorg.jboss.boot.log.file=" + bootLog.toString() //$NON-NLS-1$
+ + " -Dlogging.configuration=file:" + logConfig.toString() //$NON-NLS-1$
+ + " -Djboss.home.dir=" + loc.toString(); //$NON-NLS-1$"
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeConstants.java 2011-05-02 02:52:53 UTC (rev 30992)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeConstants.java 2011-05-02 09:47:13 UTC (rev 30993)
@@ -46,6 +46,7 @@
public static final String TWIDDLE_MAIN_TYPE = "org.jboss.console.twiddle.Twiddle"; //$NON-NLS-1$
public static final String SHUTDOWN_MAIN_TYPE = "org.jboss.Shutdown"; //$NON-NLS-1$
public static final String START_MAIN_TYPE = "org.jboss.Main"; //$NON-NLS-1$
+ public static final String START7_MAIN_TYPE = "org.jboss.modules.Main"; //$NON-NLS-1$
public static final String CLASS_SIMPLE_PRINCIPAL = "org.jboss.security.SimplePrincipal"; //$NON-NLS-1$
public static final String CLASS_SECURITY_ASSOCIATION = "org.jboss.security.SecurityAssociation"; //$NON-NLS-1$
public static final String METHOD_SET_CREDENTIAL = "setCredential"; //$NON-NLS-1$
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r30992 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-01 22:52:53 -0400 (Sun, 01 May 2011)
New Revision: 30992
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
add org.apache.commons.codec to multiple and unified targets; add to jbds.target along with wsdl, oro, jdom
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-05-01 05:11:12 UTC (rev 30991)
+++ trunk/build/target-platform/jbds.target 2011-05-02 02:52:53 UTC (rev 30992)
@@ -9,6 +9,12 @@
:%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
-->
+ <!-- Orbit bundles -->
+ <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
+ <unit id="org.apache.oro" version="2.0.8.v201005080400"/>
+ <unit id="org.jdom" version="1.0.0.v201005080400"/>
+ <unit id="org.apache.commons.codec" version="1.3.0.v20100518-1140"/>
+
<!-- CVS -->
<unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110207-7B78FGB8sF7BB7I8H58WG5"/>
@@ -153,4 +159,4 @@
<repository location="http://download.jboss.org/jbosstools/updates/indigo/"/>
</location>
</locations>
-</target>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-05-01 05:11:12 UTC (rev 30991)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-05-02 02:52:53 UTC (rev 30992)
@@ -30,6 +30,10 @@
<source>
<repository location="http://download.jboss.org/jbosstools/updates/indigo/"/>
</source>
+<iu id="javax.wsdl" version=""/>
+<iu id="org.apache.oro" version=""/>
+<iu id="org.jdom" version=""/>
+<iu id="org.apache.commons.codec" version=""/>
<iu id="org.eclipse.cvs.feature.group" version=""/>
<iu id="org.eclipse.datatools.modelbase.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.connectivity.feature.feature.group" version=""/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-05-01 05:11:12 UTC (rev 30991)
+++ trunk/build/target-platform/multiple.target 2011-05-02 02:52:53 UTC (rev 30992)
@@ -40,9 +40,11 @@
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20100920"/>
<unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110128-1111"/>
+ <!-- Orbit bundles -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
<unit id="org.jdom" version="1.0.0.v201005080400"/>
+ <unit id="org.apache.commons.codec" version="1.3.0.v20100518-1140"/>
<!-- <unit id="org.mozilla.xulrunner.feature.feature.group" version="1.9.12.v20110120-2050-H36-CR1"/>
<unit id="org.mozilla.xpcom.feature.feature.group" version="1.9.12.v20110120-2050-H36-CR1"/> -->
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-05-01 05:11:12 UTC (rev 30991)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-05-02 02:52:53 UTC (rev 30992)
@@ -47,6 +47,7 @@
<iu id="javax.wsdl" version=""/>
<iu id="org.apache.oro" version=""/>
<iu id="org.jdom" version=""/>
+<iu id="org.apache.commons.codec" version=""/>
<iu id="org.eclipse.emf.ecore.feature.group" version=""/>
<iu id="org.eclipse.emf.feature.group" version=""/>
<iu id="org.eclipse.emf.codegen.feature.group" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-05-01 05:11:12 UTC (rev 30991)
+++ trunk/build/target-platform/unified.target 2011-05-02 02:52:53 UTC (rev 30992)
@@ -40,9 +40,11 @@
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20100920"/>
<unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110128-1111"/>
+ <!-- Orbit bundles -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
<unit id="org.jdom" version="1.0.0.v201005080400"/>
+ <unit id="org.apache.commons.codec" version="1.3.0.v20100518-1140"/>
<!-- <unit id="org.mozilla.xulrunner.feature.feature.group" version="1.9.12.v20110120-2050-H36-CR1"/>
<unit id="org.mozilla.xpcom.feature.feature.group" version="1.9.12.v20110120-2050-H36-CR1"/> -->
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2011-05-01 05:11:12 UTC (rev 30991)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-05-02 02:52:53 UTC (rev 30992)
@@ -47,6 +47,7 @@
<iu id="javax.wsdl" version=""/>
<iu id="org.apache.oro" version=""/>
<iu id="org.jdom" version=""/>
+<iu id="org.apache.commons.codec" version=""/>
<iu id="org.eclipse.emf.ecore.feature.group" version=""/>
<iu id="org.eclipse.emf.feature.group" version=""/>
<iu id="org.eclipse.emf.codegen.feature.group" version=""/>
13 years, 2 months
- 1
- 0