JBoss Tools SVN: r35078 - in trunk/as: tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-27 14:04:55 -0400 (Tue, 27 Sep 2011)
New Revision: 35078
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java
Log:
[JBIDE-9773] correcting ApplicationLogReader implementation and adding new tests
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java 2011-09-27 18:03:33 UTC (rev 35077)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java 2011-09-27 18:04:55 UTC (rev 35078)
@@ -53,7 +53,6 @@
if (charactersRead == -1) {
this.logReader = null;
}
- System.err.println("charactersRead = " + charactersRead);
}
return charactersRead;
} catch (OpenshiftException e) {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java 2011-09-27 18:03:33 UTC (rev 35077)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java 2011-09-27 18:04:55 UTC (rev 35078)
@@ -35,6 +35,7 @@
*/
public class ApplicationLogReaderIntegrationTest {
+ private static final int LOGREADER_TIMEOUT = 10 * 1024;
private IOpenshiftService service;
private TestUser user;
@@ -90,7 +91,7 @@
try {
application = user.createTestApplication();
ApplicationLogReader logReader = application.getLogReader();
- LogReaderRunnable logReaderRunnable = new LogReaderRunnable(logReader, 10 * 1024);
+ LogReaderRunnable logReaderRunnable = new LogReaderRunnable(logReader, LOGREADER_TIMEOUT);
executor = Executors.newSingleThreadExecutor();
executor.submit(logReaderRunnable);
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java 2011-09-27 18:03:33 UTC (rev 35077)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java 2011-09-27 18:04:55 UTC (rev 35078)
@@ -31,6 +31,7 @@
*/
public class ApplicationLogReaderTest {
+ private static final int LOGREADER_TIMEOUT = 1 * 1024;
private Application application;
@Before
@@ -43,7 +44,7 @@
ExecutorService executor = null;
try {
ApplicationLogReader logReader = application.getLogReader();
- LogReaderRunnable logReaderRunnable = new LogReaderRunnable(logReader, 1 * 1024);
+ LogReaderRunnable logReaderRunnable = new LogReaderRunnable(logReader, LOGREADER_TIMEOUT);
executor = Executors.newSingleThreadExecutor();
executor.submit(logReaderRunnable);
14 years, 2 months
JBoss Tools SVN: r35077 - in trunk/as: tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-27 14:03:33 -0400 (Tue, 27 Sep 2011)
New Revision: 35077
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/LogReaderRunnable.java
Log:
[JBIDE-9773] correcting ApplicationLogReader implementation and adding new tests
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java 2011-09-27 17:59:41 UTC (rev 35076)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java 2011-09-27 18:03:33 UTC (rev 35077)
@@ -30,7 +30,7 @@
private static final long STATUS_REQUEST_DELAY = 4 * 1024;
private IOpenshiftService service;
- private StringReader logReader;
+ private Reader logReader;
private Application application;
private InternalUser user;
private String currentStatus;
@@ -45,37 +45,25 @@
public int read(char[] cbuf, int off, int len) throws IOException {
int charactersRead = -1;
try {
- do {
- charactersRead = readStatus(cbuf, off, len);
- } while (charactersRead == -1);
- } catch (InterruptedException e) {
- // do nothing
- }
- return charactersRead;
- }
-
- protected int readStatus(char[] cbuf, int off, int len) throws IOException,
- InterruptedException {
- int charactersRead = -1;
- if (logReader == null) {
- String status = requestStatus();
- if (status == null) {
- Thread.sleep(STATUS_REQUEST_DELAY);
- return -1;
+ while (charactersRead == -1) {
+ if (logReader == null) {
+ this.logReader = createLogReader(requestStatus());
+ }
+ charactersRead = logReader.read(cbuf, off, len);
+ if (charactersRead == -1) {
+ this.logReader = null;
+ }
+ System.err.println("charactersRead = " + charactersRead);
}
- this.currentStatus = status;
- this.logReader = createLogReader(status);
- }
-
- charactersRead = logReader.read(cbuf, off, len);
- if (charactersRead == -1) {
- this.logReader = null;
+ return charactersRead;
+ } catch (OpenshiftException e) {
+ throw new IOException(e);
+ } catch (InterruptedException e) {
return -1;
}
- return charactersRead;
}
- protected StringReader createLogReader(String status) throws IOException {
+ private Reader createLogReader(String status) throws InterruptedException, IOException {
String log = getLog(status);
return new StringReader(log);
}
@@ -89,17 +77,18 @@
return status.substring(logStart);
}
- protected String requestStatus() throws IOException {
- try {
- String status = service.getStatus(application.getName(), application.getCartridge(), user);
- if (isSameStatus(status, currentStatus)) {
+ protected String requestStatus() throws InterruptedException, OpenshiftException {
+ String status = null;
+ while (status == null) {
+ status = service.getStatus(application.getName(), application.getCartridge(), user);
+ if (isSameStatus(currentStatus, status)) {
+ Thread.sleep(STATUS_REQUEST_DELAY);
status = null;
+ continue;
}
- return status;
-
- } catch (OpenshiftException e) {
- throw new IOException(e);
}
+ this.currentStatus = status;
+ return status;
}
private boolean isSameStatus(String thisStatus, String otherStatus) {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java 2011-09-27 17:59:41 UTC (rev 35076)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java 2011-09-27 18:03:33 UTC (rev 35077)
@@ -90,7 +90,7 @@
try {
application = user.createTestApplication();
ApplicationLogReader logReader = application.getLogReader();
- LogReaderRunnable logReaderRunnable = new LogReaderRunnable(logReader);
+ LogReaderRunnable logReaderRunnable = new LogReaderRunnable(logReader, 10 * 1024);
executor = Executors.newSingleThreadExecutor();
executor.submit(logReaderRunnable);
@@ -101,6 +101,8 @@
application.restart();
String newLog = logReaderRunnable.waitUntilNoNewLogentries();
+ assertNotNull(newLog);
+ assertTrue(newLog.length() > 0);
assertFalse(log.equals(newLog));
} finally {
if (executor != null) {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java 2011-09-27 17:59:41 UTC (rev 35076)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java 2011-09-27 18:03:33 UTC (rev 35077)
@@ -35,54 +35,7 @@
@Before
public void setUp() {
- this.application = new Application("fakeApplication", ICartridge.JBOSSAS_7, null,
- new NoopOpenshiftServiceFake()) {
-
- private String log = INITIAL_LOG;
-
- private static final String INITIAL_LOG =
- "11:31:36,289 INFO [org.jboss.as.ee] (Controller Boot Thread) Activating EE subsystem"
- +"11:31:36,340 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-1) Starting Coyote HTTP/1.1 on http--127.1.9.1-8080"
- +"11:31:36,440 INFO [org.jboss.as.connector] (MSC service thread 1-4) Starting JCA Subsystem (JBoss IronJacamar 1.0.3.Final)"
- +"11:31:36,471 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-1) Bound data source [java:jboss/datasources/ExampleDS]"
- +"11:31:36,966 INFO [org.jboss.as.deployment] (MSC service thread 1-3) Started FileSystemDeploymentService for directory /var/lib/libra/b8ea642ed6aa4dd0af2a4fe94c0ff07c/1317137507620/jbossas-7.0/standalone/deployments"
- +"11:31:36,982 INFO [org.jboss.as] (Controller Boot Thread) JBoss AS 7.0.1.Final \"Zap\" started in 2796ms - Started 82 of 107 services (22 services are passive or on-demand)"
- +"11:31:37,004 INFO [org.jboss.as.server.deployment] (MSC service thread 1-2) Starting deployment of \"ROOT.war\""
- +"11:31:37,084 INFO [org.jboss.as.jpa] (MSC service thread 1-4) added javax.persistence.api dependency to ROOT.war"
- +"11:31:37,403 INFO [org.jboss.web] (MSC service thread 1-3) registering web context: "
- +"11:31:37,445 INFO [org.jboss.as.server.controller] (DeploymentScanner-threads - 2) Deployed \"ROOT.war\"";
-
- private static final String LOG_CONTINUATION =
- "11:32:13,187 INFO [org.apache.catalina.core.AprLifecycleListener] (MSC service thread 1-3) The Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"
- +"11:32:13,295 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-1) Starting Coyote HTTP/1.1 on http--127.1.9.1-8080"
- +"11:32:13,344 INFO [org.jboss.as.connector] (MSC service thread 1-1) Starting JCA Subsystem (JBoss IronJacamar 1.0.3.Final)"
- +"11:32:13,383 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-2) Bound data source [java:jboss/datasources/ExampleDS]"
- +"11:32:13,746 INFO [org.jboss.as.deployment] (MSC service thread 1-2) Started FileSystemDeploymentService for directory /var/lib/libra/b8ea642ed6aa4dd0af2a4fe94c0ff07c/1317137507620/jbossas-7.0/standalone/deployments"
- +"11:32:13,764 INFO [org.jboss.as] (Controller Boot Thread) JBoss AS 7.0.1.Final \"Zap\" started in 2736ms - Started 82 of 107 services (22 services are passive or on-demand)"
- +"11:32:13,772 INFO [org.jboss.as.server.deployment] (MSC service thread 1-4) Starting deployment of \"ROOT.war\""
- +"11:32:13,868 INFO [org.jboss.as.jpa] (MSC service thread 1-1) added javax.persistence.api dependency to ROOT.war"
- +"11:32:14,176 INFO [org.jboss.web] (MSC service thread 1-2) registering web context: "
- +"11:32:14,207 INFO [org.jboss.as.server.controller] (DeploymentScanner-threads - 2) Deployed \"ROOT.war\"";
-
-
- @Override
- public ApplicationLogReader getLogReader() throws OpenshiftException {
- return new ApplicationLogReader(this, getUser(), getService()) {
-
- @Override
- protected int readStatus(char[] cbuf, int off, int len) throws IOException, InterruptedException {
- System.arraycopy(log.toCharArray(), 0, cbuf, off, len);
- return len;
- }
-
- };
- }
-
- @Override
- public void restart() throws OpenshiftException {
- log = LOG_CONTINUATION;
- }
- };
+ this.application = new ApplicationLogFake();
}
@Test
@@ -90,7 +43,7 @@
ExecutorService executor = null;
try {
ApplicationLogReader logReader = application.getLogReader();
- LogReaderRunnable logReaderRunnable = new LogReaderRunnable(logReader);
+ LogReaderRunnable logReaderRunnable = new LogReaderRunnable(logReader, 1 * 1024);
executor = Executors.newSingleThreadExecutor();
executor.submit(logReaderRunnable);
@@ -101,6 +54,8 @@
application.restart();
String newLog = logReaderRunnable.waitUntilNoNewLogentries();
+ assertNotNull(newLog);
+ assertTrue(newLog.length() > 0);
assertFalse(log.equals(newLog));
} finally {
if (executor != null) {
@@ -109,5 +64,71 @@
}
}
+ private static class ApplicationLogFake extends Application {
+ private String log = INITIAL_LOG;
+ private int logPos = 0;
+
+ private static final String INITIAL_LOG =
+ "tailing /var/lib/libra/f36a4acf8a73450cb98637ed4483ea02/1317146294966//jbossas-7.0/standalone/log/server.log"
+ + "------ Tail of 1317146294966 application server.log ------"
+ + "11:31:36,289 INFO [org.jboss.as.ee] (Controller Boot Thread) Activating EE subsystem"
+ + "11:31:36,340 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-1) Starting Coyote HTTP/1.1 on http--127.1.9.1-8080"
+ + "11:31:36,440 INFO [org.jboss.as.connector] (MSC service thread 1-4) Starting JCA Subsystem (JBoss IronJacamar 1.0.3.Final)"
+ + "11:31:36,471 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-1) Bound data source [java:jboss/datasources/ExampleDS]"
+ + "11:31:36,966 INFO [org.jboss.as.deployment] (MSC service thread 1-3) Started FileSystemDeploymentService for directory /var/lib/libra/b8ea642ed6aa4dd0af2a4fe94c0ff07c/1317137507620/jbossas-7.0/standalone/deployments"
+ + "11:31:36,982 INFO [org.jboss.as] (Controller Boot Thread) JBoss AS 7.0.1.Final \"Zap\" started in 2796ms - Started 82 of 107 services (22 services are passive or on-demand)"
+ + "11:31:37,004 INFO [org.jboss.as.server.deployment] (MSC service thread 1-2) Starting deployment of \"ROOT.war\""
+ + "11:31:37,084 INFO [org.jboss.as.jpa] (MSC service thread 1-4) added javax.persistence.api dependency to ROOT.war"
+ + "11:31:37,403 INFO [org.jboss.web] (MSC service thread 1-3) registering web context: "
+ + "11:31:37,445 INFO [org.jboss.as.server.controller] (DeploymentScanner-threads - 2) Deployed \"ROOT.war\"";
+
+ private static final String LOG_CONTINUATION =
+ "11:32:13,187 INFO [org.apache.catalina.core.AprLifecycleListener] (MSC service thread 1-3) The Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"
+ + "11:32:13,295 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-1) Starting Coyote HTTP/1.1 on http--127.1.9.1-8080"
+ + "11:32:13,344 INFO [org.jboss.as.connector] (MSC service thread 1-1) Starting JCA Subsystem (JBoss IronJacamar 1.0.3.Final)"
+ + "11:32:13,383 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-2) Bound data source [java:jboss/datasources/ExampleDS]"
+ + "11:32:13,746 INFO [org.jboss.as.deployment] (MSC service thread 1-2) Started FileSystemDeploymentService for directory /var/lib/libra/b8ea642ed6aa4dd0af2a4fe94c0ff07c/1317137507620/jbossas-7.0/standalone/deployments"
+ + "11:32:13,764 INFO [org.jboss.as] (Controller Boot Thread) JBoss AS 7.0.1.Final \"Zap\" started in 2736ms - Started 82 of 107 services (22 services are passive or on-demand)"
+ + "11:32:13,772 INFO [org.jboss.as.server.deployment] (MSC service thread 1-4) Starting deployment of \"ROOT.war\""
+ + "11:32:13,868 INFO [org.jboss.as.jpa] (MSC service thread 1-1) added javax.persistence.api dependency to ROOT.war"
+ + "11:32:14,176 INFO [org.jboss.web] (MSC service thread 1-2) registering web context: "
+ + "11:32:14,207 INFO [org.jboss.as.server.controller] (DeploymentScanner-threads - 2) Deployed \"ROOT.war\"";
+
+ private ApplicationLogFake() {
+ super("fakeApplication", ICartridge.JBOSSAS_7, null, new NoopOpenshiftServiceFake());
+ }
+
+ @Override
+ public ApplicationLogReader getLogReader() throws OpenshiftException {
+ return new ApplicationLogReader(this, getUser(), getService()) {
+
+ @Override
+ public int read(char[] cbuf, int off, int len) throws IOException {
+ System.err.println(log.substring(0, 50));
+ System.err.println("off = " + off);
+ System.err.println("len = " + len);
+ if (logPos > log.length()) {
+ return -1;
+ }
+
+ if ((logPos + len) > log.length()) {
+ len = log.length() - logPos - 1;
+ }
+
+ System.arraycopy(log.toCharArray(), logPos, cbuf, off, len);
+ logPos++;
+ return len;
+ }
+
+ };
+ }
+
+ @Override
+ public void restart() throws OpenshiftException {
+ System.err.println("restarting!!!!");
+ log = LOG_CONTINUATION;
+ this.logPos = 0;
+ }
+ };
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/LogReaderRunnable.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/LogReaderRunnable.java 2011-09-27 17:59:41 UTC (rev 35076)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/LogReaderRunnable.java 2011-09-27 18:03:33 UTC (rev 35077)
@@ -20,14 +20,14 @@
public class LogReaderRunnable implements Runnable {
- private static final long TIMEOUT = 10; // 10 seconds
-
private ApplicationLogReader logReader;
private BlockingQueue<Character> logQueue;
+ private long timeout;
- public LogReaderRunnable(ApplicationLogReader logReader) {
+ public LogReaderRunnable(ApplicationLogReader logReader, long timeout) {
this.logReader = logReader;
this.logQueue = new LinkedBlockingDeque<Character>();
+ this.timeout = timeout;
}
@Override
@@ -42,7 +42,7 @@
}
private boolean waitForNewLogentries(StringBuilder builder) throws InterruptedException {
- Character character = logQueue.poll(TIMEOUT, TimeUnit.SECONDS);
+ Character character = logQueue.poll(timeout, TimeUnit.MILLISECONDS);
boolean isNewEntry = character != null;
if (isNewEntry) {
builder.append(character);
14 years, 2 months
JBoss Tools SVN: r35076 - in trunk/cdi/plugins: org.jboss.tools.cdi.xml/images and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-09-27 13:59:41 -0400 (Tue, 27 Sep 2011)
New Revision: 35076
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/images/bean_field.png
trunk/cdi/plugins/org.jboss.tools.cdi.core/images/bean_method.png
trunk/cdi/plugins/org.jboss.tools.cdi.core/images/event.png
trunk/cdi/plugins/org.jboss.tools.cdi.core/images/injection_point.png
trunk/cdi/plugins/org.jboss.tools.cdi.core/images/interface.png
trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/images/xstudio/editors/beans_xml.png
trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/annotation.png
trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/bean_class.png
trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/beans_xml.png
Log:
We need icon images for CDI Tools UI https://issues.jboss.org/browse/JBIDE-9717
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/bean_field.png
===================================================================
(Binary files differ)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/bean_method.png
===================================================================
(Binary files differ)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/event.png
===================================================================
(Binary files differ)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/injection_point.png
===================================================================
(Binary files differ)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/interface.png
===================================================================
(Binary files differ)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/annotation.png
===================================================================
(Binary files differ)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/bean_class.png
===================================================================
(Binary files differ)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/beans_xml.png
===================================================================
(Binary files differ)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/images/xstudio/editors/beans_xml.png
===================================================================
(Binary files differ)
14 years, 2 months
JBoss Tools SVN: r35075 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-27 13:10:06 -0400 (Tue, 27 Sep 2011)
New Revision: 35075
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
add more missing deps to TPs
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-09-27 16:54:27 UTC (rev 35074)
+++ trunk/build/target-platform/jbds.target 2011-09-27 17:10:06 UTC (rev 35075)
@@ -49,6 +49,9 @@
<unit id="org.eclipse.mylyn.discovery.ui" version="3.6.0.I20110523-2039"/>
<unit id="org.eclipse.mylyn.discovery.core" version="3.6.0.I20110523-2039"/>
<unit id="org.eclipse.mylyn.commons.ui" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.commons.net" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.commons.screenshots" version="3.6.0.I20110523-2039"/>
+ <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
<!-- Orbit bundles needed for Eclipse Checkstyle (eclipse-cs) -->
<unit id="org.apache.lucene.highlighter" version="2.9.1.v20100421-0704"/>
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-09-27 16:54:27 UTC (rev 35074)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-09-27 17:10:06 UTC (rev 35075)
@@ -59,6 +59,9 @@
<iu id="org.eclipse.mylyn.discovery.ui" version=""/>
<iu id="org.eclipse.mylyn.discovery.core" version=""/>
<iu id="org.eclipse.mylyn.commons.ui" version=""/>
+<iu id="org.eclipse.mylyn.commons.net" version=""/>
+<iu id="org.eclipse.mylyn.commons.screenshots" version=""/>
+<iu id="org.apache.commons.lang" version=""/>
<iu id="org.apache.lucene.highlighter" version=""/>
<iu id="org.apache.lucene.memory" version=""/>
<iu id="org.apache.lucene.misc" version=""/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-09-27 16:54:27 UTC (rev 35074)
+++ trunk/build/target-platform/multiple.target 2011-09-27 17:10:06 UTC (rev 35075)
@@ -51,6 +51,9 @@
<unit id="org.eclipse.mylyn.discovery.ui" version="3.6.0.I20110523-2039"/>
<unit id="org.eclipse.mylyn.discovery.core" version="3.6.0.I20110523-2039"/>
<unit id="org.eclipse.mylyn.commons.ui" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.commons.net" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.commons.screenshots" version="3.6.0.I20110523-2039"/>
+ <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
<!-- Orbit bundles needed for Eclipse Checkstyle (eclipse-cs) -->
<unit id="org.apache.lucene.highlighter" version="2.9.1.v20100421-0704"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-09-27 16:54:27 UTC (rev 35074)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-09-27 17:10:06 UTC (rev 35075)
@@ -60,6 +60,9 @@
<iu id="org.eclipse.mylyn.discovery.ui" version=""/>
<iu id="org.eclipse.mylyn.discovery.core" version=""/>
<iu id="org.eclipse.mylyn.commons.ui" version=""/>
+<iu id="org.eclipse.mylyn.commons.net" version=""/>
+<iu id="org.eclipse.mylyn.commons.screenshots" version=""/>
+<iu id="org.apache.commons.lang" version=""/>
<iu id="org.apache.lucene.highlighter" version=""/>
<iu id="org.apache.lucene.memory" version=""/>
<iu id="org.apache.lucene.misc" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-09-27 16:54:27 UTC (rev 35074)
+++ trunk/build/target-platform/unified.target 2011-09-27 17:10:06 UTC (rev 35075)
@@ -51,6 +51,9 @@
<unit id="org.eclipse.mylyn.discovery.ui" version="3.6.0.I20110523-2039"/>
<unit id="org.eclipse.mylyn.discovery.core" version="3.6.0.I20110523-2039"/>
<unit id="org.eclipse.mylyn.commons.ui" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.commons.net" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.commons.screenshots" version="3.6.0.I20110523-2039"/>
+ <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
<!-- Orbit bundles needed for Eclipse Checkstyle (eclipse-cs) -->
<unit id="org.apache.lucene.highlighter" version="2.9.1.v20100421-0704"/>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2011-09-27 16:54:27 UTC (rev 35074)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-09-27 17:10:06 UTC (rev 35075)
@@ -60,6 +60,8 @@
<iu id="org.eclipse.mylyn.discovery.ui" version=""/>
<iu id="org.eclipse.mylyn.discovery.core" version=""/>
<iu id="org.eclipse.mylyn.commons.ui" version=""/>
+<iu id="org.eclipse.mylyn.commons.net" version=""/>
+<iu id="org.eclipse.mylyn.commons.screenshots" version=""/>
<iu id="org.apache.lucene.highlighter" version=""/>
<iu id="org.apache.lucene.memory" version=""/>
<iu id="org.apache.lucene.misc" version=""/>
14 years, 2 months
JBoss Tools SVN: r35074 - trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-27 12:54:27 -0400 (Tue, 27 Sep 2011)
New Revision: 35074
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/LogReaderRunnable.java
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java
Log:
[JBIDE-9773] correcting ApplicationLogReader implementation and adding new tests
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java 2011-09-27 16:53:50 UTC (rev 35073)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java 2011-09-27 16:54:27 UTC (rev 35074)
@@ -15,11 +15,8 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.TimeUnit;
import org.jboss.ide.eclipse.as.openshift.core.ApplicationLogReader;
import org.jboss.ide.eclipse.as.openshift.core.IApplication;
@@ -38,8 +35,6 @@
*/
public class ApplicationLogReaderIntegrationTest {
- private static final long TIMEOUT = 10;
-
private IOpenshiftService service;
private TestUser user;
@@ -116,43 +111,4 @@
}
}
}
-
- private static class LogReaderRunnable implements Runnable {
-
- private ApplicationLogReader logReader;
- private BlockingQueue<Character> logQueue;
-
- public LogReaderRunnable(ApplicationLogReader logReader) {
- this.logReader = logReader;
- this.logQueue = new LinkedBlockingDeque<Character>();
- }
-
- @Override
- public void run() {
- try {
- for (int data = -1; (data = logReader.read()) != -1;) {
- logQueue.put((char) data);
- }
- } catch (Exception e) {
- // do nothing
- }
- }
-
- private boolean waitForNewLogentries(StringBuilder builder) throws InterruptedException {
- Character character = logQueue.poll(TIMEOUT, TimeUnit.SECONDS);
- boolean newEntry = character != null;
- if (newEntry) {
- builder.append(character);
- }
- return newEntry;
- }
-
- public String waitUntilNoNewLogentries() throws InterruptedException {
- StringBuilder builder = new StringBuilder();
- while (waitForNewLogentries(builder)) {
- ;
- }
- return builder.toString();
- }
- }
}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java 2011-09-27 16:54:27 UTC (rev 35074)
@@ -0,0 +1,113 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.openshift.test.internal.core;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.jboss.ide.eclipse.as.openshift.core.ApplicationLogReader;
+import org.jboss.ide.eclipse.as.openshift.core.ICartridge;
+import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
+import org.jboss.ide.eclipse.as.openshift.core.internal.Application;
+import org.jboss.ide.eclipse.as.openshift.test.internal.core.fakes.NoopOpenshiftServiceFake;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author André Dietisheim
+ */
+public class ApplicationLogReaderTest {
+
+ private Application application;
+
+ @Before
+ public void setUp() {
+ this.application = new Application("fakeApplication", ICartridge.JBOSSAS_7, null,
+ new NoopOpenshiftServiceFake()) {
+
+ private String log = INITIAL_LOG;
+
+ private static final String INITIAL_LOG =
+ "11:31:36,289 INFO [org.jboss.as.ee] (Controller Boot Thread) Activating EE subsystem"
+ +"11:31:36,340 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-1) Starting Coyote HTTP/1.1 on http--127.1.9.1-8080"
+ +"11:31:36,440 INFO [org.jboss.as.connector] (MSC service thread 1-4) Starting JCA Subsystem (JBoss IronJacamar 1.0.3.Final)"
+ +"11:31:36,471 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-1) Bound data source [java:jboss/datasources/ExampleDS]"
+ +"11:31:36,966 INFO [org.jboss.as.deployment] (MSC service thread 1-3) Started FileSystemDeploymentService for directory /var/lib/libra/b8ea642ed6aa4dd0af2a4fe94c0ff07c/1317137507620/jbossas-7.0/standalone/deployments"
+ +"11:31:36,982 INFO [org.jboss.as] (Controller Boot Thread) JBoss AS 7.0.1.Final \"Zap\" started in 2796ms - Started 82 of 107 services (22 services are passive or on-demand)"
+ +"11:31:37,004 INFO [org.jboss.as.server.deployment] (MSC service thread 1-2) Starting deployment of \"ROOT.war\""
+ +"11:31:37,084 INFO [org.jboss.as.jpa] (MSC service thread 1-4) added javax.persistence.api dependency to ROOT.war"
+ +"11:31:37,403 INFO [org.jboss.web] (MSC service thread 1-3) registering web context: "
+ +"11:31:37,445 INFO [org.jboss.as.server.controller] (DeploymentScanner-threads - 2) Deployed \"ROOT.war\"";
+
+ private static final String LOG_CONTINUATION =
+ "11:32:13,187 INFO [org.apache.catalina.core.AprLifecycleListener] (MSC service thread 1-3) The Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"
+ +"11:32:13,295 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-1) Starting Coyote HTTP/1.1 on http--127.1.9.1-8080"
+ +"11:32:13,344 INFO [org.jboss.as.connector] (MSC service thread 1-1) Starting JCA Subsystem (JBoss IronJacamar 1.0.3.Final)"
+ +"11:32:13,383 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-2) Bound data source [java:jboss/datasources/ExampleDS]"
+ +"11:32:13,746 INFO [org.jboss.as.deployment] (MSC service thread 1-2) Started FileSystemDeploymentService for directory /var/lib/libra/b8ea642ed6aa4dd0af2a4fe94c0ff07c/1317137507620/jbossas-7.0/standalone/deployments"
+ +"11:32:13,764 INFO [org.jboss.as] (Controller Boot Thread) JBoss AS 7.0.1.Final \"Zap\" started in 2736ms - Started 82 of 107 services (22 services are passive or on-demand)"
+ +"11:32:13,772 INFO [org.jboss.as.server.deployment] (MSC service thread 1-4) Starting deployment of \"ROOT.war\""
+ +"11:32:13,868 INFO [org.jboss.as.jpa] (MSC service thread 1-1) added javax.persistence.api dependency to ROOT.war"
+ +"11:32:14,176 INFO [org.jboss.web] (MSC service thread 1-2) registering web context: "
+ +"11:32:14,207 INFO [org.jboss.as.server.controller] (DeploymentScanner-threads - 2) Deployed \"ROOT.war\"";
+
+
+ @Override
+ public ApplicationLogReader getLogReader() throws OpenshiftException {
+ return new ApplicationLogReader(this, getUser(), getService()) {
+
+ @Override
+ protected int readStatus(char[] cbuf, int off, int len) throws IOException, InterruptedException {
+ System.arraycopy(log.toCharArray(), 0, cbuf, off, len);
+ return len;
+ }
+
+ };
+ }
+
+ @Override
+ public void restart() throws OpenshiftException {
+ log = LOG_CONTINUATION;
+ }
+ };
+ }
+
+ @Test
+ public void logReaderReturnsNewEntriesAfterApplicationRestart() throws Exception {
+ ExecutorService executor = null;
+ try {
+ ApplicationLogReader logReader = application.getLogReader();
+ LogReaderRunnable logReaderRunnable = new LogReaderRunnable(logReader);
+ executor = Executors.newSingleThreadExecutor();
+ executor.submit(logReaderRunnable);
+
+ String log = logReaderRunnable.waitUntilNoNewLogentries();
+ assertNotNull(log);
+ assertTrue(log.length() > 0);
+
+ application.restart();
+
+ String newLog = logReaderRunnable.waitUntilNoNewLogentries();
+ assertFalse(log.equals(newLog));
+ } finally {
+ if (executor != null) {
+ executor.shutdownNow();
+ }
+ }
+ }
+
+
+}
Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/LogReaderRunnable.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/LogReaderRunnable.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/LogReaderRunnable.java 2011-09-27 16:54:27 UTC (rev 35074)
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.openshift.test.internal.core;
+
+import static org.junit.Assert.fail;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.TimeUnit;
+
+import org.jboss.ide.eclipse.as.openshift.core.ApplicationLogReader;
+
+public class LogReaderRunnable implements Runnable {
+
+ private static final long TIMEOUT = 10; // 10 seconds
+
+ private ApplicationLogReader logReader;
+ private BlockingQueue<Character> logQueue;
+
+ public LogReaderRunnable(ApplicationLogReader logReader) {
+ this.logReader = logReader;
+ this.logQueue = new LinkedBlockingDeque<Character>();
+ }
+
+ @Override
+ public void run() {
+ try {
+ for (int data = -1; (data = logReader.read()) != -1;) {
+ logQueue.put((char) data);
+ }
+ } catch (Exception e) {
+ fail(e.getMessage());
+ }
+ }
+
+ private boolean waitForNewLogentries(StringBuilder builder) throws InterruptedException {
+ Character character = logQueue.poll(TIMEOUT, TimeUnit.SECONDS);
+ boolean isNewEntry = character != null;
+ if (isNewEntry) {
+ builder.append(character);
+ }
+ return isNewEntry;
+ }
+
+ public String waitUntilNoNewLogentries() throws InterruptedException {
+ StringBuilder builder = new StringBuilder();
+ while (waitForNewLogentries(builder)) {
+ ;
+ }
+ return builder.toString();
+ }
+}
\ No newline at end of file
Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/LogReaderRunnable.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 2 months
JBoss Tools SVN: r35073 - trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-27 12:53:50 -0400 (Tue, 27 Sep 2011)
New Revision: 35073
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftCoreActivator.java
Log:
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftCoreActivator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftCoreActivator.java 2011-09-27 16:14:42 UTC (rev 35072)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftCoreActivator.java 2011-09-27 16:53:50 UTC (rev 35073)
@@ -16,7 +16,7 @@
public class OpenshiftCoreActivator implements BundleActivator {
public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.openshift.core";
-
+
private static BundleContext context;
static BundleContext getContext() {
14 years, 2 months
JBoss Tools SVN: r35072 - trunk/download.jboss.org/jbosstools/builds/cascade.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-27 12:14:42 -0400 (Tue, 27 Sep 2011)
New Revision: 35072
Modified:
trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
Log:
add central to swimlanes doc -- depends on runtime and examples
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2011-09-27 16:11:10 UTC (rev 35071)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2011-09-27 16:14:42 UTC (rev 35072)
@@ -1,4 +1,4 @@
-Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2011/09/14
+Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2011/09/27
------------------------
@@ -37,5 +37,6 @@
tptp [REMOVED]
smooks [removed from JBDS, still in JBT]
seam -> hibernate, jsf
+central -> runtime, examples
------------------------
14 years, 2 months
JBoss Tools SVN: r35071 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-27 12:11:10 -0400 (Tue, 27 Sep 2011)
New Revision: 35071
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
add actual versions of IUs
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-09-27 15:59:20 UTC (rev 35070)
+++ trunk/build/target-platform/jbds.target 2011-09-27 16:11:10 UTC (rev 35071)
@@ -45,10 +45,10 @@
<!-- needed for JBoss Central -->
<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
- <unit id="org.eclipse.mylyn.commons.core" version="3.6.0"/>
- <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.0"/>
- <unit id="org.eclipse.mylyn.discovery.core" version="3.6.0"/>
- <unit id="org.eclipse.mylyn.commons.ui" version="3.6.0"/>
+ <unit id="org.eclipse.mylyn.commons.core" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.discovery.core" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.commons.ui" version="3.6.0.I20110523-2039"/>
<!-- Orbit bundles needed for Eclipse Checkstyle (eclipse-cs) -->
<unit id="org.apache.lucene.highlighter" version="2.9.1.v20100421-0704"/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-09-27 15:59:20 UTC (rev 35070)
+++ trunk/build/target-platform/multiple.target 2011-09-27 16:11:10 UTC (rev 35071)
@@ -47,10 +47,10 @@
<!-- needed for JBoss Central -->
<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
- <unit id="org.eclipse.mylyn.commons.core" version="3.6.0"/>
- <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.0"/>
- <unit id="org.eclipse.mylyn.discovery.core" version="3.6.0"/>
- <unit id="org.eclipse.mylyn.commons.ui" version="3.6.0"/>
+ <unit id="org.eclipse.mylyn.commons.core" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.discovery.core" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.commons.ui" version="3.6.0.I20110523-2039"/>
<!-- Orbit bundles needed for Eclipse Checkstyle (eclipse-cs) -->
<unit id="org.apache.lucene.highlighter" version="2.9.1.v20100421-0704"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-09-27 15:59:20 UTC (rev 35070)
+++ trunk/build/target-platform/unified.target 2011-09-27 16:11:10 UTC (rev 35071)
@@ -47,10 +47,10 @@
<!-- needed for JBoss Central -->
<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
- <unit id="org.eclipse.mylyn.commons.core" version="3.6.0"/>
- <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.0"/>
- <unit id="org.eclipse.mylyn.discovery.core" version="3.6.0"/>
- <unit id="org.eclipse.mylyn.commons.ui" version="3.6.0"/>
+ <unit id="org.eclipse.mylyn.commons.core" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.discovery.core" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.commons.ui" version="3.6.0.I20110523-2039"/>
<!-- Orbit bundles needed for Eclipse Checkstyle (eclipse-cs) -->
<unit id="org.apache.lucene.highlighter" version="2.9.1.v20100421-0704"/>
14 years, 2 months
JBoss Tools SVN: r35070 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-27 11:59:20 -0400 (Tue, 27 Sep 2011)
New Revision: 35070
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
add JBoss Central Mylyn reqs to TPs
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-09-27 15:58:23 UTC (rev 35069)
+++ trunk/build/target-platform/jbds.target 2011-09-27 15:59:20 UTC (rev 35070)
@@ -42,7 +42,13 @@
<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.integration" version="1.1.0.v20090501071000"/>
+
+ <!-- needed for JBoss Central -->
<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
+ <unit id="org.eclipse.mylyn.commons.core" version="3.6.0"/>
+ <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.0"/>
+ <unit id="org.eclipse.mylyn.discovery.core" version="3.6.0"/>
+ <unit id="org.eclipse.mylyn.commons.ui" version="3.6.0"/>
<!-- Orbit bundles needed for Eclipse Checkstyle (eclipse-cs) -->
<unit id="org.apache.lucene.highlighter" version="2.9.1.v20100421-0704"/>
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-09-27 15:58:23 UTC (rev 35069)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-09-27 15:59:20 UTC (rev 35070)
@@ -55,6 +55,10 @@
<iu id="org.hamcrest.library" version=""/>
<iu id="org.hamcrest.integration" version=""/>
<iu id="com.sun.syndication" version=""/>
+<iu id="org.eclipse.mylyn.commons.core" version=""/>
+<iu id="org.eclipse.mylyn.discovery.ui" version=""/>
+<iu id="org.eclipse.mylyn.discovery.core" version=""/>
+<iu id="org.eclipse.mylyn.commons.ui" version=""/>
<iu id="org.apache.lucene.highlighter" version=""/>
<iu id="org.apache.lucene.memory" version=""/>
<iu id="org.apache.lucene.misc" version=""/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-09-27 15:58:23 UTC (rev 35069)
+++ trunk/build/target-platform/multiple.target 2011-09-27 15:59:20 UTC (rev 35070)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?><?pde version="3.6"?>
<target includeMode="feature" name="e37-wtp33">
<!-- Pro tip: to convert
- from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
+ from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/>
- using vi, apply this transform:
+ using vi, apply this transform:
:%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
-->
<locations>
@@ -14,7 +14,7 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<!-- don't forget to increment these files when moving up a version:
- build.xml, *.target*, publish.sh, target2p2mirror.xml -->
+ build.xml, *.target*, publish.sh, target2p2mirror.xml -->
<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1/"/>
<!-- m2e 1.0 / m2e-wtp 0.13.1.20110718-1012 + deps -->
@@ -44,7 +44,13 @@
<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.integration" version="1.1.0.v20090501071000"/>
+
+ <!-- needed for JBoss Central -->
<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
+ <unit id="org.eclipse.mylyn.commons.core" version="3.6.0"/>
+ <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.0"/>
+ <unit id="org.eclipse.mylyn.discovery.core" version="3.6.0"/>
+ <unit id="org.eclipse.mylyn.commons.ui" version="3.6.0"/>
<!-- Orbit bundles needed for Eclipse Checkstyle (eclipse-cs) -->
<unit id="org.apache.lucene.highlighter" version="2.9.1.v20100421-0704"/>
@@ -195,7 +201,7 @@
<unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.100.v201005241530-78-FF0DZRDKDDePSKwHj"/>
<unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.100.v201102200555-7H78AKFAKlZgiH3jFfA3z0E6I6I"/>
<unit id="org.eclipse.jpt.common.feature.feature.group" version="1.0.1.v201108080010-6-0AkF7BB7S9N7788"/>
- <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.0.1.v201108080010-3-08s73553F3G3343"/>
+ <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.0.1.v201108080010-3-08s73553F3G3343"/>
<unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.0.0.v201103020003-7T7F77FD3wTgkUOWfVnWb"/>
<unit id="org.eclipse.persistence.jpa.feature.group" version="2.3.0.v20110521-r9438"/>
<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.3.0.v201102150115-377DF8s7355397B4B9B"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-09-27 15:58:23 UTC (rev 35069)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-09-27 15:59:20 UTC (rev 35070)
@@ -56,6 +56,10 @@
<iu id="org.hamcrest.library" version=""/>
<iu id="org.hamcrest.integration" version=""/>
<iu id="com.sun.syndication" version=""/>
+<iu id="org.eclipse.mylyn.commons.core" version=""/>
+<iu id="org.eclipse.mylyn.discovery.ui" version=""/>
+<iu id="org.eclipse.mylyn.discovery.core" version=""/>
+<iu id="org.eclipse.mylyn.commons.ui" version=""/>
<iu id="org.apache.lucene.highlighter" version=""/>
<iu id="org.apache.lucene.memory" version=""/>
<iu id="org.apache.lucene.misc" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-09-27 15:58:23 UTC (rev 35069)
+++ trunk/build/target-platform/unified.target 2011-09-27 15:59:20 UTC (rev 35070)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?><?pde version="3.6"?>
<target includeMode="feature" name="e37-wtp33">
<!-- Pro tip: to convert
- from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
+ from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/>
- using vi, apply this transform:
+ using vi, apply this transform:
:%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
-->
<locations>
@@ -14,7 +14,7 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<!-- don't forget to increment these files when moving up a version:
- build.xml, *.target*, publish.sh, target2p2mirror.xml -->
+ build.xml, *.target*, publish.sh, target2p2mirror.xml -->
<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/l..."/>
<!-- m2e 1.0 / m2e-wtp 0.13.1.20110718-1012 + deps -->
@@ -44,7 +44,13 @@
<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.integration" version="1.1.0.v20090501071000"/>
+
+ <!-- needed for JBoss Central -->
<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
+ <unit id="org.eclipse.mylyn.commons.core" version="3.6.0"/>
+ <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.0"/>
+ <unit id="org.eclipse.mylyn.discovery.core" version="3.6.0"/>
+ <unit id="org.eclipse.mylyn.commons.ui" version="3.6.0"/>
<!-- Orbit bundles needed for Eclipse Checkstyle (eclipse-cs) -->
<unit id="org.apache.lucene.highlighter" version="2.9.1.v20100421-0704"/>
@@ -195,7 +201,7 @@
<unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.100.v201005241530-78-FF0DZRDKDDePSKwHj"/>
<unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.100.v201102200555-7H78AKFAKlZgiH3jFfA3z0E6I6I"/>
<unit id="org.eclipse.jpt.common.feature.feature.group" version="1.0.1.v201108080010-6-0AkF7BB7S9N7788"/>
- <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.0.1.v201108080010-3-08s73553F3G3343"/>
+ <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.0.1.v201108080010-3-08s73553F3G3343"/>
<unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.0.0.v201103020003-7T7F77FD3wTgkUOWfVnWb"/>
<unit id="org.eclipse.persistence.jpa.feature.group" version="2.3.0.v20110521-r9438"/>
<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.3.0.v201102150115-377DF8s7355397B4B9B"/>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2011-09-27 15:58:23 UTC (rev 35069)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-09-27 15:59:20 UTC (rev 35070)
@@ -55,7 +55,11 @@
<iu id="org.hamcrest.text" version=""/>
<iu id="org.hamcrest.library" version=""/>
<iu id="org.hamcrest.integration" version=""/>
-<iut id="com.sun.syndication" version=""/>
+<iu id="com.sun.syndication" version=""/>
+<iu id="org.eclipse.mylyn.commons.core" version=""/>
+<iu id="org.eclipse.mylyn.discovery.ui" version=""/>
+<iu id="org.eclipse.mylyn.discovery.core" version=""/>
+<iu id="org.eclipse.mylyn.commons.ui" version=""/>
<iu id="org.apache.lucene.highlighter" version=""/>
<iu id="org.apache.lucene.memory" version=""/>
<iu id="org.apache.lucene.misc" version=""/>
14 years, 2 months
JBoss Tools SVN: r35069 - trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-27 11:58:23 -0400 (Tue, 27 Sep 2011)
New Revision: 35069
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/User.java
Log:
[JBIDE-9773] hiding User implementation from user programmer
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/User.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/User.java 2011-09-27 15:52:59 UTC (rev 35068)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/User.java 2011-09-27 15:58:23 UTC (rev 35069)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.openshift.core;
import org.jboss.ide.eclipse.as.openshift.core.internal.InternalUser;
@@ -2,2 +12,5 @@
+/**
+ * @author André Dietisheim
+ */
public class User extends InternalUser {
14 years, 2 months