JBoss Tools SVN: r35088 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-27 18:06:37 -0400 (Tue, 27 Sep 2011)
New Revision: 35088
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReference.java
Log:
JBIDE-9785
https://issues.jboss.org/browse/JBIDE-9785
KB model file storage is reduced.
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReference.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReference.java 2011-09-27 21:37:55 UTC (rev 35087)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReference.java 2011-09-27 22:06:37 UTC (rev 35088)
@@ -12,8 +12,11 @@
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import javax.swing.text.html.HTMLEditorKit.LinkController;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
@@ -311,18 +314,31 @@
* Store this EL into XML element.
* @param element
*/
- public synchronized void store(Element element) {
- element.setAttribute("path", path.toString()); //$NON-NLS-1$
+ public synchronized void store(Element element, Map<String,String> pathIds) {
+ element.setAttribute("path", getAlias(pathIds, path.toString())); //$NON-NLS-1$
element.setAttribute("offset", "" + startPosition); //$NON-NLS-1$ //$NON-NLS-2$
element.setAttribute("length", "" + length); //$NON-NLS-1$ //$NON-NLS-2$
}
+ public static String getAlias(Map<String, String> pathAliases, String path) {
+ String result = pathAliases.get(path);
+ if(result == null) {
+ result = "%" + pathAliases.size(); //$NON-NLS-1$
+ pathAliases.put(path, result);
+ }
+ return result;
+ }
+
+ public static String getPath(Map<String, String> pathAliases, String alias) {
+ return pathAliases.containsKey(alias) ? pathAliases.get(alias) : alias;
+ }
+
/**
* Load this EL from XML element.
* @param element
*/
- public synchronized void load(Element element) {
- path = new Path(element.getAttribute("path")); //$NON-NLS-1$
+ public synchronized void load(Element element, Map<String, String> pathAliases) {
+ path = new Path(getPath(pathAliases, element.getAttribute("path"))); //$NON-NLS-1$
startPosition = new Integer(element.getAttribute("offset")); //$NON-NLS-1$
length = new Integer(element.getAttribute("length")); //$NON-NLS-1$
}
14 years, 2 months
JBoss Tools SVN: r35087 - trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/model and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-09-27 17:37:55 -0400 (Tue, 27 Sep 2011)
New Revision: 35087
Added:
workspace/snjeza/org.jboss.tools.central.update/features/org.jboss.tools.central.feature_1.0.0.201109272333.jar
workspace/snjeza/org.jboss.tools.central.update/plugins/org.jboss.tools.central_1.0.0.201109272333.jar
Removed:
workspace/snjeza/org.jboss.tools.central.update/features/org.jboss.tools.central.feature_1.0.0.201109261851.jar
workspace/snjeza/org.jboss.tools.central.update/plugins/org.jboss.tools.central_1.0.0.201109261851.jar
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/model/NewsEntry.java
workspace/snjeza/org.jboss.tools.central.update/artifacts.jar
workspace/snjeza/org.jboss.tools.central.update/content.jar
workspace/snjeza/org.jboss.tools.central.update/site.xml
Log:
JBIDE-9368 Dashboard(s) for easy news aggregation, twitter and easy additional/3rd party plugin installation and project template/creation
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2011-09-27 21:34:27 UTC (rev 35086)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2011-09-27 21:37:55 UTC (rev 35087)
@@ -36,6 +36,7 @@
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.preference.PreferenceDialog;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.JFaceColors;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -48,9 +49,6 @@
import org.eclipse.swt.events.ControlEvent;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
@@ -80,8 +78,9 @@
import org.eclipse.ui.forms.widgets.ImageHyperlink;
import org.eclipse.ui.forms.widgets.ScrolledForm;
import org.eclipse.ui.forms.widgets.Section;
+import org.eclipse.ui.forms.widgets.TableWrapData;
+import org.eclipse.ui.forms.widgets.TableWrapLayout;
import org.eclipse.ui.ide.IDEActionFactory;
-import org.eclipse.ui.internal.forms.widgets.FormFonts;
import org.eclipse.ui.menus.CommandContributionItem;
import org.eclipse.ui.part.PageBook;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -110,8 +109,6 @@
private ScrolledForm form;
private PageBook newsPageBook;
private ScrolledComposite scrollComposite;
- private static Font authorFont;
- private Font linkFont;
private RefreshNewsJobChangeListener refreshNewsJobChangeListener;
private FormText newsNoteText;
private FormText tutorialsNoteText;
@@ -169,20 +166,11 @@
};
form.addControlListener(controlAdapter);
- final PaintListener paintListener = new PaintListener() {
-
- @Override
- public void paintControl(PaintEvent e) {
- resize();
- }
- };
- //form.addPaintListener(paintListener);
form.addDisposeListener(new DisposeListener() {
@Override
public void widgetDisposed(DisposeEvent e) {
form.removeControlListener(controlAdapter);
- //form.removePaintListener(paintListener);
form.removeDisposeListener(this);
}
});
@@ -197,7 +185,6 @@
//gd.widthHint = 350;
//gd.heightHint = 100;
newsSection.setLayoutData(gd);
- linkFont = newsSection.getFont();
createNewsToolbar(toolkit, newsSection);
scrollComposite = new ScrolledComposite(newsSection, SWT.V_SCROLL);
@@ -224,9 +211,9 @@
newsExceptionText = createExceptionText(toolkit, newsPageBook);
newsComposite = toolkit.createComposite(newsPageBook, SWT.NONE);
- newsComposite.setLayout(new GridLayout());
- gd =new GridData(SWT.FILL, SWT.FILL, false, false);
- newsComposite.setLayoutData(gd);
+ newsComposite.setLayout(new TableWrapLayout());
+ GridDataFactory.fillDefaults().grab(true, false).applyTo(newsComposite);
+ //newsComposite.setLayoutData(gd);
newsSection.setClient(scrollComposite);
showLoading(newsPageBook, newsLoadingComposite, scrollComposite);
@@ -631,23 +618,7 @@
}
});
}
-
- private Font getAuthorFont(Display display) {
- if (authorFont == null) {
- Font font = JFaceResources.getDefaultFont();
- authorFont = FormFonts.getInstance().getBoldFont(display, font);
- }
- return authorFont;
- }
- private Font getLinkFont(Display display) {
- if (linkFont == null) {
- linkFont = JFaceResources.getDefaultFont();
- }
- return linkFont;
- }
-
-
private void showException(PageBook pageBook, FormText exceptionText, Exception e) {
JBossCentralActivator.log(e);
String message = StringEscapeUtils.escapeXml(e.getMessage());
@@ -808,12 +779,19 @@
}
String text = entry.getFormString();
final FormText formText = toolkit.createFormText(newsComposite, true);
+ TableWrapData td = new TableWrapData();
+ td.indent = 2;
+ Point size = newsComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ td.maxWidth = size.x - 2;
formText.setText(text, true, true);
- Display display = Display.getCurrent();
- formText.setFont(getLinkFont(display));
+ //Display display = Display.getCurrent();
+ //formText.setFont(getLinkFont(display));
formText.setFont("default", JFaceResources.getDefaultFont());
- Font boldFont = getAuthorFont(display);
- formText.setFont("author", boldFont);
+ //formText.setForeground(JFaceColors.getHyperlinkText(getDisplay()));
+ formText.setFont("description", JFaceResources.getDefaultFont());
+ //Font boldFont = getAuthorFont(display);
+ //formText.setFont("author", boldFont);
+ formText.setColor("author", JFaceColors.getHyperlinkText(getDisplay()));
formText.setImage("image", getNewsImage());
if (entry.getDescription() != null && !entry.getDescription().isEmpty()) {
ToolTip toolTip = new NewsToolTip(formText, entry.getDescription());
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/model/NewsEntry.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/model/NewsEntry.java 2011-09-27 21:34:27 UTC (rev 35086)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/model/NewsEntry.java 2011-09-27 21:37:55 UTC (rev 35087)
@@ -2,6 +2,7 @@
import java.util.Date;
+import org.apache.commons.lang.StringEscapeUtils;
import org.jboss.tools.central.JBossCentralActivator;
public class NewsEntry {
@@ -10,10 +11,8 @@
private String description;
private String author;
private Date date;
-
-
+
public NewsEntry() {
-
}
public NewsEntry(String title, String link, String description,
@@ -24,34 +23,43 @@
this.author = author;
this.date = date;
}
-
+
public String getTitle() {
return title;
}
+
public void setTitle(String title) {
this.title = title;
}
+
public String getLink() {
return link;
}
+
public void setLink(String link) {
this.link = link;
}
+
public String getDescription() {
return description;
}
+
public void setDescription(String description) {
this.description = description;
}
+
public String getAuthor() {
return author;
}
+
public void setAuthor(String author) {
this.author = author;
}
+
public Date getDate() {
return date;
}
+
public void setDate(Date date) {
this.date = date;
}
@@ -71,32 +79,83 @@
}
buffer.append("<br/>");
boolean cr = false;
- buffer.append("<span font=\"default\">");
if (date != null) {
+ buffer.append("<span font=\"default\">");
buffer.append("posted on ");
buffer.append(date);
+ buffer.append("</span>");
cr = true;
}
- buffer.append("</span>");
if (author != null && !author.isEmpty()) {
buffer.append(" ");
buffer.append("<span font=\"default\">");
buffer.append(" by");
buffer.append("</span>");
buffer.append(" ");
- buffer.append("<span font=\"author\">");
+ buffer.append("<span color=\"author\" font=\"author\">");
buffer.append(author);
buffer.append("</span>");
cr = true;
}
if (cr) {
- buffer.append("<br />");
+ buffer.append("<br/>");
}
- //buffer.append("<br />");
+ String shortDescription = getShortDescription();
+ cr = false;
+ if (shortDescription != null && !shortDescription.isEmpty()) {
+ buffer.append("<span font=\"description\">");
+ buffer.append(shortDescription);
+ buffer.append("</span>");
+ cr = true;
+ }
+ if (cr) {
+ buffer.append("<br/><br/>");
+ }
buffer.append(JBossCentralActivator.FORM_END_TAG);
return buffer.toString();
}
+
+ public String getShortDescription() {
+ if (description == null) {
+ return null;
+ }
+ boolean tagStarted = false;
+ StringBuffer buffer = new StringBuffer();
+ for (char c:description.toCharArray()) {
+ if (c == '<') {
+ tagStarted = true;
+ }
+ if (c == '>') {
+ tagStarted = false;
+ } else {
+ if (!tagStarted) {
+ buffer.append(c);
+ }
+ }
+ }
+ char[] chars = StringEscapeUtils.unescapeHtml(buffer.toString().trim()).toCharArray();
+ buffer = new StringBuffer();
+ int i = 0;
+ for (char c:chars) {
+ if (i++ < 140) {
+ buffer.append(c);
+ } else {
+ if ( (c == '_') ||
+ (c >= 'a' && c <= 'z') ||
+ (c >= 'a' && c <= 'Z') ||
+ (c >= '0' && c <= '9') ) {
+ buffer.append(c);
+ } else {
+ break;
+ }
+ }
+ }
+ if (buffer.length() > 0) {
+ buffer.append("...");
+ }
+ return buffer.toString();
+ }
@Override
public String toString() {
Modified: workspace/snjeza/org.jboss.tools.central.update/artifacts.jar
===================================================================
(Binary files differ)
Modified: workspace/snjeza/org.jboss.tools.central.update/content.jar
===================================================================
(Binary files differ)
Deleted: workspace/snjeza/org.jboss.tools.central.update/features/org.jboss.tools.central.feature_1.0.0.201109261851.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.central.update/features/org.jboss.tools.central.feature_1.0.0.201109272333.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.central.update/features/org.jboss.tools.central.feature_1.0.0.201109272333.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/org.jboss.tools.central.update/plugins/org.jboss.tools.central_1.0.0.201109261851.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.central.update/plugins/org.jboss.tools.central_1.0.0.201109272333.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.central.update/plugins/org.jboss.tools.central_1.0.0.201109272333.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: workspace/snjeza/org.jboss.tools.central.update/site.xml
===================================================================
--- workspace/snjeza/org.jboss.tools.central.update/site.xml 2011-09-27 21:34:27 UTC (rev 35086)
+++ workspace/snjeza/org.jboss.tools.central.update/site.xml 2011-09-27 21:37:55 UTC (rev 35087)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.jboss.tools.central.feature_1.0.0.201109261851.jar" id="org.jboss.tools.central.feature" version="1.0.0.201109261851">
+ <feature url="features/org.jboss.tools.central.feature_1.0.0.201109272333.jar" id="org.jboss.tools.central.feature" version="1.0.0.201109272333">
<category name="org.jboss.tools.central"/>
</feature>
<category-def name="org.jboss.tools.central" label="JBoss Central"/>
14 years, 2 months
JBoss Tools SVN: r35086 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-09-27 17:34:27 -0400 (Tue, 27 Sep 2011)
New Revision: 35086
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectCDIAnnotationDialog.java
Log:
We need icon images for CDI Tools UI https://issues.jboss.org/browse/JBIDE-9717
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectCDIAnnotationDialog.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectCDIAnnotationDialog.java 2011-09-27 21:20:45 UTC (rev 35085)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectCDIAnnotationDialog.java 2011-09-27 21:34:27 UTC (rev 35086)
@@ -41,6 +41,7 @@
import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog;
import org.eclipse.ui.dialogs.SearchPattern;
import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.CDIImages;
import org.jboss.tools.cdi.core.ICDIAnnotation;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
@@ -276,7 +277,10 @@
public class CDIAnnotationLabelProvider implements ILabelProvider {
public Image getImage(Object element) {
- return null; //TODO
+ if (element instanceof CDIAnnotationWrapper) {
+ return CDIImages.getImageByElement(((CDIAnnotationWrapper) element).getComponent());
+ }
+ return null;
}
public String getText(Object element) {
14 years, 2 months
JBoss Tools SVN: r35085 - in trunk/as: plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-27 17:20:45 -0400 (Tue, 27 Sep 2011)
New Revision: 35085
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IDomain.java
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IDomain.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Application.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Domain.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/InternalUser.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/unmarshalling/DomainResponseUnmarshaller.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainIntegrationTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java
Log:
[JBIDE-9781] move IDomain to the exported package
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IDomain.java (from rev 35081, trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IDomain.java)
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IDomain.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IDomain.java 2011-09-27 21:20:45 UTC (rev 35085)
@@ -0,0 +1,10 @@
+package org.jboss.ide.eclipse.as.openshift.core;
+
+
+public interface IDomain {
+
+ public abstract String getNamespace() throws OpenshiftException;
+
+ public abstract String getRhcDomain() throws OpenshiftException;
+
+}
\ No newline at end of file
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IDomain.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java 2011-09-27 21:17:14 UTC (rev 35084)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java 2011-09-27 21:20:45 UTC (rev 35085)
@@ -12,7 +12,6 @@
import java.util.Collection;
-import org.jboss.ide.eclipse.as.openshift.core.internal.IDomain;
/**
* @author André Dietisheim
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Application.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Application.java 2011-09-27 21:17:14 UTC (rev 35084)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Application.java 2011-09-27 21:20:45 UTC (rev 35085)
@@ -16,6 +16,7 @@
import org.jboss.ide.eclipse.as.openshift.core.ApplicationLogReader;
import org.jboss.ide.eclipse.as.openshift.core.IApplication;
import org.jboss.ide.eclipse.as.openshift.core.ICartridge;
+import org.jboss.ide.eclipse.as.openshift.core.IDomain;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
/**
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Domain.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Domain.java 2011-09-27 21:17:14 UTC (rev 35084)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Domain.java 2011-09-27 21:20:45 UTC (rev 35085)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.openshift.core.internal;
+import org.jboss.ide.eclipse.as.openshift.core.IDomain;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IDomain.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IDomain.java 2011-09-27 21:17:14 UTC (rev 35084)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IDomain.java 2011-09-27 21:20:45 UTC (rev 35085)
@@ -1,11 +0,0 @@
-package org.jboss.ide.eclipse.as.openshift.core.internal;
-
-import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
-
-public interface IDomain {
-
- public abstract String getNamespace() throws OpenshiftException;
-
- public abstract String getRhcDomain() throws OpenshiftException;
-
-}
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java 2011-09-27 21:17:14 UTC (rev 35084)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java 2011-09-27 21:20:45 UTC (rev 35085)
@@ -14,6 +14,7 @@
import org.jboss.ide.eclipse.as.openshift.core.IApplication;
import org.jboss.ide.eclipse.as.openshift.core.ICartridge;
+import org.jboss.ide.eclipse.as.openshift.core.IDomain;
import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/InternalUser.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/InternalUser.java 2011-09-27 21:17:14 UTC (rev 35084)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/InternalUser.java 2011-09-27 21:20:45 UTC (rev 35085)
@@ -17,6 +17,7 @@
import org.jboss.ide.eclipse.as.openshift.core.IApplication;
import org.jboss.ide.eclipse.as.openshift.core.ICartridge;
+import org.jboss.ide.eclipse.as.openshift.core.IDomain;
import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey;
import org.jboss.ide.eclipse.as.openshift.core.IUser;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-27 21:17:14 UTC (rev 35084)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-27 21:20:45 UTC (rev 35085)
@@ -16,6 +16,7 @@
import org.jboss.ide.eclipse.as.openshift.core.IApplication;
import org.jboss.ide.eclipse.as.openshift.core.ICartridge;
+import org.jboss.ide.eclipse.as.openshift.core.IDomain;
import org.jboss.ide.eclipse.as.openshift.core.IHttpClient;
import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey;
import org.jboss.ide.eclipse.as.openshift.core.InvalidCredentialsOpenshiftException;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/unmarshalling/DomainResponseUnmarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/unmarshalling/DomainResponseUnmarshaller.java 2011-09-27 21:17:14 UTC (rev 35084)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/unmarshalling/DomainResponseUnmarshaller.java 2011-09-27 21:20:45 UTC (rev 35085)
@@ -11,8 +11,8 @@
package org.jboss.ide.eclipse.as.openshift.core.internal.response.unmarshalling;
import org.jboss.dmr.ModelNode;
+import org.jboss.ide.eclipse.as.openshift.core.IDomain;
import org.jboss.ide.eclipse.as.openshift.core.internal.Domain;
-import org.jboss.ide.eclipse.as.openshift.core.internal.IDomain;
import org.jboss.ide.eclipse.as.openshift.core.internal.InternalUser;
/**
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainIntegrationTest.java 2011-09-27 21:17:14 UTC (rev 35084)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainIntegrationTest.java 2011-09-27 21:20:45 UTC (rev 35085)
@@ -13,8 +13,8 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import org.jboss.ide.eclipse.as.openshift.core.IDomain;
import org.jboss.ide.eclipse.as.openshift.core.SSHKeyPair;
-import org.jboss.ide.eclipse.as.openshift.core.internal.IDomain;
import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService;
import org.jboss.ide.eclipse.as.openshift.test.internal.core.fakes.TestSSHKey;
import org.jboss.ide.eclipse.as.openshift.test.internal.core.fakes.TestUser;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainTest.java 2011-09-27 21:17:14 UTC (rev 35084)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainTest.java 2011-09-27 21:20:45 UTC (rev 35085)
@@ -17,9 +17,9 @@
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import org.jboss.ide.eclipse.as.openshift.core.IDomain;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
import org.jboss.ide.eclipse.as.openshift.core.SSHKeyPair;
-import org.jboss.ide.eclipse.as.openshift.core.internal.IDomain;
import org.jboss.ide.eclipse.as.openshift.core.internal.InternalUser;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.ChangeDomainRequest;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.CreateDomainRequest;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserTest.java 2011-09-27 21:17:14 UTC (rev 35084)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserTest.java 2011-09-27 21:20:45 UTC (rev 35085)
@@ -25,10 +25,10 @@
import org.jboss.ide.eclipse.as.openshift.core.Cartridge;
import org.jboss.ide.eclipse.as.openshift.core.IApplication;
import org.jboss.ide.eclipse.as.openshift.core.ICartridge;
+import org.jboss.ide.eclipse.as.openshift.core.IDomain;
import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
import org.jboss.ide.eclipse.as.openshift.core.internal.ApplicationInfo;
-import org.jboss.ide.eclipse.as.openshift.core.internal.IDomain;
import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService;
import org.jboss.ide.eclipse.as.openshift.core.internal.InternalUser;
import org.jboss.ide.eclipse.as.openshift.core.internal.UserInfo;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java 2011-09-27 21:17:14 UTC (rev 35084)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java 2011-09-27 21:20:45 UTC (rev 35085)
@@ -14,10 +14,10 @@
import org.jboss.ide.eclipse.as.openshift.core.IApplication;
import org.jboss.ide.eclipse.as.openshift.core.ICartridge;
+import org.jboss.ide.eclipse.as.openshift.core.IDomain;
import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
import org.jboss.ide.eclipse.as.openshift.core.internal.Application;
-import org.jboss.ide.eclipse.as.openshift.core.internal.IDomain;
import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService;
import org.jboss.ide.eclipse.as.openshift.core.internal.InternalUser;
import org.jboss.ide.eclipse.as.openshift.core.internal.UserInfo;
14 years, 2 months
JBoss Tools SVN: r35084 - trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-27 17:17:14 -0400 (Tue, 27 Sep 2011)
New Revision: 35084
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftIntegrationTestSuite.java
Log:
[JBIDE-9773] added ApplicationLogReaderIntegrationTest to test suite
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftIntegrationTestSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftIntegrationTestSuite.java 2011-09-27 21:15:52 UTC (rev 35083)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftIntegrationTestSuite.java 2011-09-27 21:17:14 UTC (rev 35084)
@@ -17,11 +17,11 @@
@RunWith(Suite.class)
@Suite.SuiteClasses({
ApplicationIntegrationTest.class,
+ ApplicationLogReaderIntegrationTest.class,
CartridgesIntegrationTest.class,
DomainIntegrationTest.class,
ListCartridgesIntegrationTest.class,
- UserInfoIntegrationTest.class,
- ApplicationLogReaderIntegrationTest.class
+ UserInfoIntegrationTest.class
})
/**
* @author André Dietisheim
14 years, 2 months
JBoss Tools SVN: r35083 - trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-27 17:15:52 -0400 (Tue, 27 Sep 2011)
New Revision: 35083
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftTestSuite.java
Log:
[JBIDE-9773] added ApplicationLogReaderTest to test suite
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftTestSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftTestSuite.java 2011-09-27 21:13:25 UTC (rev 35082)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftTestSuite.java 2011-09-27 21:15:52 UTC (rev 35083)
@@ -17,6 +17,7 @@
@RunWith(Suite.class)
@Suite.SuiteClasses({
ApplicationTest.class,
+ ApplicationLogReaderTest.class,
ListCartridgesTest.class,
DomainTest.class,
UserInfoTest.class,
14 years, 2 months
JBoss Tools SVN: r35082 - in trunk/as: tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-27 17:13:25 -0400 (Tue, 27 Sep 2011)
New Revision: 35082
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java
Log:
[JBIDE-9773] ApplicationLogReader correcte, ApplicationLogReaderTest and ApplicationLogReaderIntegrationTests implemented
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java 2011-09-27 21:10:13 UTC (rev 35081)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java 2011-09-27 21:13:25 UTC (rev 35082)
@@ -70,7 +70,8 @@
private String getLog(String status) throws IOException {
Matcher matcher = LOG_REGEX.matcher(status);
int logStart = 0;
- if (matcher.find()) {
+ if (matcher.find()
+ && matcher.end() < status.length()) {
logStart = matcher.end() + 1;
}
return status.substring(logStart);
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java 2011-09-27 21:10:13 UTC (rev 35081)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java 2011-09-27 21:13:25 UTC (rev 35082)
@@ -14,7 +14,6 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import java.io.IOException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -22,6 +21,8 @@
import org.jboss.ide.eclipse.as.openshift.core.ICartridge;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
import org.jboss.ide.eclipse.as.openshift.core.internal.Application;
+import org.jboss.ide.eclipse.as.openshift.core.internal.IOpenshiftService;
+import org.jboss.ide.eclipse.as.openshift.core.internal.InternalUser;
import org.jboss.ide.eclipse.as.openshift.test.internal.core.fakes.NoopOpenshiftServiceFake;
import org.junit.Before;
import org.junit.Test;
@@ -31,12 +32,50 @@
*/
public class ApplicationLogReaderTest {
- private static final int LOGREADER_TIMEOUT = 1 * 1024;
+ private static final int LOGREADER_TIMEOUT = 2 * 1024;
+
+ private static final String INITIAL_LOG =
+ "tailing /var/lib/libra/f36a4acf8a73450cb98637ed4483ea02/1317146294966//jbossas-7.0/standalone/log/server.log"
+ + "------ Tail of 1317146294966 application server.log ------\n"
+ + "11:31:36,289 INFO [org.jboss.as.ee] (Controller Boot Thread) Activating EE subsystem\n"
+ + "11:31:36,340 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-1) Starting Coyote HTTP/1.1 on http--127.1.9.1-8080\n"
+ + "11:31:36,440 INFO [org.jboss.as.connector] (MSC service thread 1-4) Starting JCA Subsystem (JBoss IronJacamar 1.0.3.Final)\n"
+ + "11:31:36,471 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-1) Bound data source [java:jboss/datasources/ExampleDS]\n"
+ + "11:31:36,966 INFO [org.jboss.as.deployment] (MSC service thread 1-3) Started FileSystemDeploymentService for directory /var/lib/libra/b8ea642ed6aa4dd0af2a4fe94c0ff07c/1317137507620/jbossas-7.0/standalone/deployments\n"
+ + "11:31:36,982 INFO [org.jboss.as] (Controller Boot Thread) JBoss AS 7.0.1.Final \"Zap\" started in 2796ms - Started 82 of 107 services (22 services are passive or on-demand)\n"
+ + "11:31:37,004 INFO [org.jboss.as.server.deployment] (MSC service thread 1-2) Starting deployment of \"ROOT.war\"\n"
+ + "11:31:37,084 INFO [org.jboss.as.jpa] (MSC service thread 1-4) added javax.persistence.api dependency to ROOT.war\n"
+ + "11:31:37,403 INFO [org.jboss.web] (MSC service thread 1-3) registering web context: \n"
+ + "11:31:37,445 INFO [org.jboss.as.server.controller] (DeploymentScanner-threads - 2) Deployed \"ROOT.war\"\n";
+
+ private static final String LOG_CONTINUATION =
+ "11:32:13,187 INFO [org.apache.catalina.core.AprLifecycleListener] (MSC service thread 1-3) The Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib\n"
+ + "11:32:13,295 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-1) Starting Coyote HTTP/1.1 on http--127.1.9.1-8080\n"
+ + "11:32:13,344 INFO [org.jboss.as.connector] (MSC service thread 1-1) Starting JCA Subsystem (JBoss IronJacamar 1.0.3.Final)\n"
+ + "11:32:13,383 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-2) Bound data source [java:jboss/datasources/ExampleDS]\n"
+ + "11:32:13,746 INFO [org.jboss.as.deployment] (MSC service thread 1-2) Started FileSystemDeploymentService for directory /var/lib/libra/b8ea642ed6aa4dd0af2a4fe94c0ff07c/1317137507620/jbossas-7.0/standalone/deployments\n"
+ + "11:32:13,764 INFO [org.jboss.as] (Controller Boot Thread) JBoss AS 7.0.1.Final \"Zap\" started in 2736ms - Started 82 of 107 services (22 services are passive or on-demand)\n"
+ + "11:32:13,772 INFO [org.jboss.as.server.deployment] (MSC service thread 1-4) Starting deployment of \"ROOT.war\"\n"
+ + "11:32:13,868 INFO [org.jboss.as.jpa] (MSC service thread 1-1) added javax.persistence.api dependency to ROOT.war\n"
+ + "11:32:14,176 INFO [org.jboss.web] (MSC service thread 1-2) registering web context: \n"
+ + "11:32:14,207 INFO [org.jboss.as.server.controller] (DeploymentScanner-threads - 2) Deployed \"ROOT.war\"\n";
+
+ private String status = INITIAL_LOG;
+ private IOpenshiftService statusService;
private Application application;
@Before
public void setUp() {
- this.application = new ApplicationLogFake();
+ this.statusService = new NoopOpenshiftServiceFake() {
+
+ @Override
+ public String getStatus(String applicationName, ICartridge cartridge, InternalUser user)
+ throws OpenshiftException {
+ return status;
+ }
+ };
+
+ this.application = new ApplicationLogFake(statusService);
}
@Test
@@ -65,71 +104,16 @@
}
}
- private static class ApplicationLogFake extends Application {
+ private class ApplicationLogFake extends Application {
- private String log = INITIAL_LOG;
- private int logPos = 0;
-
- private static final String INITIAL_LOG =
- "tailing /var/lib/libra/f36a4acf8a73450cb98637ed4483ea02/1317146294966//jbossas-7.0/standalone/log/server.log"
- + "------ Tail of 1317146294966 application server.log ------"
- + "11:31:36,289 INFO [org.jboss.as.ee] (Controller Boot Thread) Activating EE subsystem"
- + "11:31:36,340 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-1) Starting Coyote HTTP/1.1 on http--127.1.9.1-8080"
- + "11:31:36,440 INFO [org.jboss.as.connector] (MSC service thread 1-4) Starting JCA Subsystem (JBoss IronJacamar 1.0.3.Final)"
- + "11:31:36,471 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-1) Bound data source [java:jboss/datasources/ExampleDS]"
- + "11:31:36,966 INFO [org.jboss.as.deployment] (MSC service thread 1-3) Started FileSystemDeploymentService for directory /var/lib/libra/b8ea642ed6aa4dd0af2a4fe94c0ff07c/1317137507620/jbossas-7.0/standalone/deployments"
- + "11:31:36,982 INFO [org.jboss.as] (Controller Boot Thread) JBoss AS 7.0.1.Final \"Zap\" started in 2796ms - Started 82 of 107 services (22 services are passive or on-demand)"
- + "11:31:37,004 INFO [org.jboss.as.server.deployment] (MSC service thread 1-2) Starting deployment of \"ROOT.war\""
- + "11:31:37,084 INFO [org.jboss.as.jpa] (MSC service thread 1-4) added javax.persistence.api dependency to ROOT.war"
- + "11:31:37,403 INFO [org.jboss.web] (MSC service thread 1-3) registering web context: "
- + "11:31:37,445 INFO [org.jboss.as.server.controller] (DeploymentScanner-threads - 2) Deployed \"ROOT.war\"";
-
- private static final String LOG_CONTINUATION =
- "11:32:13,187 INFO [org.apache.catalina.core.AprLifecycleListener] (MSC service thread 1-3) The Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"
- + "11:32:13,295 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-1) Starting Coyote HTTP/1.1 on http--127.1.9.1-8080"
- + "11:32:13,344 INFO [org.jboss.as.connector] (MSC service thread 1-1) Starting JCA Subsystem (JBoss IronJacamar 1.0.3.Final)"
- + "11:32:13,383 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-2) Bound data source [java:jboss/datasources/ExampleDS]"
- + "11:32:13,746 INFO [org.jboss.as.deployment] (MSC service thread 1-2) Started FileSystemDeploymentService for directory /var/lib/libra/b8ea642ed6aa4dd0af2a4fe94c0ff07c/1317137507620/jbossas-7.0/standalone/deployments"
- + "11:32:13,764 INFO [org.jboss.as] (Controller Boot Thread) JBoss AS 7.0.1.Final \"Zap\" started in 2736ms - Started 82 of 107 services (22 services are passive or on-demand)"
- + "11:32:13,772 INFO [org.jboss.as.server.deployment] (MSC service thread 1-4) Starting deployment of \"ROOT.war\""
- + "11:32:13,868 INFO [org.jboss.as.jpa] (MSC service thread 1-1) added javax.persistence.api dependency to ROOT.war"
- + "11:32:14,176 INFO [org.jboss.web] (MSC service thread 1-2) registering web context: "
- + "11:32:14,207 INFO [org.jboss.as.server.controller] (DeploymentScanner-threads - 2) Deployed \"ROOT.war\"";
-
- private ApplicationLogFake() {
- super("fakeApplication", ICartridge.JBOSSAS_7, null, new NoopOpenshiftServiceFake());
+ private ApplicationLogFake(IOpenshiftService service) {
+ super("fakeApplication", ICartridge.JBOSSAS_7, null, service);
}
@Override
- public ApplicationLogReader getLogReader() throws OpenshiftException {
- return new ApplicationLogReader(this, getUser(), getService()) {
-
- @Override
- public int read(char[] cbuf, int off, int len) throws IOException {
- System.err.println(log.substring(0, 50));
- System.err.println("off = " + off);
- System.err.println("len = " + len);
- if (logPos > log.length()) {
- return -1;
- }
-
- if ((logPos + len) > log.length()) {
- len = log.length() - logPos - 1;
- }
-
- System.arraycopy(log.toCharArray(), logPos, cbuf, off, len);
- logPos++;
- return len;
- }
-
- };
+ public synchronized void restart() throws OpenshiftException {
+ status = LOG_CONTINUATION;
+ this.notifyAll();
}
-
- @Override
- public void restart() throws OpenshiftException {
- System.err.println("restarting!!!!");
- log = LOG_CONTINUATION;
- this.logPos = 0;
- }
};
}
14 years, 2 months
JBoss Tools SVN: r35081 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-27 17:10:13 -0400 (Tue, 27 Sep 2011)
New Revision: 35081
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/KBPreferencesMessages.properties
Log:
JBIDE-9713
https://issues.jboss.org/browse/JBIDE-9713
JBoss Tools Knowledge Base preference page description is edited.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/KBPreferencesMessages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/KBPreferencesMessages.properties 2011-09-27 18:46:43 UTC (rev 35080)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/KBPreferencesMessages.properties 2011-09-27 21:10:13 UTC (rev 35081)
@@ -9,15 +9,11 @@
### Red Hat, Inc. - initial API and implementation
##################################################################################
-KB_DESCRIPTION=JBoss Tools Knowledge Base is a set of basic frameworks \n\
-that provides for concerted action of other JBoss Tools \n\
-(such as CDI, Seam, JSF) at validation, expression language resolution, \n\
-content assist in expression language and in web page xml/html structures. \n\
-Enabling Knowledge Base capabilities (nature and builder) on a project \n\
-is required for correct work of other JBoss Tools capabilities. \n\
-Since each Java archive is ready to provide JSF 2 resources, \n\
-it is recommended to enable Knowledge Base capabilities on any \n\
-Java project that is used as a module by another Web project.
+KB_DESCRIPTION=\
+JBoss Tools Knowledge Base collects information from projects to provide info \n\
+to features such as expression language, validation and content assist.\n\n\
+It is recommended to enable this on projects and its dependent projects \n\
+that use expression language features such as JSF, CDI and others.
KB_SETTINGS_PREFERENCE_PAGE_KB_SUPPORT=JBoss Tools Knowledge Base support\:
14 years, 2 months
JBoss Tools SVN: r35080 - trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-09-27 14:46:43 -0400 (Tue, 27 Sep 2011)
New Revision: 35080
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_add.png
trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_change.png
trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_edit.png
trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_remove.png
Log:
We need icon images for CDI Tools UI https://issues.jboss.org/browse/JBIDE-9717
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_add.png
===================================================================
(Binary files differ)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_change.png
===================================================================
(Binary files differ)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_edit.png
===================================================================
(Binary files differ)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_remove.png
===================================================================
(Binary files differ)
14 years, 2 months
JBoss Tools SVN: r35079 - trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-27 14:34:05 -0400 (Tue, 27 Sep 2011)
New Revision: 35079
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties
Log:
removed unused messages to fix NLS warnings
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties 2011-09-27 18:04:55 UTC (rev 35078)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties 2011-09-27 18:34:05 UTC (rev 35079)
@@ -31,7 +31,6 @@
VRD_INCLUDED_CSS_FILES_ABOUT=These CSS files will be linked by Visual Page Editor when generating a preview
VRD_ADD_CSS_PREFERENCE=Add CSS Reference
VRD_ADD_CSS_PREFERENCE_MESSAGE=Add References to CSS File, which will be used for generation a preview
-VRD_EDIT_CSS_PREFERENCE=Edit CSS Reference...
CSS_WIZARD_PAGE_NAME=CSS Page
CSS_FILE_PATH=CSS File Path*
@@ -46,7 +45,6 @@
# El expression folder tab and dialog
VRD_SUBSTITUTED_EL_EXPRESSIONS=Substituted EL expressions
-VRD_INVALID_EL_EXPRESSION=Invalid EL Expression.
VRD_SUBSTITUTED_EL_EXPRESSIONS_ABOUT=These EL expressions will be substituted by Visual Page Editor when generating a preview
VRD_ADD_EL_PREFERENCE=Add EL Reference
VRD_ADD_EL_PREFERENCE_MESSAGE=Add El variable, which will be substituted in a visual part for generating a preview
14 years, 2 months