JBoss Tools SVN: r40843 - in trunk/as/plugins: org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3 and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-05-08 02:45:10 -0400 (Tue, 08 May 2012)
New Revision: 40843
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/RuntimeClasspathCache.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/RuntimeKey.java
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ClasspathConstants.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/DirectoryLibraryContainerInitializer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/RuntimeKey.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/DirectoryLibraryPage.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ClasspathCorePlugin.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB3ClasspathContainer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/containers/custom/CustomClasspathPreferencePage.java
Log:
Removal of cruft code and creation of a model class to simplify activator
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ClasspathConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ClasspathConstants.java 2012-05-08 06:43:21 UTC (rev 40842)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ClasspathConstants.java 2012-05-08 06:45:10 UTC (rev 40843)
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * 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.classpath.core;
-
-import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
-
-
-public interface ClasspathConstants extends IJBossServerConstants {
-
-}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ClasspathCorePlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ClasspathCorePlugin.java 2012-05-08 06:43:21 UTC (rev 40842)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ClasspathCorePlugin.java 2012-05-08 06:45:10 UTC (rev 40843)
@@ -10,20 +10,17 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.classpath.core;
-import java.util.HashMap;
import java.util.Map;
import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeLifecycleListener;
import org.eclipse.wst.server.core.ServerCore;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.classpath.core.runtime.RuntimeClasspathCache;
+import org.jboss.ide.eclipse.as.classpath.core.runtime.RuntimeKey;
import org.osgi.framework.BundleContext;
/**
@@ -37,32 +34,6 @@
// The shared instance
private static ClasspathCorePlugin plugin;
- private static Map<RuntimeKey, IClasspathEntry[]> runtimeClasspaths;
-
- private IRuntimeLifecycleListener listener = new IRuntimeLifecycleListener() {
-
- public void runtimeRemoved(IRuntime runtime) {
- removeRuntimeClasspath(runtime);
- }
-
- public void runtimeChanged(IRuntime runtime) {
- removeRuntimeClasspath(runtime);
- }
-
- public void runtimeAdded(IRuntime runtime) {
-
- }
-
- private void removeRuntimeClasspath(IRuntime runtime) {
- if (runtime == null) {
- return;
- }
- RuntimeKey key = getRuntimeKey(runtime);
- if (key != null) {
- runtimeClasspaths.remove(key);
- }
- }
- };
/**
* The constructor
*/
@@ -76,8 +47,7 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- runtimeClasspaths = new HashMap<RuntimeKey, IClasspathEntry[]>();
- ServerCore.addRuntimeLifecycleListener(listener);
+ ServerCore.addRuntimeLifecycleListener(RuntimeClasspathCache.getInstance());
}
/*
@@ -87,8 +57,7 @@
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
- runtimeClasspaths = null;
- ServerCore.removeRuntimeLifecycleListener(listener);
+ ServerCore.removeRuntimeLifecycleListener(RuntimeClasspathCache.getInstance());
}
/**
@@ -107,17 +76,11 @@
}
public static Map<RuntimeKey, IClasspathEntry[]> getRuntimeClasspaths() {
- return runtimeClasspaths;
+ return RuntimeClasspathCache.getInstance().getRuntimeClasspaths();
}
public static RuntimeKey getRuntimeKey(IRuntime runtime) {
- if( runtime == null )
- return null;
-
- IJBossServerRuntime jbsrt = (IJBossServerRuntime)runtime.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
- IPath loc = runtime.getLocation();
- String rtID = runtime.getRuntimeType().getId();
- IPath configPath = jbsrt == null ? null : jbsrt.getConfigurationFullPath();
- return new RuntimeKey(loc, configPath, rtID);
+ return RuntimeClasspathCache.getRuntimeKey(runtime);
}
+
}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/DirectoryLibraryContainerInitializer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/DirectoryLibraryContainerInitializer.java 2012-05-08 06:43:21 UTC (rev 40842)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/DirectoryLibraryContainerInitializer.java 2012-05-08 06:45:10 UTC (rev 40843)
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * 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.classpath.core;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-// Can't extend abstractclasspathcontainer since it assumes libraries are within our plugins
-// TODO: need to implement resource change listeners like done in FlexibleProjectContainer to be usefull.
-public class DirectoryLibraryContainerInitializer extends ClasspathContainerInitializer {
-
- public static final String CONTAINER_ID = "org.jboss.ide.eclipse.as.classpath.core.DirectoryLibraryContainer"; //$NON-NLS-1$
-
- @Override
- public void initialize(IPath containerPath, IJavaProject project)
- throws CoreException {
- int size = containerPath.segmentCount();
- if (size > 0)
- {
- if (containerPath.segment(0).equals(this.getClasspathContainerID()))
- {
- IClasspathContainer container = this.createClasspathContainer(project, containerPath.removeFirstSegments(1));
- JavaCore.setClasspathContainer(containerPath, new IJavaProject[]
- {project}, new IClasspathContainer[]
- {container}, null);
- }
- }
- }
-
- private IClasspathContainer createClasspathContainer(IJavaProject project, IPath containerPath) {
- return new DirectoryLibraryContainer(project, containerPath);
- }
-
- private String getClasspathContainerID() {
- return CONTAINER_ID;
- }
-
- static class DirectoryLibraryContainer implements IClasspathContainer {
-
- private final IResource file;
-
- final IClasspathEntry[] entries;
-
- private final IPath containerPath;
-
- private final IJavaProject project;
-
- public DirectoryLibraryContainer(IJavaProject project, IPath containerPath) {
- this.project = project;
- this.containerPath = containerPath;
-
- this.file = project.getProject().getWorkspace().getRoot().getFolder(containerPath);
-
-
- final List<IClasspathEntry> libraries = new ArrayList<IClasspathEntry>();
-
- try {
- if(file!=null && file.exists()) {
- file.accept(new IResourceProxyVisitor() {
- public boolean visit(IResourceProxy proxy) /* throws CoreException */{
- switch(proxy.getType()) {
- case IResource.FILE :
- if (proxy.getName().endsWith(".jar") || proxy.getName().endsWith(".zip")) { //$NON-NLS-1$ //$NON-NLS-2$
- libraries.add(JavaCore.newLibraryEntry(proxy.requestFullPath(), null, null));
- }
- return false;
- case IResource.FOLDER :
- //TODO: recursive by default or ?
- return true;
- }
- return true;
- }
- }
- , IResource.NONE);
- }
- } catch (CoreException e) {
- // TODO: log
- e.printStackTrace();
- }
-
- entries = libraries.toArray(new IClasspathEntry[0]);
- }
-
- public IClasspathEntry[] getClasspathEntries() {
- return entries;
- }
-
- public String getDescription() {
- return file == null ?
- Messages.DirectoryLibraryContainerInitializer_libraries_found_no_dir :
- MessageFormat.format(Messages.DirectoryLibraryContainerInitializer_libraries_found_in_dir, file.getProjectRelativePath().toString());
- }
-
- public int getKind() {
- return K_APPLICATION;
- }
-
- public IPath getPath() {
- return file.getProjectRelativePath();
- }
- }
-
-}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/RuntimeKey.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/RuntimeKey.java 2012-05-08 06:43:21 UTC (rev 40842)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/RuntimeKey.java 2012-05-08 06:45:10 UTC (rev 40843)
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * 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.classpath.core;
-
-import org.eclipse.core.runtime.IPath;
-
-public class RuntimeKey {
- private IPath location;
- private IPath configPath;
- private String id;
-
- public RuntimeKey(IPath location, IPath configPath, String id) {
- this.location = location;
- this.configPath = configPath;
- this.id = id;
- }
-
- public IPath getLocation() {
- return location;
- }
-
- public void setLocation(IPath location) {
- this.location = location;
- }
-
- public IPath getConfigPath() {
- return configPath;
- }
-
- public void setConfigPath(IPath configPath) {
- this.configPath = configPath;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result
- + ((configPath == null) ? 0 : configPath.hashCode());
- result = prime * result + ((id == null) ? 0 : id.hashCode());
- result = prime * result
- + ((location == null) ? 0 : location.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- RuntimeKey other = (RuntimeKey) obj;
- if (configPath == null) {
- if (other.configPath != null)
- return false;
- } else if (!configPath.equals(other.configPath))
- return false;
- if (id == null) {
- if (other.id != null)
- return false;
- } else if (!id.equals(other.id))
- return false;
- if (location == null) {
- if (other.location != null)
- return false;
- } else if (!location.equals(other.location))
- return false;
- return true;
- }
-}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB3ClasspathContainer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB3ClasspathContainer.java 2012-05-08 06:43:21 UTC (rev 40842)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB3ClasspathContainer.java 2012-05-08 06:45:10 UTC (rev 40843)
@@ -15,7 +15,6 @@
import java.util.ArrayList;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
@@ -29,16 +28,16 @@
import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerCore;
-import org.jboss.ide.eclipse.as.classpath.core.ClasspathConstants;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathCorePlugin;
import org.jboss.ide.eclipse.as.classpath.core.Messages;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
/**
* @author Marshall
* @author Rob Stryker
*/
-public class EJB3ClasspathContainer implements IClasspathContainer, ClasspathConstants {
+public class EJB3ClasspathContainer implements IClasspathContainer, IJBossServerConstants {
public static final String CONTAINER_ID = "org.jboss.ide.eclipse.as.classpath.core.ejb3.classpathContainer"; //$NON-NLS-1$
public static final String DESCRIPTION = Messages.EJB3ClasspathContainer_ejb3_description;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2012-05-08 06:43:21 UTC (rev 40842)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2012-05-08 06:45:10 UTC (rev 40843)
@@ -29,11 +29,10 @@
import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.jst.server.core.RuntimeClasspathProviderDelegate;
import org.eclipse.wst.server.core.IRuntime;
-import org.jboss.ide.eclipse.as.classpath.core.ClasspathConstants;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathCorePlugin;
import org.jboss.ide.eclipse.as.classpath.core.Messages;
-import org.jboss.ide.eclipse.as.classpath.core.RuntimeKey;
import org.jboss.ide.eclipse.as.classpath.core.runtime.CustomRuntimeClasspathModel.IDefaultPathProvider;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
/**
* This class uses the "throw everything you can find" strategy
@@ -45,7 +44,7 @@
*/
public class ClientAllRuntimeClasspathProvider
extends RuntimeClasspathProviderDelegate
- implements ClasspathConstants {
+ implements IJBossServerConstants {
public ClientAllRuntimeClasspathProvider() {
// TODO Auto-generated constructor stub
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/RuntimeClasspathCache.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/RuntimeClasspathCache.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/RuntimeClasspathCache.java 2012-05-08 06:45:10 UTC (rev 40843)
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.classpath.core.runtime;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IRuntimeLifecycleListener;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+
+public class RuntimeClasspathCache implements IRuntimeLifecycleListener {
+ private static RuntimeClasspathCache instance = null;
+ public static RuntimeClasspathCache getInstance() {
+ if( instance == null )
+ instance = new RuntimeClasspathCache();
+ return instance;
+ }
+
+
+ private Map<RuntimeKey, IClasspathEntry[]> runtimeClasspaths;
+
+ RuntimeClasspathCache() {
+ runtimeClasspaths = new HashMap<RuntimeKey, IClasspathEntry[]>();
+ }
+ public void runtimeRemoved(IRuntime runtime) {
+ removeRuntimeClasspath(runtime);
+ }
+
+ public void runtimeChanged(IRuntime runtime) {
+ removeRuntimeClasspath(runtime);
+ }
+
+ public void runtimeAdded(IRuntime runtime) {
+
+ }
+
+ private void removeRuntimeClasspath(IRuntime runtime) {
+ if (runtime == null) {
+ return;
+ }
+ RuntimeKey key = getRuntimeKey(runtime);
+ if (key != null) {
+ runtimeClasspaths.remove(key);
+ }
+ }
+
+ public Map<RuntimeKey, IClasspathEntry[]> getRuntimeClasspaths() {
+ return runtimeClasspaths;
+ }
+
+ public static RuntimeKey getRuntimeKey(IRuntime runtime) {
+ if( runtime == null )
+ return null;
+
+ IJBossServerRuntime jbsrt = (IJBossServerRuntime)runtime.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
+ IPath loc = runtime.getLocation();
+ String rtID = runtime.getRuntimeType().getId();
+ IPath configPath = jbsrt == null ? null : jbsrt.getConfigurationFullPath();
+ return new RuntimeKey(loc, configPath, rtID);
+ }
+
+}
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/RuntimeKey.java (from rev 40814, trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/RuntimeKey.java)
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/RuntimeKey.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/RuntimeKey.java 2012-05-08 06:45:10 UTC (rev 40843)
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * 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.classpath.core.runtime;
+
+import org.eclipse.core.runtime.IPath;
+
+public class RuntimeKey {
+ private IPath location;
+ private IPath configPath;
+ private String id;
+
+ public RuntimeKey(IPath location, IPath configPath, String id) {
+ this.location = location;
+ this.configPath = configPath;
+ this.id = id;
+ }
+
+ public IPath getLocation() {
+ return location;
+ }
+
+ public void setLocation(IPath location) {
+ this.location = location;
+ }
+
+ public IPath getConfigPath() {
+ return configPath;
+ }
+
+ public void setConfigPath(IPath configPath) {
+ this.configPath = configPath;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result
+ + ((configPath == null) ? 0 : configPath.hashCode());
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result
+ + ((location == null) ? 0 : location.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ RuntimeKey other = (RuntimeKey) obj;
+ if (configPath == null) {
+ if (other.configPath != null)
+ return false;
+ } else if (!configPath.equals(other.configPath))
+ return false;
+ if (id == null) {
+ if (other.id != null)
+ return false;
+ } else if (!id.equals(other.id))
+ return false;
+ if (location == null) {
+ if (other.location != null)
+ return false;
+ } else if (!location.equals(other.location))
+ return false;
+ return true;
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/plugin.xml 2012-05-08 06:43:21 UTC (rev 40842)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/plugin.xml 2012-05-08 06:45:10 UTC (rev 40843)
@@ -7,13 +7,6 @@
class="org.jboss.ide.eclipse.as.classpath.ui.ejb3.JBossEJB3LibrariesPage"
id="org.jboss.ide.eclipse.as.classpath.core.ejb3.classpathContainer"
name="JBoss EJB3 Libraries"/>
- <!-- Cannot be enabled before resource change listening is implementd (max)
- <classpathContainerPage
- class="org.jboss.ide.eclipse.as.classpath.ui.DirectoryLibraryPage"
- id="org.jboss.ide.eclipse.as.classpath.ui.libraryDirectoryPage"
- name="Directory with libraries">
- </classpathContainerPage>
- -->
</extension>
<extension
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/DirectoryLibraryPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/DirectoryLibraryPage.java 2012-05-08 06:43:21 UTC (rev 40842)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/DirectoryLibraryPage.java 2012-05-08 06:45:10 UTC (rev 40843)
@@ -1,119 +0,0 @@
-package org.jboss.ide.eclipse.as.classpath.ui;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPage;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPageExtension;
-import org.eclipse.jdt.ui.wizards.NewElementWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.jboss.ide.eclipse.as.classpath.core.DirectoryLibraryContainerInitializer;
-
-public class DirectoryLibraryPage extends NewElementWizardPage implements
- IClasspathContainerPage, IClasspathContainerPageExtension {
- private IProject ownerProject;
- private String libsProjectName;
- private Combo projectsCombo;
-
- public DirectoryLibraryPage() {
- super("DirectoryLibrariesContainerPage"); //$NON-NLS-1$
-
- setTitle(Messages.DirectoryLibraryPage_Title);
- setDescription(Messages.DirectoryLibraryPage_Description);
- }
-
- public IClasspathEntry getSelection() {
- IPath path = new Path(DirectoryLibraryContainerInitializer.CONTAINER_ID);
-
- final int index = this.projectsCombo.getSelectionIndex();
- final String selectedProjectName = this.projectsCombo.getItem(index);
-
- if (this.ownerProject == null
- || !selectedProjectName.equals(this.ownerProject.getName())) {
- path = path.append(selectedProjectName);
- }
-
- return JavaCore.newContainerEntry(path);
- }
-
- public void setSelection(final IClasspathEntry cpentry) {
- final IPath path = cpentry == null ? null : cpentry.getPath();
-
- if (path == null || path.segmentCount() == 1) {
- if (this.ownerProject != null) {
- this.libsProjectName = this.ownerProject.getName();
- }
- } else {
- this.libsProjectName = path.segment(1);
- }
- }
-
- public void createControl(final Composite parent) {
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(2, false));
-
- final Label label = new Label(composite, SWT.NONE);
- label.setText(Messages.DirectoryLibraryPage_LabelProject);
-
- final String[] webProjects = getWebProjects();
-
- this.projectsCombo = new Combo(composite, SWT.READ_ONLY);
- this.projectsCombo.setItems(webProjects);
-
- final int index;
-
- if (this.ownerProject != null) {
- index = indexOf(webProjects, this.libsProjectName);
- } else {
- if (this.projectsCombo.getItemCount() > 0) {
- index = 0;
- } else {
- index = -1;
- }
- }
-
- if (index != -1) {
- this.projectsCombo.select(index);
- }
-
- final GridData gd = new GridData();
- gd.grabExcessHorizontalSpace = true;
- gd.minimumWidth = 100;
-
- this.projectsCombo.setLayoutData(gd);
-
- setControl(composite);
- }
-
- public boolean finish() {
- return true;
- }
-
- public void initialize(final IJavaProject project,
- final IClasspathEntry[] currentEntries) {
- this.ownerProject = (project == null ? null : project.getProject());
- }
-
- private static String[] getWebProjects() {
- return new String[] { Messages.DirectoryLibraryPage_WebProjects };
- }
-
- private static int indexOf(final String[] array, final String str) {
- for (int i = 0; i < array.length; i++) {
- if (array[i].equals(str)) {
- return i;
- }
- }
-
- return -1;
- }
-
-}
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/containers/custom/CustomClasspathPreferencePage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/containers/custom/CustomClasspathPreferencePage.java 2012-05-08 06:43:21 UTC (rev 40842)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/containers/custom/CustomClasspathPreferencePage.java 2012-05-08 06:45:10 UTC (rev 40843)
@@ -51,8 +51,8 @@
import org.jboss.ide.eclipse.archives.webtools.filesets.FilesetDialog;
import org.jboss.ide.eclipse.archives.webtools.filesets.FilesetLabelProvider;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathCorePlugin;
-import org.jboss.ide.eclipse.as.classpath.core.RuntimeKey;
import org.jboss.ide.eclipse.as.classpath.core.runtime.CustomRuntimeClasspathModel;
+import org.jboss.ide.eclipse.as.classpath.core.runtime.RuntimeKey;
import org.jboss.ide.eclipse.as.classpath.core.runtime.CustomRuntimeClasspathModel.IDefaultPathProvider;
import org.jboss.ide.eclipse.as.classpath.ui.ClasspathUIPlugin;
import org.jboss.ide.eclipse.as.classpath.ui.Messages;
13 years, 8 months
JBoss Tools SVN: r40842 - trunk/download.jboss.org/jbosstools/builds/cascade.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-08 02:43:21 -0400 (Tue, 08 May 2012)
New Revision: 40842
Modified:
trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
Log:
examples depends on as, archives, jmx
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-05-08 06:38:39 UTC (rev 40841)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-05-08 06:43:21 UTC (rev 40842)
@@ -1,4 +1,4 @@
-Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2012/05/07
+Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2012/05/08
See also https://svn.jboss.org/repos/jbosstools/trunk/build/ -> pom*.xml
@@ -37,7 +37,7 @@
(all but common and tests) -> usage
jmx -> tests, common, usage
-examples -> portlet, jst, runtime
+examples -> portlet, jst, runtime, as, archives, jmx
portlet -> seam, as, tests, usage
seam -> hibernate, jsf
central -> examples, portlet, seam, as, archives, jmx, jsf, vpe, jst, hibernate, freemarker, runtime, common, tests, maven, usage
13 years, 8 months
JBoss Tools SVN: r40841 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-08 02:38:39 -0400 (Tue, 08 May 2012)
New Revision: 40841
Modified:
trunk/build/pom.xml
Log:
examples depends on portlet, jst
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2012-05-08 06:38:34 UTC (rev 40840)
+++ trunk/build/pom.xml 2012-05-08 06:38:39 UTC (rev 40841)
@@ -443,6 +443,8 @@
<module>../common</module>
<module>../jmx</module>
<module>../archives</module>
+ <module>../portlet</module>
+ <module>../jst</module>
<module>../as</module>
<module>../usage</module>
<module>../runtime</module>
13 years, 8 months
JBoss Tools SVN: r40840 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-08 02:38:34 -0400 (Tue, 08 May 2012)
New Revision: 40840
Modified:
trunk/build/pom-soa-tooling.xml
Log:
fix parent pom version
Modified: trunk/build/pom-soa-tooling.xml
===================================================================
--- trunk/build/pom-soa-tooling.xml 2012-05-08 06:38:30 UTC (rev 40839)
+++ trunk/build/pom-soa-tooling.xml 2012-05-08 06:38:34 UTC (rev 40840)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
13 years, 8 months
JBoss Tools SVN: r40839 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-08 02:38:30 -0400 (Tue, 08 May 2012)
New Revision: 40839
Removed:
trunk/build/pom-disabled-components.xml
Log:
deprecated
Deleted: trunk/build/pom-disabled-components.xml
===================================================================
--- trunk/build/pom-disabled-components.xml 2012-05-08 06:38:25 UTC (rev 40838)
+++ trunk/build/pom-disabled-components.xml 2012-05-08 06:38:30 UTC (rev 40839)
@@ -1,38 +0,0 @@
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.build</artifactId>
- <name>org.jboss.tools.build</name>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <profiles>
-
- <profile>
- <id>libs</id>
- <activation>
- <property>
- <name>coverage</name>
- </property>
- </activation>
- <modules>
- <module>libs</module>
- </modules>
- </profile>
-
- <profile>
- <id>site</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../site</module>
- </modules>
- </profile>
-
- </profiles>
-
-</project>
-
13 years, 8 months
JBoss Tools SVN: r40838 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-08 02:38:25 -0400 (Tue, 08 May 2012)
New Revision: 40838
Modified:
trunk/build/pom.xml
Log:
add archives and as to examples-bootstrap profile per rawblem
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2012-05-08 06:38:21 UTC (rev 40837)
+++ trunk/build/pom.xml 2012-05-08 06:38:25 UTC (rev 40838)
@@ -442,6 +442,8 @@
<module>../tests</module>
<module>../common</module>
<module>../jmx</module>
+ <module>../archives</module>
+ <module>../as</module>
<module>../usage</module>
<module>../runtime</module>
<module>../examples</module>
13 years, 8 months
JBoss Tools SVN: r40837 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-08 02:38:21 -0400 (Tue, 08 May 2012)
New Revision: 40837
Added:
trunk/build/pom-disabled-components.xml.DEPRECATED
Log:
deprecate old pom-disabled-components.xml
Added: trunk/build/pom-disabled-components.xml.DEPRECATED
===================================================================
--- trunk/build/pom-disabled-components.xml.DEPRECATED (rev 0)
+++ trunk/build/pom-disabled-components.xml.DEPRECATED 2012-05-08 06:38:21 UTC (rev 40837)
@@ -0,0 +1,38 @@
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.build</artifactId>
+ <name>org.jboss.tools.build</name>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <profiles>
+
+ <profile>
+ <id>libs</id>
+ <activation>
+ <property>
+ <name>coverage</name>
+ </property>
+ </activation>
+ <modules>
+ <module>libs</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>site</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../site</module>
+ </modules>
+ </profile>
+
+ </profiles>
+
+</project>
+
13 years, 8 months
JBoss Tools SVN: r40836 - in trunk: download.jboss.org/jbosstools/builds/cascade and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-08 02:38:15 -0400 (Tue, 08 May 2012)
New Revision: 40836
Modified:
trunk/build/pom-soa-tooling.xml
trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
Log:
bpel depends on as, archives, and jmx now. 'org.jboss.tools.bpel.runtimes 0.8.0.qualifier requires bundle org.jboss.ide.eclipse.as.wtp.core': update swimlanes and pom-soa-tooling.xml
Modified: trunk/build/pom-soa-tooling.xml
===================================================================
--- trunk/build/pom-soa-tooling.xml 2012-05-08 06:01:18 UTC (rev 40835)
+++ trunk/build/pom-soa-tooling.xml 2012-05-08 06:38:15 UTC (rev 40836)
@@ -197,7 +197,11 @@
<profile>
<id>bpel-bootstrap</id>
<modules>
- <module>../tests</module>
+ <module>../tests</module>
+ <module>../common</module>
+ <module>../jmx</module>
+ <module>../archives</module>
+ <module>../as</module>
<module>../bpel</module>
<module>../usage</module>
</modules>
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-05-08 06:01:18 UTC (rev 40835)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-05-08 06:38:15 UTC (rev 40836)
@@ -1,4 +1,4 @@
-Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2012/04/28
+Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2012/05/07
See also https://svn.jboss.org/repos/jbosstools/trunk/build/ -> pom*.xml
@@ -55,7 +55,7 @@
smooks [REMOVED]
-bpel -> archives
+bpel -> as, archives, jmx, common, tests
esb -> as, jst, common, tests
jbpm -> flow, common -> tests
runtime-soa -> runtime
13 years, 8 months
JBoss Tools SVN: r40835 - in trunk/openshift/docs/reference/en-US: images/Creating_an_OpenShift_Express_Application and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-05-08 02:01:18 -0400 (Tue, 08 May 2012)
New Revision: 40835
Modified:
trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_01.png
Log:
updated image
Modified: trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml
===================================================================
--- trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml 2012-05-08 05:40:46 UTC (rev 40834)
+++ trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml 2012-05-08 06:01:18 UTC (rev 40835)
@@ -3,7 +3,7 @@
<chapter id="chap-OpenSift_Tools_Reference_Guide-Creating_an_OpenShift_Application">
<title>Creating an OpenShift Application</title>
<para>
- From the workbench go to <menuchoice><guimenuitem>File</guimenuitem><guimenuitem>New</guimenuitem><guimenuitem>Other</guimenuitem></menuchoice>.
+ The <guilabel>OpenShift Application</guilabel> creation wizard is accessed through <guilabel>JBoss Central</guilabel> or by navigating to <menuchoice><guimenuitem>File</guimenuitem><guimenuitem>New</guimenuitem><guimenuitem>Other</guimenuitem></menuchoice>.
</para>
<figure id="application_creation_01">
<title>Selecting the OpenShift Application wizard</title>
@@ -13,13 +13,13 @@
</imageobject>
<textobject>
<phrase>
- Wizard selection screen with the OpenShift Application wizard selected.
+ JBoss Central home screen.
</phrase>
</textobject>
</mediaobject>
</figure>
<para>
- In the wizard, go to and select <menuchoice><guimenuitem>OpenShift</guimenuitem><guimenuitem>OpenShift Application</guimenuitem></menuchoice>. With the wizard choice selected, click on the <guibutton>Next</guibutton> button.
+ After clicking on the <guilabel>OpenShift Application</guilabel> link, the creation wizard will launch.
</para>
<figure id="application_creation_02">
<title>Validating OpenShift credentials</title>
Modified: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_01.png
===================================================================
(Binary files differ)
13 years, 8 months
JBoss Tools SVN: r40834 - in trunk/openshift/docs/reference/en-US: images and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-05-08 01:40:46 -0400 (Tue, 08 May 2012)
New Revision: 40834
Added:
trunk/openshift/docs/reference/en-US/Viewing_the_remote_console.xml
trunk/openshift/docs/reference/en-US/images/OpenShift_Remote_Console/
trunk/openshift/docs/reference/en-US/images/OpenShift_Remote_Console/openshift_remote_console_01.png
trunk/openshift/docs/reference/en-US/images/OpenShift_Remote_Console/openshift_remote_console_02.png
Modified:
trunk/openshift/docs/reference/en-US/Book_Info.xml
trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml
trunk/openshift/docs/reference/en-US/Introduction.xml
trunk/openshift/docs/reference/en-US/Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml
trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.xml
trunk/openshift/docs/reference/en-US/master.xml
Log:
updated to remove 'express' branding
Modified: trunk/openshift/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/openshift/docs/reference/en-US/Book_Info.xml 2012-05-08 03:46:10 UTC (rev 40833)
+++ trunk/openshift/docs/reference/en-US/Book_Info.xml 2012-05-08 05:40:46 UTC (rev 40834)
@@ -13,7 +13,7 @@
<edition>5.0.0</edition>
- <pubsnumber>5</pubsnumber>
+ <pubsnumber>7</pubsnumber>
<abstract>
<para>
Modified: trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml
===================================================================
--- trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml 2012-05-08 03:46:10 UTC (rev 40833)
+++ trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml 2012-05-08 05:40:46 UTC (rev 40834)
@@ -1,25 +1,25 @@
<?xml version='1.0' encoding='utf-8' ?>
- <chapter id="chap-OpenSift_Tools_Reference_Guide-Creating_an_OpenShift_Express_Application">
- <title>Creating an OpenShift Express Application</title>
+ <chapter id="chap-OpenSift_Tools_Reference_Guide-Creating_an_OpenShift_Application">
+ <title>Creating an OpenShift Application</title>
<para>
From the workbench go to <menuchoice><guimenuitem>File</guimenuitem><guimenuitem>New</guimenuitem><guimenuitem>Other</guimenuitem></menuchoice>.
</para>
<figure id="application_creation_01">
- <title>Selecting the OpenShift Express Application wizard</title>
+ <title>Selecting the OpenShift Application wizard</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_01.png" format="PNG" />
</imageobject>
<textobject>
<phrase>
- Wizard selection screen with the OpenShift Express Application wizard selected.
+ Wizard selection screen with the OpenShift Application wizard selected.
</phrase>
</textobject>
</mediaobject>
</figure>
<para>
- In the wizard, go to and select <menuchoice><guimenuitem>OpenShift</guimenuitem><guimenuitem>OpenShift Express Application</guimenuitem></menuchoice>. With the wizard choice selected, click on the <guibutton>Next</guibutton> button.
+ In the wizard, go to and select <menuchoice><guimenuitem>OpenShift</guimenuitem><guimenuitem>OpenShift Application</guimenuitem></menuchoice>. With the wizard choice selected, click on the <guibutton>Next</guibutton> button.
</para>
<figure id="application_creation_02">
<title>Validating OpenShift credentials</title>
@@ -35,10 +35,10 @@
</mediaobject>
</figure>
<para>
- If you have already signed up for an OpenShift Express account then you can input your <guilabel>Username</guilabel> and <guilabel>Password</guilabel> here and click <guilabel>Validate</guilabel>. If validation is successful you will see the button is now unavailable and no error was presented.
+ If you have already signed up for an OpenShift account then you can input your <guilabel>Username</guilabel> and <guilabel>Password</guilabel> here and click <guilabel>Validate</guilabel>. If validation is successful you will see the button is now unavailable and no error was presented.
</para>
<para>
- If you do not have an OpenShift Express account, you can create one through the link at the top of the wizard screen. This will open the OpenShift sign-up page within your workbench. Once you have created an account you will need to relaunch the <guilabel>OpenShift Express Application</guilabel> wizard and input your new username and password.
+ If you do not have an OpenShift account, you can create one through the link at the top of the wizard screen. This will open the OpenShift sign-up page within your workbench. Once you have created an account you will need to relaunch the <guilabel>OpenShift Application</guilabel> wizard and input your new username and password.
</para>
<para>
Click the <guibutton>Next</guibutton> button to proceed.
@@ -84,14 +84,14 @@
Click the <guibutton>New</guibutton> in the <guilabel>Available Applications</guilabel> section of the wizard to begin creating your first OpenShift application for the specified domain.
</para>
<figure id="application_creation_05">
- <title>Creating a new OpenShift Express application</title>
+ <title>Creating a new OpenShift application</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_05.png" format="PNG" />
</imageobject>
<textobject>
<phrase>
- Specifying the name and cartridge for the new OpenShift Express application.
+ Specifying the name and cartridge for the new OpenShift application.
</phrase>
</textobject>
</mediaobject>
@@ -193,7 +193,7 @@
In the <guilabel>Git clone</guilabel> section of the window sets the properties for creating a local copy of your application for you to work with. The location of your application in the Git repository of your domain is present in the <guilabel>Cloning From</guilabel> field. The <guilabel>Destination</guilabel> and <guilabel>Remote name</guilabel> options will be set to default automatically, however you are able to change these by deselecting the <property>default</property> option and specifying custom settings in the fields provided.
</para>
<para>
- The <guilabel>JBoss Server adapter</guilabel> section of the window will have the option to <property>Create a JBoss server adapter</property> selected automatically. Creating a JBoss server adapter will allow you to publish changes you make to your application, back to your OpenShift Express domain.
+ The <guilabel>JBoss Server adapter</guilabel> section of the window will have the option to <property>Create a JBoss server adapter</property> selected automatically. Creating a JBoss server adapter will allow you to publish changes you make to your application, back to your OpenShift domain.
</para>
<para>
Click the <guibutton>Finish</guibutton> to begin the cloning of the Git repository.
Modified: trunk/openshift/docs/reference/en-US/Introduction.xml
===================================================================
--- trunk/openshift/docs/reference/en-US/Introduction.xml 2012-05-08 03:46:10 UTC (rev 40833)
+++ trunk/openshift/docs/reference/en-US/Introduction.xml 2012-05-08 05:40:46 UTC (rev 40834)
@@ -3,7 +3,7 @@
<chapter id="chap-OpenSift_Tools_Reference_Guide-Introduction">
<title>Introduction</title>
<para>
- OpenShift is a cloud solution for your application server requirements. OpenShift Express in particular is a free, cloud-based application platform for Java, Perl, PHP, Python, and Ruby applications. JBoss Developer Studio supports OpenShift Express and this guide will show you how to connect, create and deploy with OpenShift Express from your JBoss Developer Studio workbench.
+ OpenShift is a cloud solution for your application server requirements. OpenShift is a cloud-based application platform for Java, Perl, PHP, Python, and Ruby applications. JBoss Developer Studio supports OpenShift deployments and this guide will show you how to connect, create and deploy with OpenShift from your JBoss Developer Studio workbench.
</para>
</chapter>
Modified: trunk/openshift/docs/reference/en-US/Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml
===================================================================
--- trunk/openshift/docs/reference/en-US/Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml 2012-05-08 03:46:10 UTC (rev 40833)
+++ trunk/openshift/docs/reference/en-US/Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml 2012-05-08 05:40:46 UTC (rev 40834)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8' ?>
<chapter id="chap-OpenSift_Tools_Reference_Guide-Modifying_your_web_application_to_deploy_to_OpenShift_Express">
- <title>Modifying your Maven web application to deploy to OpenShift Express</title>
+ <title>Modifying your Maven Web Application to Deploy to OpenShift</title>
<para>
Open the <filename>pom.xml</filename> file of your web application in the editor by double-clicking on the file in your <guilabel>Project Explorer</guilabel> and selecting the <guilabel>pom.xml</guilabel> tab in your workbench.
</para>
@@ -9,10 +9,10 @@
Create <code>profiles</code> tags within the <code>project</code> tags of the <filename>pom.xml</filename> file. Within the <code>profiles</code> tags, press <keycap>Ctrl</keycap> and <keysym>Spacebar</keysym> together to trigger auto-completion.
</para>
<para>
- From the auto-completion menu, select <guimenuitem>OpenShift Express profile</guimenuitem>. The profile information to connect to OpenShift Express will be inserted.
+ From the auto-completion menu, select <guimenuitem>OpenShift profile</guimenuitem>. The profile information to connect to OpenShift will be inserted.
</para>
<figure id="openshift_express_profile_01">
- <title>Selecting the OpenShift Express Profile</title>
+ <title>Selecting the OpenShift Profile</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/OpenShift_Express_Profile/openshift_express_profile_01.png" format="PNG" />
Modified: trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.xml
===================================================================
--- trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.xml 2012-05-08 03:46:10 UTC (rev 40833)
+++ trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.xml 2012-05-08 05:40:46 UTC (rev 40834)
@@ -6,6 +6,7 @@
<xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Creating_an_OpenShift_Express_Application.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Viewing_the_remote_console.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Added: trunk/openshift/docs/reference/en-US/Viewing_the_remote_console.xml
===================================================================
--- trunk/openshift/docs/reference/en-US/Viewing_the_remote_console.xml (rev 0)
+++ trunk/openshift/docs/reference/en-US/Viewing_the_remote_console.xml 2012-05-08 05:40:46 UTC (rev 40834)
@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='utf-8' ?>
+
+<chapter id="chap-OpenSift_Tools_Reference_Guide-Viewing_the_remote_console">
+ <title>Viewing the Remote Console</title>
+ <note>
+ <para>
+ If you have not yet created an OpenShift server adapter, follow the instructions in <xref linkend="chap-OpenSift_Tools_Reference_Guide-Creating_an_OpenShift_Application" />.
+ </para>
+ </note>
+ <para>
+ Similar to when you are running a server locally, you are also able to see console output for your remote OpenShift server. To have this output displayed to you, right-click on your OpenShift server in the <guilabel>Servers</guilabel> tab and select <menuchoice><guimenuitem>Show In</guimenuitem><guimenuitem>Remote console</guimenuitem></menuchoice>.
+ </para>
+ <figure id="openshift_remote_console_01">
+ <title>Selecting the OpenShift Profile</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/OpenShift_Remote_Console/openshift_remote_console_01.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Selecting the remote console for the OpenShift server adapter.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ A new tab will open called <guilabel>Console</guilabel> and display the last 100 lines of the servers <filename>boot.log</filename> and <filename>server.log</filename> files. This <guilabel>Console</guilabel> tab will now tail the content of these files on the server, outputing any updates to you, as they occur.
+ </para>
+ <figure id="openshift_remote_console_02">
+ <title>Selecting the OpenShift Profile</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/OpenShift_Remote_Console/openshift_remote_console_02.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ The Openshift remote console tab.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ This information can be useful in debugging the remote server and ensuring processes are occuring as expected.
+ </para>
+</chapter>
+
Added: trunk/openshift/docs/reference/en-US/images/OpenShift_Remote_Console/openshift_remote_console_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/openshift/docs/reference/en-US/images/OpenShift_Remote_Console/openshift_remote_console_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openshift/docs/reference/en-US/images/OpenShift_Remote_Console/openshift_remote_console_02.png
===================================================================
(Binary files differ)
Property changes on: trunk/openshift/docs/reference/en-US/images/OpenShift_Remote_Console/openshift_remote_console_02.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/openshift/docs/reference/en-US/master.xml
===================================================================
--- trunk/openshift/docs/reference/en-US/master.xml 2012-05-08 03:46:10 UTC (rev 40833)
+++ trunk/openshift/docs/reference/en-US/master.xml 2012-05-08 05:40:46 UTC (rev 40834)
@@ -5,6 +5,8 @@
[<!ENTITY Preface SYSTEM "Preface.xml">
<!ENTITY Introduction SYSTEM "Introduction.xml">
<!ENTITY Creating_Express_Application SYSTEM "Creating_an_OpenShift_Express_Application.xml">
+<!ENTITY Viewing_Remote_Console SYSTEM "Viewing_the_remote_console.xml">
+<!ENTITY Modify_Existing_Application SYSTEM "Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml">
<!ENTITY Revision_History SYSTEM "Revision_History.xml">
]>
@@ -50,6 +52,8 @@
<!-- &Preface; -->
&Introduction;
&Creating_Express_Application;
+ &Viewing_Remote_Console;
+ &Modify_Existing_Application;
&Revision_History;
</book>
13 years, 8 months