JBoss Tools SVN: r34527 - in trunk: jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-09-05 10:58:23 -0400 (Mon, 05 Sep 2011)
New Revision: 34527
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/EditedTemplateForUnknownTag.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/RemoveUnknownTemplate.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
Log:
Fixes for JBDS 5.0.0.M3
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/EditedTemplateForUnknownTag.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/EditedTemplateForUnknownTag.xml 2011-09-05 14:42:41 UTC (rev 34526)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/EditedTemplateForUnknownTag.xml 2011-09-05 14:58:23 UTC (rev 34527)
@@ -1,9 +1,9 @@
<BODY id="__content__area__" >
-<DIV style="-moz-user-modify: read-write;" >
+<DIV >
<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
<DIV title="body" >
-<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TABLE style="width: 100%; border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="f:view" >
<TR title="f:view" >
<TD title="f:view" >
<DIV title="f:view" >
@@ -12,7 +12,7 @@
Hello Demo Application
</SPAN>
</H1>
-<B style="border: 2px solid rgb(0, 0, 255) ! important; -moz-user-modify: read-only;" title="h:unknowntag" oldstyle="border: 1px solid green; -moz-user-modify: read-only;" >
+<B style="-moz-user-modify: read-only; border: 1px solid green;" title="h:unknowntag" >
<B class="__any__tag__caption" style="" title="h:unknowntag" >
</B>
</B>
@@ -40,6 +40,6 @@
</TABLE>
</DIV>
</DIV>
-<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio4.0.0.Beta2/studio/eclipse/plugins/org.jboss.tools.vpe_3.2.0.v201012050623R-H30-Beta2/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 77px ! important;" >
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio5.0.0.M3/studio/plugins/org.jboss.tools.vpe_3.3.0.v20110901-0136-H11-M3/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 77px ! important;" >
</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/RemoveUnknownTemplate.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/RemoveUnknownTemplate.xml 2011-09-05 14:42:41 UTC (rev 34526)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/RemoveUnknownTemplate.xml 2011-09-05 14:58:23 UTC (rev 34527)
@@ -1,9 +1,9 @@
<BODY id="__content__area__" >
-<DIV style="-moz-user-modify: read-write;" >
+<DIV >
<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
<DIV title="body" >
-<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TABLE style="width: 100%; border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="f:view" >
<TR title="f:view" >
<TD title="f:view" >
<DIV title="f:view" >
@@ -12,11 +12,11 @@
Hello Demo Application
</SPAN>
</H1>
-<DIV style="border: 2px solid rgb(0, 0, 255) ! important; -moz-user-modify: read-only;" title="h:unknowntag" oldstyle="border: 1px solid green; -moz-user-modify: read-only;" >
+<DIV style="-moz-user-modify: read-only; border: 1px solid green;" title="h:unknowntag" >
<DIV class="__any__tag__caption" style="" title="h:unknowntag" >
h:unknowntag
</DIV>
-<BR vpe:pseudo-element="yes" style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
</BR>
</DIV>
<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
@@ -43,6 +43,6 @@
</TABLE>
</DIV>
</DIV>
-<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio4.0.0.CR4/studio/plugins/org.jboss.tools.vpe_3.2.0.v20110211-1322-H26-CR3/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 78px ! important;" >
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio5.0.0.M3/studio/plugins/org.jboss.tools.vpe_3.3.0.v20110901-0136-H11-M3/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 78px ! important;" >
</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml 2011-09-05 14:42:41 UTC (rev 34526)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml 2011-09-05 14:58:23 UTC (rev 34527)
@@ -1,9 +1,9 @@
<BODY id="__content__area__" >
-<DIV style="-moz-user-modify: read-write;" >
+<DIV >
<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
<DIV title="body" >
-<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TABLE style="width: 100%; border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="f:view" >
<TR title="f:view" >
<TD title="f:view" >
<DIV title="f:view" >
@@ -12,11 +12,11 @@
Hello Demo Application
</SPAN>
</H1>
-<B style="border: 2px solid rgb(0, 0, 255) ! important; -moz-user-modify: read-only;" title="h:unknowntag" oldstyle="border: 1px solid green; -moz-user-modify: read-only;" >
+<B style="-moz-user-modify: read-only; border: 1px solid green;" title="h:unknowntag" >
<B class="__any__tag__caption" style="color: black; font-family: Arial;" title="h:unknowntag" >
myValue
</B>
-<BR vpe:pseudo-element="yes" style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
</BR>
</B>
<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
@@ -43,6 +43,6 @@
</TABLE>
</DIV>
</DIV>
-<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio4.0.0.Beta2/studio/eclipse/plugins/org.jboss.tools.vpe_3.2.0.v201012050623R-H30-Beta2/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 77px ! important;" >
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio5.0.0.M3/studio/plugins/org.jboss.tools.vpe_3.3.0.v20110901-0136-H11-M3/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 77px ! important;" >
</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml 2011-09-05 14:42:41 UTC (rev 34526)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml 2011-09-05 14:58:23 UTC (rev 34527)
@@ -1,23 +1,22 @@
-<BODY id="__content__area__">
-<DIV style="-moz-user-modify: read-write;">
-<DIV style="display: none; -moz-user-modify: read-only;" title="head">
+<BODY id="__content__area__" >
+<DIV >
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
-<DIV title="body">
-<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view">
-<TR title="f:view">
-<TD title="f:view">
-<DIV title="f:view">
-<H1 style="-moz-user-modify: read-write;" title="h1">
-<SPAN class="vpe-text" title="h:outputText
-value: #{Message.header}">
-Hello Demo Application
+<DIV title="body" >
+<TABLE style="width: 100%; border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H1 style="-moz-user-modify: read-write;" title="h1" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
+ Hello Demo Application
</SPAN>
</H1>
-<DIV style="border: 1px solid green; -moz-user-modify: read-only;" title="h:unknowntag" >
+<DIV style="-moz-user-modify: read-only; border: 1px solid green;" title="h:unknowntag" >
<DIV class="__any__tag__caption" style="" title="h:unknowntag" >
h:unknowntag
</DIV>
-<BR vpe:pseudo-element="yes" style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
</BR>
</DIV>
<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
@@ -44,6 +43,6 @@
</TABLE>
</DIV>
</DIV>
-<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio4.0.0.Beta2/studio/eclipse/plugins/org.jboss.tools.vpe_3.2.0.v201012050623R-H30-Beta2/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" >
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio5.0.0.M3/studio/plugins/org.jboss.tools.vpe_3.3.0.v20110901-0136-H11-M3/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" >
</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2011-09-05 14:42:41 UTC (rev 34526)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2011-09-05 14:58:23 UTC (rev 34527)
@@ -200,10 +200,6 @@
IDELabel.Menu.ADD_JSF_CAPABILITIES).click();
}
- bot.shell("Add JSF Capabilities").activate();
- bot.button(WidgetVariables.NEXT_BUTTON).click();
- bot.button(WidgetVariables.FINISH_BUTTON).click();
-
delay();
assertTrue("JSF Capabilities were not added to project "
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-09-05 14:42:41 UTC (rev 34526)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-09-05 14:58:23 UTC (rev 34527)
@@ -239,7 +239,7 @@
bot.sleep(Timing.time2S());
compositeComponentDefEditor.save();
currentLineText = compositeComponentDefEditor.getTextOnCurrentLine();
- expectedInsertedText = "#{cc.attrs}";
+ expectedInsertedText = "${cc.attrs}";
assertTrue("Inserted text should be " + expectedInsertedText + " but is not.\n"
+ "Current line text is " + currentLineText,
currentLineText.toLowerCase().contains(expectedInsertedText.toLowerCase()));
@@ -248,14 +248,14 @@
// Check content assist menu content for Composite Components attributes
ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot,
compositeComponentFileName,
- "#{cc.attrs.}",
+ "${cc.attrs.}",
11,
0,
getCompositeComponentsAttributeDefProposalList());
// check inserting of "submitlabel" content assist
String contentAssistToUse = "submitlabel";
contentAssist.checkContentAssist(contentAssistToUse, true);
- expectedInsertedText = "<h:commandButton action=\"#{cc.attrs." + contentAssistToUse + "}\"";
+ expectedInsertedText = "<h:commandButton action=\"${cc.attrs." + contentAssistToUse + "}\"";
assertTrue("Editor has to contain text '" + expectedInsertedText + "' but it doesn't\n" +
"Editor Text is\n" + compositeComponentDefEditor.getText(),
compositeComponentDefEditor.getText().toLowerCase().contains(expectedInsertedText.toLowerCase()));
@@ -501,7 +501,7 @@
result.add("onmouseup");
result.add("submitlabel");
result.add("value");
- result.add("\"#{cc.attrs.}\"");
+ result.add("\"${cc.attrs.}\"");
return result;
}
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-09-05 14:42:41 UTC (rev 34526)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-09-05 14:58:23 UTC (rev 34527)
@@ -411,7 +411,7 @@
public static final String JBOSS_EAP_5_0 = "JBoss Enterprise Application Platform 5.0 Runtime";
public static final String JBOSS_EAP_5_x = "JBoss Enterprise Application Platform 5.x Runtime";
public static final String JBOSS_AS_5_1 = "JBoss 5.1 Runtime";
- public static final String JBOSS_AS_6_0 = "JBoss 6.0 Runtime";
+ public static final String JBOSS_AS_6_0 = "JBoss 6.x Runtime";
}
public static final class ServerType {
14 years, 7 months
JBoss Tools SVN: r34526 - in trunk/documentation/whatsnew/vpe: images and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2011-09-05 10:42:41 -0400 (Mon, 05 Sep 2011)
New Revision: 34526
Added:
trunk/documentation/whatsnew/vpe/images/3.3.0.M3/
trunk/documentation/whatsnew/vpe/images/3.3.0.M3/8719.png
trunk/documentation/whatsnew/vpe/images/3.3.0.M3/9203.png
trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M3.html
Log:
https://issues.jboss.org/browse/JBIDE-9622 , NN for 3.3.0.M3
Added: trunk/documentation/whatsnew/vpe/images/3.3.0.M3/8719.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.M3/8719.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/vpe/images/3.3.0.M3/9203.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.M3/9203.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M3.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M3.html (rev 0)
+++ trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M3.html 2011-09-05 14:42:41 UTC (rev 34526)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css" />
+<title>What's New Visual Page Editor 3.3.0.M3</title>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
+<body>
+<h1>What's New Visual Page Editor 3.3.0.M3</h1>
+
+<p align="right">
+<a href="../index.html">< Main Index</a>
+<a href="../cdi/cdi-news-3.3.0.M3.html">CDI/Seam 3 Tools ></a>
+</p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Editor</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left" width="200px">
+ <b><p>
+ Special and non-ASCII characters is now supported in Externalize Strings wizard
+ <p></b>
+ </td>
+ <td valign="top">
+ <p>Line breaks and carret returns are displayed as escaped sequence.</p>
+ <p>As well as non-ASCII characters are shown in unicode codes.</p>
+ <p><img src="images/3.3.0.M3/9203.png" alt="non-ASCII characters" /></p>
+ <p><small>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-9203">Related Jira</a>
+ </small></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left" width="200px">
+ <b><p>
+ Default "Actual Run-Time Folders" are shown in the Page Desigh Options dialog
+ <p></b>
+ </td>
+ <td valign="top">
+ <p>Checkboxes were added to change default value</p>
+ <p><img src="images/3.3.0.M3/8719.png" alt="Actual Run-Time Folders" /></p>
+ <p><small>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-8719">Related Jira</a>
+ </small></p>
+ </td>
+ </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
14 years, 7 months
JBoss Tools SVN: r34525 - in trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test: .settings and 12 other directories.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-09-05 10:14:52 -0400 (Mon, 05 Sep 2011)
New Revision: 34525
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/.classpath
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/.project
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/.settings/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/.settings/org.eclipse.jdt.core.prefs
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/META-INF/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/build.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainFactoryTest.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTest.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/Activator.java
Log:
initial commit
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/.classpath
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/.classpath (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/.classpath 2011-09-05 14:14:52 UTC (rev 34525)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/.project
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/.project (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/.project 2011-09-05 14:14:52 UTC (rev 34525)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.ide.eclipse.as.openshift.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/.settings/org.eclipse.jdt.core.prefs 2011-09-05 14:14:52 UTC (rev 34525)
@@ -0,0 +1,8 @@
+#Thu Aug 25 16:44:11 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/META-INF/MANIFEST.MF (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/META-INF/MANIFEST.MF 2011-09-05 14:14:52 UTC (rev 34525)
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Openshift Test Plugin
+Bundle-SymbolicName: org.jboss.ide.eclipse.as.openshift.test
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.jboss.ide.eclipse.as.openshift.test.Activator
+Bundle-Vendor: JBoss by Red Hat
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
+ org.junit;bundle-version="[4.8.0,5.0.0)",
+ org.jboss.ide.eclipse.as.openshift.core;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/build.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/build.properties (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/build.properties 2011-09-05 14:14:52 UTC (rev 34525)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/build.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainFactoryTest.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainFactoryTest.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainFactoryTest.java 2011-09-05 14:14:52 UTC (rev 34525)
@@ -0,0 +1,28 @@
+package org.jboss.ide.eclipse.as.openshift.internal.test.core;
+
+import org.jboss.ide.eclipse.as.openshift.core.Domain;
+import org.jboss.ide.eclipse.as.openshift.core.DomainException;
+import org.jboss.ide.eclipse.as.openshift.core.DomainFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class DomainFactoryTest {
+
+ @Before
+ public void setUp() {
+
+ }
+
+ @After
+ public void tearDown() {
+
+ }
+
+ @Test
+ public void canCreateDomain() throws DomainException {
+ DomainFactory domainFactory = new DomainFactory();
+ Domain domain = domainFactory.create();
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainFactoryTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTest.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTest.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTest.java 2011-09-05 14:14:52 UTC (rev 34525)
@@ -0,0 +1,46 @@
+package org.jboss.ide.eclipse.as.openshift.internal.test.core;
+
+import static org.junit.Assert.assertEquals;
+
+import org.jboss.ide.eclipse.as.openshift.core.Openshift;
+import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
+import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.OpenshiftJsonRequestFactory;
+import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.UserInfoRequestJsonMarshaller;
+import org.jboss.ide.eclipse.as.openshift.internal.core.request.UserInfoRequest;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class OpenshiftTest {
+
+ private Openshift openshift;
+
+ private static final String USERNAME = "dietisheim(a)gmx.net";
+ private static final String PASSWORD = "1q2w3e";
+
+ @Before
+ public void setUp() {
+ this.openshift = new Openshift(USERNAME, PASSWORD);
+ }
+
+ @After
+ public void tearDown() {
+
+ }
+
+ @Test
+ public void canMarshallRequestCorrectly() throws OpenshiftException {
+ String expectedRequestString = "password=" + PASSWORD + "&json_data=%7B%22rhlogin%22+%3A+%22dietisheim%40gmx.net%22%2C+%22debug%22+%3A+%22true%22%7D";
+
+ String userInfoRequest = new UserInfoRequestJsonMarshaller(new UserInfoRequest(USERNAME, true)).create();
+ String effectiveRequest = new OpenshiftJsonRequestFactory(PASSWORD, userInfoRequest).create();
+
+ assertEquals(expectedRequestString, effectiveRequest);
+ }
+
+ @Test(expected=OpenshiftException.class)
+ public void cannotGetUserInfoIfNotAppNorDomainCreated() throws OpenshiftException {
+ openshift.getUserInfo();
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/Activator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/Activator.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/Activator.java 2011-09-05 14:14:52 UTC (rev 34525)
@@ -0,0 +1,30 @@
+package org.jboss.ide.eclipse.as.openshift.test;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ private static BundleContext context;
+
+ static BundleContext getContext() {
+ return context;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext bundleContext) throws Exception {
+ Activator.context = bundleContext;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext bundleContext) throws Exception {
+ Activator.context = null;
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/Activator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 7 months
JBoss Tools SVN: r34524 - in trunk/documentation/whatsnew: core and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-09-05 10:12:48 -0400 (Mon, 05 Sep 2011)
New Revision: 34524
Added:
trunk/documentation/whatsnew/core/core-news-3.3.0.M3.html
trunk/documentation/whatsnew/core/images/
trunk/documentation/whatsnew/core/images/remote-debugging1.png
trunk/documentation/whatsnew/core/images/remote-debugging2.png
trunk/documentation/whatsnew/core/images/remote-debugging3.png
Modified:
trunk/documentation/whatsnew/index.html
Log:
adding core about remote debugging and index elements for main n\&n
Added: trunk/documentation/whatsnew/core/core-news-3.3.0.M3.html
===================================================================
--- trunk/documentation/whatsnew/core/core-news-3.3.0.M3.html (rev 0)
+++ trunk/documentation/whatsnew/core/core-news-3.3.0.M3.html 2011-09-05 14:12:48 UTC (rev 34524)
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>JBoss Remote Debugging 3.3.0.M3 What's New</title>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
+<body>
+<h1>Debugging Remote Java Application 3.3.0.M3 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a>
+<a href="../jst/jst-news-3.3.0.M3.html">JST/JSF Tools ></a>
+</p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Debugging Remote Java Application</h3>
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam1e" id="itemname1"></a><b>Debugging Remote Java Application</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>
+ Now JBoss Tools supports discovering and debugging remote Java applications.
+ </p>
+ <p>
+ You can right-click one or more Java projects in the workspace and call
+ an action to discover Remote Java applications started in the debug mode.
+ </p>
+ <img src="images/remote-debugging1.png" />
+
+ <p>
+ If there are remote Java applications on your localhost, a dialog as shown below will appear:
+ </p>
+ <img src="images/remote-debugging2.png" />
+ <p>
+ The application with PID 4964 is started with the 'suspend=y' option. In this case, JDK can determine only the application's PID and port.
+
+ </p>
+ <p>
+ The JBoss Remote Java Application feature uses the standard Eclipse Remote Java Application launch configurations having the JBoss Remote configuration preference checked.
+ </p>
+ <img src="images/remote-debugging3.png" />
+
+ <p>
+ The JBoss Remote Java Application supports the following features:
+ </p>
+ <ul>
+ <li>all selected projects will be included in the source attachment</li>
+ <li>if there is the m2e feature, Maven dependencies for all the selected projects will be resolved
+ and included in the source attachment
+ (m2e supports this functionality only for Java application, JUnit and TestNG launch configurations)</li>
+ <li>The user can create Remote Java Application launch configurations containing user specific source attachments</li>
+ </ul>
+
+ <p>
+ The JBoss Remote Java Application feature for now only supports discovering remote applications on localhost.
+ </p>
+ <p>This feature requires JDK on Windows and Linux. Java for Mac OS X includes all necessary requirements.</p>
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-8548">Related Jira</a></small></p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
Property changes on: trunk/documentation/whatsnew/core/core-news-3.3.0.M3.html
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/documentation/whatsnew/core/images/remote-debugging1.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/core/images/remote-debugging1.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/core/images/remote-debugging2.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/core/images/remote-debugging2.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/core/images/remote-debugging3.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/core/images/remote-debugging3.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2011-09-05 14:12:05 UTC (rev 34523)
+++ trunk/documentation/whatsnew/index.html 2011-09-05 14:12:48 UTC (rev 34524)
@@ -37,9 +37,17 @@
<td valign="top" align="left">
<p align="right"><b>3.3.0.M3</b>
<td valign="top">
-
+
+ <p><a href="core/core-news-3.3.0.M3.html">Core/General</a></p>
<p><a href="forge/forge-news-3.3.0.M3.html">Forge Tools</a></p>
+ <p><a href="as/as-news-3.3.0.M3.html">JBoss AS Server Tools</a></p>
+ <p><a href="cdi/cdi-news-3.3.0.M3.html">CDI/Seam 3 Tools</a></p>
+ <p><a href="gwt/gwt-news-1.0.2.M3.html">GWT Tools</a></p>
+ <p><a href="hibernate/hibernate-news-3.5.0.M3.html">Hibernate Tools</a></p>
+ <p><a href="seam/seam-news-3.3.0.M3.html">Seam 2 Tools</a></p>
+ <p><a href="teiid/teiid-news-7.5.html">Teiid Designer</a></p>
+
</td>
</tr>
14 years, 7 months
JBoss Tools SVN: r34523 - in trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core: .settings and 15 other directories.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-09-05 10:12:05 -0400 (Mon, 05 Sep 2011)
New Revision: 34523
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/.classpath
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/.project
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/.settings/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/.settings/org.eclipse.jdt.core.prefs
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/build.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/jboss-dmr-1.0.0.Final.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Domain.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainException.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainFactory.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Openshift.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftException.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserInfo.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractOpenshiftMarshaller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftJsonConstants.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftMarshaller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequest.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequestMarshaller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/OpenshiftJsonRequestFactory.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/UserInfoRequestJsonMarshaller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/Activator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClient.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientException.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientNotFoundException.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/InternalServerErrorException.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UrlConnectionHttpClient.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/UserInfoRequest.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/utils/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/utils/StreamUtils.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/utils/UrlBuilder.java
Log:
initial commit
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/.classpath
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/.classpath (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/.classpath 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Final.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/.project
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/.project (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/.project 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.ide.eclipse.as.openshift.core</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/.settings/org.eclipse.jdt.core.prefs 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,8 @@
+#Thu Aug 25 15:26:22 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Openshift Core Plugin
+Bundle-SymbolicName: org.jboss.ide.eclipse.as.openshift.core
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.jboss.ide.eclipse.as.openshift.internal.core.Activator
+Bundle-Vendor: JBoss by Red Hat
+Require-Bundle: org.eclipse.core.runtime
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: jboss-dmr-1.0.0.Final.jar,
+ .
+Export-Package: org.jboss.dmr;x-friends:="org.jboss.ide.eclipse.as.openshift.test",
+ org.jboss.ide.eclipse.as.openshift.core,
+ org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;x-friends:="org.jboss.ide.eclipse.as.openshift.test",
+ org.jboss.ide.eclipse.as.openshift.internal.core.request;x-friends:="org.jboss.ide.eclipse.as.openshift.test"
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/build.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/build.properties (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/build.properties 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ jboss-dmr-1.0.0.Final.jar
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/build.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/jboss-dmr-1.0.0.Final.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/jboss-dmr-1.0.0.Final.jar
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Domain.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Domain.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Domain.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,5 @@
+package org.jboss.ide.eclipse.as.openshift.core;
+
+public class Domain {
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Domain.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainException.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainException.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainException.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,20 @@
+package org.jboss.ide.eclipse.as.openshift.core;
+
+public class DomainException extends Exception {
+
+ private DomainException(String message, Throwable cause) {
+ super(message, cause);
+ // TODO Auto-generated constructor stub
+ }
+
+ private DomainException(String message) {
+ super(message);
+ // TODO Auto-generated constructor stub
+ }
+
+ private DomainException(Throwable cause) {
+ super(cause);
+ // TODO Auto-generated constructor stub
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainException.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainFactory.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainFactory.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.openshift.core;
+
+import org.jboss.dmr.ModelNode;
+import org.jboss.ide.eclipse.as.openshift.internal.core.utils.UrlBuilder;
+
+public class DomainFactory {
+
+ private UrlBuilder urlBuilder;
+
+ public DomainFactory() {
+ this.urlBuilder = new UrlBuilder("https://openshift.redhat.com");
+ }
+
+ public Domain create() throws DomainException {
+ ModelNode node = new ModelNode();
+ node.get("namespace").set("string");
+System.err.println(node.toJSONString(false));
+ // new UrlConnectionHttpClient(urlBuilder.path("broker").path("domain").toUrl()).post(node.toJSONString(false));
+ return null;
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainFactory.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Openshift.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Openshift.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Openshift.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,59 @@
+package org.jboss.ide.eclipse.as.openshift.core;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.osgi.util.NLS;
+import org.jboss.dmr.ModelNode;
+import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.OpenshiftJsonRequestFactory;
+import org.jboss.ide.eclipse.as.openshift.internal.core.HttpClient;
+import org.jboss.ide.eclipse.as.openshift.internal.core.HttpClientException;
+import org.jboss.ide.eclipse.as.openshift.internal.core.UrlConnectionHttpClient;
+import org.jboss.ide.eclipse.as.openshift.internal.core.utils.UrlBuilder;
+
+public class Openshift {
+
+ private static final String BASE_URL = "https://openshift.redhat.com/broker";
+
+ private String username;
+ private String password;
+
+ public Openshift(String username, String password) {
+ this.username = username;
+ this.password = password;
+ }
+
+ public UserInfo getUserInfo() throws OpenshiftException {
+ UrlBuilder userInfoUrlBuilder = new UrlBuilder(BASE_URL).path("userinfo");
+ try {
+ ModelNode node = new ModelNode();
+ node.get("rhlogin").set(username);
+ node.get("debug").set("true");
+ HttpClient httpClient = createHttpClient(userInfoUrlBuilder.toUrl());
+ String request = new OpenshiftJsonRequestFactory(password, node.toJSONString(true)).create();
+ String userInfoResponse = httpClient.post(request);
+ ModelNode userInfoReponse = ModelNode.fromJSONString(userInfoResponse);
+ return new UserInfo(
+ userInfoReponse.get("rhlogin").asString(),
+ userInfoReponse.get("uuid").asString(),
+ userInfoReponse.get("ssh_key").asString(),
+ userInfoReponse.get("rhc_domain").asString(),
+ userInfoReponse.get("namespace").asString());
+ } catch (MalformedURLException e) {
+ throw new OpenshiftException(
+ NLS.bind("Could not get user info for user \"{0}\" at \"{1}\"", username,
+ userInfoUrlBuilder.toString()), e);
+ } catch (HttpClientException e) {
+ throw new OpenshiftException(
+ NLS.bind("Could not get user info for user \"{0}\" at \"{1}\"", username,
+ userInfoUrlBuilder.toString()), e);
+ }
+
+
+ }
+
+ private HttpClient createHttpClient(URL url) {
+ return new UrlConnectionHttpClient(url);
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Openshift.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftException.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftException.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftException.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,17 @@
+package org.jboss.ide.eclipse.as.openshift.core;
+
+public class OpenshiftException extends Exception {
+
+ public OpenshiftException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public OpenshiftException(String message) {
+ super(message);
+ }
+
+ public OpenshiftException(Throwable cause) {
+ super(cause);
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftException.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserInfo.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserInfo.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserInfo.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,40 @@
+package org.jboss.ide.eclipse.as.openshift.core;
+
+import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.IOpenshiftRequest;
+
+public class UserInfo implements IOpenshiftRequest {
+
+ private String rhlogin;
+ private String uuId;
+ private String sshKey;
+ private String rhcDomain;
+ private String namespace;
+
+ UserInfo(String rhlogin, String uuid, String sshKey, String rhcDomain, String namespace) {
+ this.rhlogin = rhlogin;
+ this.uuId = uuid;
+ this.sshKey = sshKey;
+ this.rhcDomain = rhcDomain;
+ this.namespace = namespace;
+ }
+
+ public String getRhlogin() {
+ return rhlogin;
+ }
+
+ public String getUuId() {
+ return uuId;
+ }
+
+ public String getRhcDomain() {
+ return rhcDomain;
+ }
+
+ public String getSSHKey() {
+ return sshKey;
+ }
+
+ public String getNamespace() {
+ return namespace;
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserInfo.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractOpenshiftMarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractOpenshiftMarshaller.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractOpenshiftMarshaller.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,15 @@
+package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;
+
+
+public abstract class AbstractOpenshiftMarshaller<OPENSHIFTOBJECT extends IOpenshiftRequest> implements IOpenshiftMarshaller<OPENSHIFTOBJECT> {
+
+ @Override
+ public String marshall(OPENSHIFTOBJECT object) {
+ StringBuilder builder = new StringBuilder();
+ append(builder);
+ return builder.toString();
+ }
+
+ protected abstract void append(StringBuilder builder);
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractOpenshiftMarshaller.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftJsonConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftJsonConstants.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftJsonConstants.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,8 @@
+package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;
+
+public class IOpenshiftJsonConstants {
+
+ public static final String PROPERTY_DEBUG = "debug";
+ public static final String PROPERTY_RHLOGIN = "rhlogin";
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftJsonConstants.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftMarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftMarshaller.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftMarshaller.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,8 @@
+package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;
+
+
+public interface IOpenshiftMarshaller<OBJECT extends IOpenshiftRequest> {
+
+ public String marshall(OBJECT object);
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftMarshaller.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequest.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequest.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequest.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,5 @@
+package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;
+
+public interface IOpenshiftRequest {
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequestMarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequestMarshaller.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequestMarshaller.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,5 @@
+package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;
+
+public interface IOpenshiftRequestMarshaller<OPENSHIFTREQUEST> {
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequestMarshaller.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/OpenshiftJsonRequestFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/OpenshiftJsonRequestFactory.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/OpenshiftJsonRequestFactory.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,59 @@
+package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
+
+public class OpenshiftJsonRequestFactory {
+
+ private static final char EQ = '=';
+ private static final String PROPERTY_PASSWORD = "password";
+ private static final String PROPERTY_JSON_DATA = "json_data";
+ private static final String DATA_ENCODING = "UTF-8";
+ private static final char AMP = '&';
+ private String[] payloads;
+ private String password;
+
+ public OpenshiftJsonRequestFactory(String password, String... payloads) {
+ this.password = password;
+ this.payloads = payloads;
+ }
+
+ public String create() throws OpenshiftException {
+ try {
+ StringBuilder builder = new StringBuilder();
+ appendPassword(builder);
+ builder.append(AMP);
+ appendPayload(builder);
+ return builder.toString();
+ } catch (UnsupportedEncodingException e) {
+ throw new OpenshiftException("Could not create request", e);
+ }
+ }
+
+ private void appendPassword(StringBuilder builder) throws UnsupportedEncodingException {
+ builder.append(PROPERTY_PASSWORD)
+ .append(EQ)
+ .append(URLEncoder.encode(password, DATA_ENCODING));
+ }
+
+ private void appendPayload(StringBuilder builder) throws UnsupportedEncodingException {
+ StringBuilder payloadBuilder = new StringBuilder();
+ for (int i = 0; i < payloads.length; i++) {
+ if (i > 0
+ && i < payloads.length + 1) {
+ payloadBuilder.append(AMP);
+ }
+ payloadBuilder.append(payloads[i]);
+ }
+
+ if (builder.length() > 0) {
+ builder
+ .append(PROPERTY_JSON_DATA)
+ .append(EQ)
+ .append(URLEncoder.encode(payloadBuilder.toString(), DATA_ENCODING));
+ }
+
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/OpenshiftJsonRequestFactory.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/UserInfoRequestJsonMarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/UserInfoRequestJsonMarshaller.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/UserInfoRequestJsonMarshaller.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;
+
+import org.jboss.dmr.ModelNode;
+import org.jboss.ide.eclipse.as.openshift.internal.core.request.UserInfoRequest;
+
+
+public class UserInfoRequestJsonMarshaller implements IOpenshiftRequestMarshaller<UserInfoRequest> {
+
+ private UserInfoRequest userInfoRequest;
+
+ public UserInfoRequestJsonMarshaller(UserInfoRequest userInfoRequest) {
+ this.userInfoRequest = userInfoRequest;
+ }
+
+ public String create() {
+ ModelNode node = new ModelNode();
+ node.get(IOpenshiftJsonConstants.PROPERTY_RHLOGIN).set(userInfoRequest.getRhLogin());
+ node.get(IOpenshiftJsonConstants.PROPERTY_DEBUG).set(String.valueOf(userInfoRequest.isDebug()));
+ return node.toJSONString(true);
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/UserInfoRequestJsonMarshaller.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/Activator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/Activator.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/Activator.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,30 @@
+package org.jboss.ide.eclipse.as.openshift.internal.core;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ private static BundleContext context;
+
+ static BundleContext getContext() {
+ return context;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext bundleContext) throws Exception {
+ Activator.context = bundleContext;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext bundleContext) throws Exception {
+ Activator.context = null;
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/Activator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClient.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClient.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClient.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,6 @@
+package org.jboss.ide.eclipse.as.openshift.internal.core;
+
+public interface HttpClient {
+
+ public String post(String data) throws HttpClientException;
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClient.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientException.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientException.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientException.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,17 @@
+package org.jboss.ide.eclipse.as.openshift.internal.core;
+
+public class HttpClientException extends Exception {
+
+ public HttpClientException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public HttpClientException(String message) {
+ super(message);
+ }
+
+ public HttpClientException(Throwable cause) {
+ super(cause);
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientException.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientNotFoundException.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientNotFoundException.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientNotFoundException.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,17 @@
+package org.jboss.ide.eclipse.as.openshift.internal.core;
+
+public class HttpClientNotFoundException extends HttpClientException {
+
+ public HttpClientNotFoundException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public HttpClientNotFoundException(String message) {
+ super(message);
+ }
+
+ private HttpClientNotFoundException(Throwable cause) {
+ super(cause);
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/HttpClientNotFoundException.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/InternalServerErrorException.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/InternalServerErrorException.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/InternalServerErrorException.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,17 @@
+package org.jboss.ide.eclipse.as.openshift.internal.core;
+
+public class InternalServerErrorException extends HttpClientException {
+
+ InternalServerErrorException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ InternalServerErrorException(String message) {
+ super(message);
+ }
+
+ InternalServerErrorException(Throwable cause) {
+ super(cause);
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/InternalServerErrorException.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UrlConnectionHttpClient.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UrlConnectionHttpClient.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UrlConnectionHttpClient.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,67 @@
+package org.jboss.ide.eclipse.as.openshift.internal.core;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.text.MessageFormat;
+
+import org.jboss.ide.eclipse.as.openshift.internal.core.utils.StreamUtils;
+
+public class UrlConnectionHttpClient implements HttpClient {
+
+ private static final String PROPERTY_CONTENT_TYPE = "Content-Type";
+ private static final int TIMEOUT = 10 * 1024;
+
+ private URL url;
+
+ public UrlConnectionHttpClient(URL url) {
+ this.url = url;
+ }
+
+ public String post(String data) throws HttpClientException {
+ HttpURLConnection connection = null;
+ try {
+ connection = createConnection(url);
+ connection.setDoOutput(true);
+ StreamUtils.writeTo(data.getBytes(), connection.getOutputStream());
+ return StreamUtils.readToString(connection.getInputStream());
+ } catch (FileNotFoundException e) {
+ /*
+ * thrown by #connect when server resonds with 404
+ */
+ throw new HttpClientNotFoundException(
+ MessageFormat.format("Could not find resource {0}", url.toString()));
+ } catch (IOException e) {
+ throw getException(e, connection);
+ } finally {
+ if (connection != null) {
+ connection.disconnect();
+ }
+ }
+ }
+
+ private HttpClientException getException(IOException ioe, HttpURLConnection connection) {
+ try {
+ int responseCode = connection.getResponseCode();
+ if (responseCode == 500) {
+ return new InternalServerErrorException(ioe);
+ } else {
+ return new HttpClientException(ioe);
+ }
+ } catch (IOException e) {
+ return new HttpClientException(e);
+ }
+ }
+
+ private HttpURLConnection createConnection(URL url) throws IOException {
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setUseCaches(false);
+ connection.setDoInput(true);
+ connection.setAllowUserInteraction(false);
+ connection.setConnectTimeout(TIMEOUT);
+ connection.setRequestProperty(PROPERTY_CONTENT_TYPE, "application/x-www-form-urlencoded");
+ connection.setInstanceFollowRedirects(true);
+ return connection;
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UrlConnectionHttpClient.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/UserInfoRequest.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/UserInfoRequest.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/UserInfoRequest.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,28 @@
+package org.jboss.ide.eclipse.as.openshift.internal.core.request;
+
+import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.IOpenshiftRequest;
+
+
+public class UserInfoRequest implements IOpenshiftRequest {
+
+ private String rhlogin;
+ private boolean debug;
+
+ public UserInfoRequest(String username) {
+ this(username, false);
+ }
+
+ public UserInfoRequest(String username, boolean debug) {
+ this.rhlogin = username;
+ this.debug = debug;
+ }
+
+ public String getRhLogin() {
+ return rhlogin;
+ }
+
+ public boolean isDebug() {
+ return debug;
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/UserInfoRequest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/utils/StreamUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/utils/StreamUtils.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/utils/StreamUtils.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,81 @@
+package org.jboss.ide.eclipse.as.openshift.internal.core.utils;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+public class StreamUtils {
+
+ /**
+ * Writes the content of the given input stream to the given output stream
+ * and returns and input stream that may still be used to read from.
+ *
+ * @param outputStream
+ * the output stream to write to
+ * @param inputStream
+ * the input stream to read from
+ * @return a new, unread input stream
+ * @throws IOException
+ */
+ public static InputStream writeTo(InputStream inputStream, OutputStream outputStream) throws IOException {
+ List<Byte> data = new ArrayList<Byte>();
+ for (int character = -1; (character = inputStream.read()) != -1;) {
+ data.add((byte) character);
+ outputStream.write(character);
+ }
+ byte[] byteArray = new byte[data.size()];
+ for (int i = byteArray.length - 1; i >= 0; i--) {
+ byteArray[i] = data.get(i);
+ }
+ return new ByteArrayInputStream(byteArray);
+ }
+
+ public static String readToString(InputStream inputStream) throws IOException {
+ try {
+ BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+ StringWriter writer = new StringWriter();
+ String line = null;
+ while ((line = reader.readLine()) != null) {
+ writer.write(line);
+ }
+ return writer.toString();
+ } finally {
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ }
+ }
+
+ /**
+ * Writes the given string to the given output stream. The stream is closed
+ * after writing all data.
+ *
+ * @param data the data to write
+ * @param outputStream the stream to write to
+ * @throws IOException
+ */
+ public static void writeTo(byte[] data, OutputStream outputStream) throws IOException {
+ outputStream.write(data);
+ outputStream.flush();
+ outputStream.close();
+ }
+
+ public static void close(InputStream inputStream) throws IOException {
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ }
+
+ public static void close(OutputStream outputStream) throws IOException {
+ if (outputStream != null) {
+ outputStream.close();
+ }
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/utils/StreamUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/utils/UrlBuilder.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/utils/UrlBuilder.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/utils/UrlBuilder.java 2011-09-05 14:12:05 UTC (rev 34523)
@@ -0,0 +1,133 @@
+package org.jboss.ide.eclipse.as.openshift.internal.core.utils;
+
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.Collection;
+
+/**
+ * A builder for an url. Currently no state checking is done, the user is
+ * responsible to build something that makes sense.
+ *
+ * @author André Dietisheim
+ */
+public class UrlBuilder {
+ private static final String URL_ENCODING = "UTF-8";
+ private static final String HOST_PROTOCOL_DELIMITER = ":";
+ private static final String HTTP_PROTOCOL_PREFIX = "http://";
+ private static final char PARAMETER_URL_DELIMITER = '?';
+ private static final char PARAMETER_DELIMITER = '&';
+ private static final char PARAMETER_NAME_VALUE_DELIMITER = '=';
+ private static final char PATH_SEPARATOR = '/';
+
+ private StringBuilder urlStringBuilder = new StringBuilder();
+
+ private boolean parametersAdded = false;
+
+ public UrlBuilder() {
+ }
+
+ public UrlBuilder(String baseUrl) {
+ urlStringBuilder.append(baseUrl);
+ }
+
+ public UrlBuilder(URL baseUrl) {
+ urlStringBuilder.append(baseUrl.toString());
+ }
+
+ /**
+ * adds a host to .
+ *
+ * @param host
+ * the host
+ *
+ * @return the url builder
+ */
+ public UrlBuilder host(String host) {
+ urlStringBuilder.append(HTTP_PROTOCOL_PREFIX);
+ urlStringBuilder.append(host);
+ return this;
+ }
+
+ /**
+ * Adds a port.
+ *
+ * @param port
+ * the port
+ *
+ * @return the url builder
+ */
+ public UrlBuilder port(String port) {
+ urlStringBuilder.append(HOST_PROTOCOL_DELIMITER);
+ urlStringBuilder.append(port);
+ return this;
+ }
+
+ /**
+ * adds a path to the url.
+ *
+ * @param path
+ * the path
+ *
+ * @return the url builder
+ */
+ public UrlBuilder path(String path) {
+ urlStringBuilder.append(PATH_SEPARATOR);
+ urlStringBuilder.append(path);
+ return this;
+ }
+
+ public UrlBuilder path(Collection<String> paths) {
+ for (String path : paths) {
+ path(path);
+ }
+ return this;
+ }
+
+ public UrlBuilder parameter(String name, String value) {
+ if (value != null) {
+ appendParameterDelimiter();
+ urlStringBuilder.append(name).append(PARAMETER_NAME_VALUE_DELIMITER).append(urlEncode(value));
+ }
+ return this;
+ }
+
+ private void appendParameterDelimiter() {
+ if (!parametersAdded) {
+ urlStringBuilder.append(PARAMETER_URL_DELIMITER);
+ parametersAdded = true;
+ } else {
+ urlStringBuilder.append(PARAMETER_DELIMITER);
+ }
+ }
+
+ public UrlBuilder parameters(String... parameters) {
+ for (String parameter : parameters) {
+ parameter(parameter);
+ }
+ return this;
+ }
+
+ public UrlBuilder parameter(String parameter) {
+ appendParameterDelimiter();
+ urlStringBuilder.append(urlEncode(parameter));
+ return this;
+ }
+
+ private String urlEncode(String value) {
+ try {
+ return URLEncoder.encode(value, URL_ENCODING);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public URL toUrl() throws MalformedURLException {
+ return new URL(urlStringBuilder.toString());
+ }
+
+ public String toString() {
+ return urlStringBuilder.toString();
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/utils/UrlBuilder.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 7 months
JBoss Tools SVN: r34522 - trunk/as/plugins.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-09-05 10:10:52 -0400 (Mon, 05 Sep 2011)
New Revision: 34522
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/
Log:
initial commit
14 years, 7 months
JBoss Tools SVN: r34521 - trunk/as/plugins.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-09-05 10:10:15 -0400 (Mon, 05 Sep 2011)
New Revision: 34521
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/
Log:
initial commit
14 years, 7 months
JBoss Tools SVN: r34520 - in branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal: v7 and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-09-05 06:49:47 -0400 (Mon, 05 Sep 2011)
New Revision: 34520
Modified:
branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
Log:
JBIDE-9650 - commit critical jmx issue to branch
Modified: branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
===================================================================
--- branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-09-05 10:09:45 UTC (rev 34519)
+++ branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-09-05 10:49:47 UTC (rev 34520)
@@ -233,7 +233,7 @@
}
protected boolean shouldSuspendScanner() {
- return getServer().getServerState() != IServer.STATE_STARTED
+ return getServer().getServerState() == IServer.STATE_STARTED
&& ExtensionManager.getDefault().getJMXRunner() != null;
}
Modified: branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
===================================================================
--- branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-09-05 10:09:45 UTC (rev 34519)
+++ branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-09-05 10:49:47 UTC (rev 34520)
@@ -15,6 +15,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.ExtensionManager;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
@@ -74,8 +75,13 @@
super.pollServer(expectedState);
}
}
-
+
@Override
+ protected boolean shouldSuspendScanner() {
+ return false;
+ }
+
+ @Override
public void dispose() {
JBoss7ManagerUtil.dispose(service);
this.service = null;
14 years, 7 months
JBoss Tools SVN: r34519 - in trunk/documentation/whatsnew/hibernate: images and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2011-09-05 06:09:45 -0400 (Mon, 05 Sep 2011)
New Revision: 34519
Added:
trunk/documentation/whatsnew/hibernate/hibernate-news-3.5.0.M3.html
trunk/documentation/whatsnew/hibernate/images/generic_generators.png
trunk/documentation/whatsnew/hibernate/images/hibernate_type_composite.png
trunk/documentation/whatsnew/hibernate/images/pacakge_info.ui.png
trunk/documentation/whatsnew/hibernate/images/type_def_ui.png
Log:
https://issues.jboss.org/browse/JBIDE-9616
Hibernate N&N
Added: trunk/documentation/whatsnew/hibernate/hibernate-news-3.5.0.M3.html
===================================================================
--- trunk/documentation/whatsnew/hibernate/hibernate-news-3.5.0.M3.html (rev 0)
+++ trunk/documentation/whatsnew/hibernate/hibernate-news-3.5.0.M3.html 2011-09-05 10:09:45 UTC (rev 34519)
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>Hibernate tools 3.5.0.M3 What's New</title>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
+<body>
+<h1>Hibernate tools 3.5.0.M3 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main
+ Index</a> <a href="../ws/ws-news-1.2.2.M2.html">Webservices Tools ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Dali Integration</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname1" id="itemname1"></a><b>Validate @TypeDef</b></td>
+ <td valign="top">
+ <p>Added validation of org.hibernate.annotation.TypeDef annotation. The typeClass attribute should contain a name of the class
+ which implements(directly or indirectly) one of:</p>
+ <ul>
+ <li>org.hibernate.type.Type</li>
+ <li>org.hibernate.usertype.UserType</li>
+ <li>org.hibernate.usertype.CompositeUserType</li>
+ <li>org.hibernate.usertype.UserCollectionType</li>
+ </ul>
+ <p>Validation of org.hibernate.annotation.Type annotation was updated according this rule.</p>
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-9485">Related jira</a></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname2" id="itemname2"></a><b>Validate @ForeignKey</b></td>
+ <td valign="top">
+ <p>Added validation of inverseName attribute of org.hibernate.annotation.ForignKey annotation. @ForignKey annotation can be used in OneToMany,
+ ManyToOne, OneToOne and ManyToMany relationships. Inverse name should be validated only in ManyToMany relationships at owner side.</p>
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-9375">Related jira</a></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Create ui for @GenericGenerators</b></td>
+ <td valign="top">
+ <p>Created ui for org.hibernate.annotation.GenericGenerators which hold many @GenericGenerator.</p>
+ <img src="images/generic_generators.png"/></p>
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-9560">Related jira</a></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname4" id="itemname4"></a><b>Create ui for @TypeDef(s)</b></td>
+ <td valign="top">
+ <p>Created ui for org.hibernate.annotation.TypeDef and TypeDefs annotations.</p>
+ <img src="images/type_def_ui.png"/></p>
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-9486">Related jira</a></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname6" id="itemname6"></a><b>Create ui for @Type</b></td>
+ <td valign="top">
+ <p>Created simple ui for org.hibernate.annotation.Type annotation.</p>
+ <img src="images/hibernate_type_composite.png"/></p>
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-9283">Related jira</a></p>
+ </td>
+ </tr>
+
+<tr>
+ <td colspan="2">
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname6" id="itemname6"></a><b>Process package-info.java</b></td>
+ <td valign="top">
+ <p>Package level annotations</p>
+ <ul>
+ <li>org.hibernate.annotation.GenericGenerator(s)</li>
+ <li>org.hibernate.annotation.TypeDef(s)</li>
+ <li>org.hibernate.annotation.NamedQuery(es)</li>
+ <li>org.hibernate.annotation.NamedNativeQuery(es)</li>
+ </ul>
+ now handled by the model and validator. There is also ui for the annotations.
+ <img src="images/pacakge_info.ui.png"/></p>
+
+ <p><small>Related jiras:<a href="https://issues.jboss.org/browse/JBIDE-9435">1</a>, <a href="https://issues.jboss.org/browse/JBIDE-9436">2</a></p>
+
+ </td>
+ </tr>
+
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+
+
+</table>
+
+</body>
+
+</html>
+
+
Added: trunk/documentation/whatsnew/hibernate/images/generic_generators.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/hibernate/images/generic_generators.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/hibernate/images/hibernate_type_composite.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/hibernate/images/hibernate_type_composite.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/hibernate/images/pacakge_info.ui.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/hibernate/images/pacakge_info.ui.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/hibernate/images/type_def_ui.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/hibernate/images/type_def_ui.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years, 7 months
JBoss Tools SVN: r34518 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-09-05 05:40:23 -0400 (Mon, 05 Sep 2011)
New Revision: 34518
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
Log:
JBIDE-9650 - critical fix for suspending jmx scanner. AS7 does not use this feature.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-09-05 09:34:50 UTC (rev 34517)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-09-05 09:40:23 UTC (rev 34518)
@@ -15,6 +15,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.ExtensionManager;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
@@ -74,7 +75,13 @@
super.pollServer(expectedState);
}
}
+
+ @Override
+ protected boolean shouldSuspendScanner() {
+ return false;
+ }
+
@Override
public void dispose() {
JBoss7ManagerUtil.dispose(service);
14 years, 7 months