JBoss Tools SVN: r34777 - branches/jbosstools-3.2.x/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-09-15 13:26:16 -0400 (Thu, 15 Sep 2011)
New Revision: 34777
Modified:
branches/jbosstools-3.2.x/build/publish.sh
Log:
add --protocol=28 to make rsync to old slaves happy
Modified: branches/jbosstools-3.2.x/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.x/build/publish.sh 2011-09-15 17:25:35 UTC (rev 34776)
+++ branches/jbosstools-3.2.x/build/publish.sh 2011-09-15 17:26:16 UTC (rev 34777)
@@ -266,13 +266,13 @@
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/
# sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead
# echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${PUBLISHPATHSUFFIX}/
- pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync -l latest ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/; rm -f latest; popd >/dev/null
+ pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/; rm -f latest; popd >/dev/null
date; rsync -arzq --protocol=28 --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/
else
date; rsync -arzq --protocol=28 --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/
# sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead
# echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${JOBNAMEREDUX}/
- pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync -l latest ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/; rm -f latest; popd >/dev/null
+ pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/; rm -f latest; popd >/dev/null
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/
fi
rm -f /tmp/latestBuild.html
14 years, 7 months
JBoss Tools SVN: r34776 - branches/jbosstools-3.3.0.M3/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-09-15 13:25:35 -0400 (Thu, 15 Sep 2011)
New Revision: 34776
Modified:
branches/jbosstools-3.3.0.M3/build/publish.sh
Log:
only publish site_assembly.zip, not site.zip (empty zip)
Modified: branches/jbosstools-3.3.0.M3/build/publish.sh
===================================================================
--- branches/jbosstools-3.3.0.M3/build/publish.sh 2011-09-15 17:21:21 UTC (rev 34775)
+++ branches/jbosstools-3.3.0.M3/build/publish.sh 2011-09-15 17:25:35 UTC (rev 34776)
@@ -41,21 +41,12 @@
z=""
if [[ -d ${WORKSPACE}/sources/aggregate/site/target ]]; then
siteZip=${WORKSPACE}/sources/aggregate/site/target/site_assembly.zip
- if [[ ! -f ${WORKSPACE}/sources/aggregate/site/target/site_assembly.zip ]]; then
- siteZip=${WORKSPACE}/sources/aggregate/site/target/site.zip
- fi
z=$siteZip
elif [[ -d ${WORKSPACE}/sources/aggregate/site/site/target ]]; then
siteZip=${WORKSPACE}/sources/aggregate/site/site/target/site_assembly.zip
- if [[ ! -f ${WORKSPACE}/sources/aggregate/site/site/target/site_assembly.zip ]]; then
- siteZip=${WORKSPACE}/sources/aggregate/site/site/target/site.zip
- fi
z=$siteZip
elif [[ -d ${WORKSPACE}/sources/site/target ]]; then
siteZip=${WORKSPACE}/sources/site/target/site_assembly.zip
- if [[ ! -f ${WORKSPACE}/sources/site/target/site_assembly.zip ]]; then
- siteZip=${WORKSPACE}/sources/site/target/site.zip
- fi
z=$siteZip
fi
@@ -113,8 +104,8 @@
fi
z=""
-# if component zips exist, copy them too; first site.zip, then site_assembly.zip
-for z in $(find ${WORKSPACE}/sources/*/site/target -type f -name "site*.zip" | sort -r); do
+# if component zips exist, copy site_assembly.zip too
+for z in $(find ${WORKSPACE}/sources/*/site/target -type f -name "site_assembly.zip"); do
y=${z%%/site/target/*}; y=${y##*/}
if [[ $y != "aggregate" ]]; then # prevent duplicate nested sites
#echo "[$y] $z ..."
14 years, 7 months
JBoss Tools SVN: r34775 - branches/jbosstools-3.3.0.M3/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-09-15 13:21:21 -0400 (Thu, 15 Sep 2011)
New Revision: 34775
Modified:
branches/jbosstools-3.3.0.M3/build/publish.sh
Log:
add --protocol=28 to rsync -l for bad slaves
Modified: branches/jbosstools-3.3.0.M3/build/publish.sh
===================================================================
--- branches/jbosstools-3.3.0.M3/build/publish.sh 2011-09-15 17:14:07 UTC (rev 34774)
+++ branches/jbosstools-3.3.0.M3/build/publish.sh 2011-09-15 17:21:21 UTC (rev 34775)
@@ -275,13 +275,13 @@
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/
# sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead
# echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${PUBLISHPATHSUFFIX}/
- pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync -l latest ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/; rm -f latest; popd >/dev/null
+ pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/; rm -f latest; popd >/dev/null
date; rsync -arzq --protocol=28 --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/
else
date; rsync -arzq --protocol=28 --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/
# sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead
# echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${JOBNAMEREDUX}/
- pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync -l latest ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/; rm -f latest; popd >/dev/null
+ pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/; rm -f latest; popd >/dev/null
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/
fi
rm -f /tmp/latestBuild.html
14 years, 7 months
JBoss Tools SVN: r34774 - 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-15 13:14:07 -0400 (Thu, 15 Sep 2011)
New Revision: 34774
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java
Log:
[JBIDE-9510] implementing IOpenshiftService#getApplicationStatus and ApplicationStatusReader
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-15 17:08:51 UTC (rev 34773)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java 2011-09-15 17:14:07 UTC (rev 34774)
@@ -17,6 +17,11 @@
import java.util.regex.Pattern;
/**
+ * TODO: make sure it behaves correctly on subsequent requests that get app
+ * status on the server: The server would either repeat the whole log or just
+ * respond with the diff.
+ *
+ *
* @author André Dietisheim
*/
public class ApplicationLogReader extends Reader {
@@ -61,13 +66,6 @@
return status.substring(logIndex);
}
- @Override
- public void close() throws IOException {
- if (logReader != null) {
- logReader.close();
- }
- }
-
protected String requestStatus() throws IOException {
try {
return service.getStatus(application.getName(), application.getCartridge());
@@ -75,4 +73,11 @@
throw new IOException(e);
}
}
+
+ @Override
+ public void close() throws IOException {
+ if (logReader != null) {
+ logReader.close();
+ }
+ }
}
14 years, 7 months
JBoss Tools SVN: r34773 - in trunk/as: plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-09-15 13:08:51 -0400 (Thu, 15 Sep 2011)
New Revision: 34773
Added:
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/internal/response/StringResponseUnmarshaller.java
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationStatusReader.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusResponseUnmarshaller.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java
Log:
[JBIDE-9510] implementing IOpenshiftService#getApplicationStatus and ApplicationStatusReader
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java 2011-09-15 16:10:00 UTC (rev 34772)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java 2011-09-15 17:08:51 UTC (rev 34773)
@@ -16,6 +16,7 @@
private String name;
private Cartridge cartridge;
private IOpenshiftService service;
+ private ApplicationLogReader logReader;
public Application(String name, Cartridge cartridge, IOpenshiftService service) {
this.name = name;
@@ -47,7 +48,10 @@
service.stopApplication(name, cartridge);
}
- public ApplicationStatusReader getStatus() throws OpenshiftException {
- return new ApplicationStatusReader(this, service);
+ public ApplicationLogReader getLog() throws OpenshiftException {
+ if (logReader == null) {
+ this.logReader = new ApplicationLogReader(this, service);
+ }
+ return logReader;
}
}
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java (from rev 34765, trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationStatusReader.java)
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java 2011-09-15 17:08:51 UTC (rev 34773)
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * 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 java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author André Dietisheim
+ */
+public class ApplicationLogReader extends Reader {
+
+ private static final Pattern LOG_REGEX = Pattern.compile("Tail of .+$", Pattern.MULTILINE);
+
+ private IOpenshiftService service;
+ private StringReader logReader;
+ private Application application;
+ private int logIndex = 0;
+
+ public ApplicationLogReader(Application application, IOpenshiftService service) {
+ this.application = application;
+ this.service = service;
+ }
+
+ @Override
+ public int read(char[] cbuf, int off, int len) throws IOException {
+ int charactersRead = -1;
+ if (logReader == null) {
+ this.logReader = createLogReader(requestStatus());
+ }
+ charactersRead = logReader.read(cbuf, off, len);
+ if (charactersRead != -1) {
+ logIndex += charactersRead;
+ return charactersRead;
+ }
+ this.logReader = null;
+ return -1;
+ }
+
+ protected StringReader createLogReader(String status) throws IOException {
+ String log = getLog(status);
+ return new StringReader(log);
+ }
+
+ private String getLog(String status) throws IOException {
+ Matcher matcher = LOG_REGEX.matcher(status);
+ if (matcher.find()) {
+ logIndex = matcher.end() + 1;
+ }
+ return status.substring(logIndex);
+ }
+
+ @Override
+ public void close() throws IOException {
+ if (logReader != null) {
+ logReader.close();
+ }
+ }
+
+ protected String requestStatus() throws IOException {
+ try {
+ return service.getStatus(application.getName(), application.getCartridge());
+ } catch (OpenshiftException e) {
+ throw new IOException(e);
+ }
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationStatusReader.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationStatusReader.java 2011-09-15 16:10:00 UTC (rev 34772)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationStatusReader.java 2011-09-15 17:08:51 UTC (rev 34773)
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.openshift.core;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-
-/**
- * @author André Dietisheim
- */
-public class ApplicationStatusReader extends Reader {
-
- private IOpenshiftService service;
- private Application application;
- private StringReader serviceResponseReader;
-
- public ApplicationStatusReader(Application application, IOpenshiftService service) {
- this.application = application;
- this.service = service;
- }
-
- protected String requestStatus() throws IOException {
- try {
- return service.getStatus(application.getName(), application.getCartridge());
- } catch (OpenshiftException e) {
- throw new IOException(e);
- }
- }
-
- @Override
- public int read(char[] cbuf, int off, int len) throws IOException {
- int charactersRead = -1;
- for (;;) {
- charactersRead = getServiceResponseReader().read(cbuf, off, len);
- if (charactersRead != -1) {
- return charactersRead;
- }
- }
- }
-
- private Reader getServiceResponseReader() throws IOException {
- if (serviceResponseReader == null) {
- this.serviceResponseReader = new StringReader(requestStatus());
- }
- return serviceResponseReader;
-
- }
-
- @Override
- public void close() throws IOException {
- if (serviceResponseReader != null) {
- serviceResponseReader.close();
- }
- }
-}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.java 2011-09-15 16:10:00 UTC (rev 34772)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.java 2011-09-15 17:08:51 UTC (rev 34773)
@@ -31,7 +31,7 @@
public Application stopApplication(String name, Cartridge cartridge) throws OpenshiftException;
- public String getStatus(String applicationName, Cartridge cartridge) throws OpenshiftException;
+ public String getStatus(String name, Cartridge cartridge) throws OpenshiftException;
public Domain changeDomain(String domainName, SSHKey sshKey) throws OpenshiftException;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-15 16:10:00 UTC (rev 34772)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-15 17:08:51 UTC (rev 34773)
@@ -188,9 +188,9 @@
* ,"app_name","api"],"exit_code":0}
*/
@Override
- public String getStatus(String name, Cartridge cartridge) throws OpenshiftException {
+ public String getStatus(String applicationName, Cartridge cartridge) throws OpenshiftException {
ApplicationRequest applicationRequest =
- new ApplicationRequest(name, cartridge, ApplicationAction.STATUS, username, true);
+ new ApplicationRequest(applicationName, cartridge, ApplicationAction.STATUS, username, true);
String url = applicationRequest.getUrlString(BASE_URL);
try {
String applicationRequestString =
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusResponseUnmarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusResponseUnmarshaller.java 2011-09-15 16:10:00 UTC (rev 34772)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusResponseUnmarshaller.java 2011-09-15 17:08:51 UTC (rev 34773)
@@ -10,15 +10,10 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.openshift.core.internal.response;
-import org.jboss.dmr.ModelNode;
/**
* @author André Dietisheim
*/
-public class ApplicationStatusResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<String> {
+public class ApplicationStatusResponseUnmarshaller extends StringResponseUnmarshaller {
- @Override
- protected String createFromResultNode(ModelNode node) {
- return node.asString();
- }
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/StringResponseUnmarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/StringResponseUnmarshaller.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/StringResponseUnmarshaller.java 2011-09-15 17:08:51 UTC (rev 34773)
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * 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.internal.response;
+
+import org.jboss.dmr.ModelNode;
+
+/**
+ * @author André Dietisheim
+ */
+public class StringResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<String> {
+
+ @Override
+ protected String createFromResultNode(ModelNode node) {
+ return node.asString();
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/StringResponseUnmarshaller.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java 2011-09-15 16:10:00 UTC (rev 34772)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java 2011-09-15 17:08:51 UTC (rev 34773)
@@ -11,9 +11,14 @@
package org.jboss.ide.eclipse.as.openshift.test.internal.core;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import java.io.IOException;
import java.net.URLEncoder;
+import org.jboss.ide.eclipse.as.openshift.core.Application;
+import org.jboss.ide.eclipse.as.openshift.core.ApplicationLogReader;
import org.jboss.ide.eclipse.as.openshift.core.Cartridge;
import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftService;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
@@ -38,20 +43,8 @@
private static final String APPLICATION_NAME = "1316010645406";
private static final Cartridge APPLICATION_CARTRIDGE = Cartridge.JBOSSAS_7;
- private static final String statusResponse =
- "{\"messages\":\"\","
- + "\"debug\":\"\","
- + "\"data\":null,"
- + "\"api\":\"1.1.1\","
- + "\"api_c\":[\"placeholder\"],"
- + "\"result\":\""
- + "tailing /var/lib/libra/664e4d4dbce74c69ac321053149546df/"
- + APPLICATION_NAME
- + "//"
- + APPLICATION_CARTRIDGE
- + "/standalone/log/server.log\n"
- + "------ Tail of 1316010645406 application server.log ------\n"
- + "10:30:38,700 INFO [org.apache.catalina.core.AprLifecycleListener] (MSC service thread 1-1) "
+ private static final String log =
+ "10:30:38,700 INFO [org.apache.catalina.core.AprLifecycleListener] (MSC service thread 1-1) "
+ "The Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path:"
+ "/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64:"
+ "/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib\n"
@@ -63,7 +56,32 @@
+ "10:30:39,339 INFO [org.jboss.as.server.deployment] (MSC service thread 1-3) Starting deployment of \\\"ROOT.war\\\"\n"
+ "10:30:39,424 INFO [org.jboss.as.jpa] (MSC service thread 1-1) added javax.persistence.api dependency to ROOT.war\n"
+ "10:30:39,700 INFO [org.jboss.web] (MSC service thread 1-2) registering web context: \n"
- + "10:30:39,742 INFO [org.jboss.as.server.controller] (DeploymentScanner-threads - 2) Deployed \\\"ROOT.war\\\"\n"
+ + "10:30:39,742 INFO [org.jboss.as.server.controller] (DeploymentScanner-threads - 2) Deployed \\\"ROOT.war\\\"\n";
+
+ private static final String tail =
+ "tailing /var/lib/libra/664e4d4dbce74c69ac321053149546df/"
+
+ + APPLICATION_NAME
+
+ + "//"
+
+ + APPLICATION_CARTRIDGE
+
+ + "/standalone/log/server.log\n"
+ + "------ Tail of 1316010645406 application server.log ------\n"
+
+ + log;
+
+ private static final String statusResponse =
+ "{\"messages\":\"\","
+ + "\"debug\":\"\","
+ + "\"data\":null,"
+ + "\"api\":\"1.1.1\","
+ + "\"api_c\":[\"placeholder\"],"
+ + "\"result\":\""
+
+ + tail
+
+ "\","
+ "\"broker\":\"1.1.1\","
+ "\"broker_c\":[\"namespace\",\"rhlogin\",\"ssh\",\"app_uuid\",\"debug\",\"alter\",\"cartridge\",\"cart_type\",\"action\",\"app_name\",\"api\"],"
@@ -120,16 +138,30 @@
OpenshiftResponse<String> openshiftResponse =
new ApplicationStatusResponseUnmarshaller().unmarshall(response);
String status = openshiftResponse.getOpenshiftObject();
+ assertNotNull(status);
+ assertTrue(status.startsWith("tailing "));
}
@Test
- public void canReadFromApplicationStatusReader() {
+ public void applicationLogReaderReturnsAllowsToReadFromStatus() throws IOException {
IOpenshiftService service = new NoopOpenshiftServiceFake() {
@Override
public String getStatus(String applicationName, Cartridge cartridge) throws OpenshiftException {
- return statusResponse;
+ return tail;
}
};
+
+ Application application = new Application(APPLICATION_NAME, APPLICATION_CARTRIDGE, service);
+ ApplicationLogReader reader = new ApplicationLogReader(application, service);
+
+ int toMatchIndex = 0;
+ for (int character = -1; (character = reader.read()) != -1;) {
+ assertEquals(
+ "character at position " + toMatchIndex
+ + " was '" + ((char) character) + "'"
+ + " but we expected '" + log.charAt(toMatchIndex) + "'.",
+ log.charAt(toMatchIndex++), character);
+ }
}
}
14 years, 7 months
JBoss Tools SVN: r34772 - in branches/jbosstools-3.3.0.M3/build/aggregate: bottests-site/site and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-09-15 12:10:00 -0400 (Thu, 15 Sep 2011)
New Revision: 34772
Modified:
branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/pom.xml
branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/pom.xml
branches/jbosstools-3.3.0.M3/build/aggregate/soa-site/pom.xml
branches/jbosstools-3.3.0.M3/build/aggregate/webtools-site/pom.xml
Log:
fix ref to composite site (should be 3.3.indigo, not trunk)
Modified: branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/pom.xml
===================================================================
--- branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/pom.xml 2011-09-15 15:59:04 UTC (rev 34771)
+++ branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/pom.xml 2011-09-15 16:10:00 UTC (rev 34772)
@@ -21,7 +21,7 @@
<!-- to build against locally built sources, use:
mvn clean install
- to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/, use:
+ to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/, use:
mvn clean install -Pjbosstools-nightly-staging-composite
-->
</project>
Modified: branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/pom.xml
===================================================================
--- branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/pom.xml 2011-09-15 15:59:04 UTC (rev 34771)
+++ branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/pom.xml 2011-09-15 16:10:00 UTC (rev 34772)
@@ -14,14 +14,14 @@
<!-- to build against locally built sources, use:
mvn clean install
- to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/, use:
+ to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/, use:
mvn clean install -Pjbosstools-nightly-staging-composite
-->
<properties>
<!-- add more inputRepos into the composite metadata at the URL below. Therefore need not edit this file and add dozens of URLs
which need to be called by Ant script later -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</inputRepo1>
+ <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/</inputRepo1>
<inputRepos>1</inputRepos>
</properties>
Modified: branches/jbosstools-3.3.0.M3/build/aggregate/soa-site/pom.xml
===================================================================
--- branches/jbosstools-3.3.0.M3/build/aggregate/soa-site/pom.xml 2011-09-15 15:59:04 UTC (rev 34771)
+++ branches/jbosstools-3.3.0.M3/build/aggregate/soa-site/pom.xml 2011-09-15 16:10:00 UTC (rev 34772)
@@ -14,14 +14,14 @@
<!-- to build against locally built sources, use:
mvn clean install
- to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/, use:
+ to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/, use:
mvn clean install -Pjbosstools-nightly-staging-composite
-->
<properties>
<!-- add more inputRepos into the composite metadata at the URL below. Therefore need not edit this file and add dozens of URLs
which need to be called by Ant script later -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</inputRepo1>
+ <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/</inputRepo1>
<inputRepos>1</inputRepos>
</properties>
Modified: branches/jbosstools-3.3.0.M3/build/aggregate/webtools-site/pom.xml
===================================================================
--- branches/jbosstools-3.3.0.M3/build/aggregate/webtools-site/pom.xml 2011-09-15 15:59:04 UTC (rev 34771)
+++ branches/jbosstools-3.3.0.M3/build/aggregate/webtools-site/pom.xml 2011-09-15 16:10:00 UTC (rev 34772)
@@ -14,14 +14,14 @@
<!-- to build against locally built sources, use:
mvn clean install
- to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/, use:
+ to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/, use:
mvn clean install -Pjbosstools-nightly-staging-composite
-->
<properties>
<!-- add more inputRepos into the composite metadata at the URL below. Therefore need not edit this file and add dozens of URLs
which need to be called by Ant script later -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</inputRepo1>
+ <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/</inputRepo1>
<inputRepos>1</inputRepos>
</properties>
14 years, 7 months
JBoss Tools SVN: r34771 - branches/jbosstools-3.3.0.M3/build/aggregate/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-09-15 11:59:04 -0400 (Thu, 15 Sep 2011)
New Revision: 34771
Modified:
branches/jbosstools-3.3.0.M3/build/aggregate/site/pom.xml
Log:
pointing at wrong composite site
Modified: branches/jbosstools-3.3.0.M3/build/aggregate/site/pom.xml
===================================================================
--- branches/jbosstools-3.3.0.M3/build/aggregate/site/pom.xml 2011-09-15 14:59:34 UTC (rev 34770)
+++ branches/jbosstools-3.3.0.M3/build/aggregate/site/pom.xml 2011-09-15 15:59:04 UTC (rev 34771)
@@ -16,7 +16,7 @@
<!-- add more inputRepos into the composite metadata at the URL below. Therefore need not edit this file and add dozens of URLs
which need to be called by Ant script later -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</inputRepo1>
+ <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/</inputRepo1>
<inputRepos>1</inputRepos>
</properties>
14 years, 7 months
JBoss Tools SVN: r34770 - in trunk/as: plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal and 19 other directories.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-09-15 10:59:34 -0400 (Thu, 15 Sep 2011)
New Revision: 34770
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/OpenshiftEnvelopeFactory.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusResponseUnmarshaller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/Application.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/ApplicationStatusReader.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/Cartridge.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/Domain.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/IHttpClient.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftJsonConstants.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/InvalidCredentialsOpenshiftException.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/OpenshiftEndpointException.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/OpenshiftException.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/SSHKey.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/User.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/UserInfo.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftCoreActivator.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/BadRequestException.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/HttpClientException.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/InternalServerErrorException.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/NotFoundException.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/UnauthorizedException.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/UrlConnectionHttpClient.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractDomainRequest.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractOpenshiftRequest.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/ApplicationAction.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/ApplicationRequest.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/ChangeDomainRequest.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/CreateDomainRequest.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/IOpenshiftRequest.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/IOpenshiftRequestFactory.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/ListCartridgesRequest.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/OpenshiftEnvelopeFactory.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/UserInfoRequest.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/AbstractJsonMarshaller.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/AbstractOpenshiftMarshaller.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ApplicationRequestJsonMarshaller.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/DomainRequestJsonMarshaller.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/IOpenshiftMarshaller.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ListCartridgesRequestJsonMarshaller.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/UserInfoRequestJsonMarshaller.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/AbstractOpenshiftJsonResponseUnmarshaller.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationResponseUnmarshaller.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusResponseUnmarshaller.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/DomainResponseUnmarshaller.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/JsonSanitizer.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/ListCartridgesResponseUnmarshaller.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/OpenshiftResponse.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/UserInfoResponseUnmarshaller.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/utils/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/utils/Base64Encoder.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/utils/StreamUtils.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/utils/StringUtils.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/utils/UrlBuilder.class
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/local-artifacts.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/maven-archiver/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/maven-archiver/pom.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/org.jboss.ide.eclipse.as.openshift.core-0.0.1-SNAPSHOT.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/p2artifacts.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/p2content.xml
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/OpenshiftJsonRequestFactory.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusUnmarshaller.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/AbstractOpenshiftJsonResponseUnmarshaller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationResponseUnmarshaller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/DomainResponseUnmarshaller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ListCartridgesResponseUnmarshaller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/UserInfoResponseUnmarshaller.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationIntegrationTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ListCartridgesTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserInfoTest.java
Log:
[JBIDE-9510] implementing IOpenshiftService#getApplicationStatus and ApplicationStatusReader
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-15 14:40:29 UTC (rev 34769)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-15 14:59:34 UTC (rev 34770)
@@ -15,7 +15,6 @@
import java.util.List;
import org.jboss.ide.eclipse.as.openshift.core.Application;
-import org.jboss.ide.eclipse.as.openshift.core.ApplicationStatusReader;
import org.jboss.ide.eclipse.as.openshift.core.Cartridge;
import org.jboss.ide.eclipse.as.openshift.core.Domain;
import org.jboss.ide.eclipse.as.openshift.core.IHttpClient;
@@ -34,13 +33,14 @@
import org.jboss.ide.eclipse.as.openshift.core.internal.request.ChangeDomainRequest;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.CreateDomainRequest;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.ListCartridgesRequest;
-import org.jboss.ide.eclipse.as.openshift.core.internal.request.OpenshiftJsonRequestFactory;
+import org.jboss.ide.eclipse.as.openshift.core.internal.request.OpenshiftEnvelopeFactory;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.UserInfoRequest;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling.ApplicationRequestJsonMarshaller;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling.DomainRequestJsonMarshaller;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling.ListCartridgesRequestJsonMarshaller;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling.UserInfoRequestJsonMarshaller;
import org.jboss.ide.eclipse.as.openshift.core.internal.response.ApplicationResponseUnmarshaller;
+import org.jboss.ide.eclipse.as.openshift.core.internal.response.ApplicationStatusResponseUnmarshaller;
import org.jboss.ide.eclipse.as.openshift.core.internal.response.DomainResponseUnmarshaller;
import org.jboss.ide.eclipse.as.openshift.core.internal.response.JsonSanitizer;
import org.jboss.ide.eclipse.as.openshift.core.internal.response.ListCartridgesResponseUnmarshaller;
@@ -67,7 +67,7 @@
String url = request.getUrlString(BASE_URL);
try {
String requestString = new UserInfoRequestJsonMarshaller().marshall(request);
- String openShiftRequestString = new OpenshiftJsonRequestFactory(password, requestString).createString();
+ String openShiftRequestString = new OpenshiftEnvelopeFactory(password, requestString).createString();
String responseString = createHttpClient(url).post(openShiftRequestString);
responseString = JsonSanitizer.sanitize(responseString);
OpenshiftResponse<UserInfo> response =
@@ -95,7 +95,7 @@
try {
String listCartridgesRequestString =
new ListCartridgesRequestJsonMarshaller().marshall(listCartridgesRequest);
- String request = new OpenshiftJsonRequestFactory(password, listCartridgesRequestString).createString();
+ String request = new OpenshiftEnvelopeFactory(password, listCartridgesRequestString).createString();
String listCatridgesReponse = createHttpClient(url).post(request);
listCatridgesReponse = JsonSanitizer.sanitize(listCatridgesReponse);
OpenshiftResponse<List<Cartridge>> response =
@@ -132,7 +132,7 @@
String url = request.getUrlString(BASE_URL);
try {
String requestString =
- new OpenshiftJsonRequestFactory(
+ new OpenshiftEnvelopeFactory(
password,
new DomainRequestJsonMarshaller().marshall(request))
.createString();
@@ -188,10 +188,35 @@
* ,"app_name","api"],"exit_code":0}
*/
@Override
- public String getStatus(String applicationName, Cartridge cartridge) throws OpenshiftException {
- Application application = requestApplicationAction(
- new ApplicationRequest(applicationName, cartridge, ApplicationAction.STATUS, username, true));
- throw new UnsupportedOperationException();
+ public String getStatus(String name, Cartridge cartridge) throws OpenshiftException {
+ ApplicationRequest applicationRequest =
+ new ApplicationRequest(name, cartridge, ApplicationAction.STATUS, username, true);
+ String url = applicationRequest.getUrlString(BASE_URL);
+ try {
+ String applicationRequestString =
+ new ApplicationRequestJsonMarshaller().marshall(applicationRequest);
+ String request = new OpenshiftEnvelopeFactory(password, applicationRequestString).createString();
+ String response = createHttpClient(url).post(request);
+
+ response = JsonSanitizer.sanitize(response);
+ OpenshiftResponse<String> openshiftResponse =
+ new ApplicationStatusResponseUnmarshaller().unmarshall(response);
+ return openshiftResponse.getOpenshiftObject();
+ } catch (MalformedURLException e) {
+ throw new OpenshiftException(
+ e, "Could not {0} application \"{1}\" at \"{2}\": Invalid url \"{2}\"",
+ applicationRequest.getAction().toHumanReadable(), applicationRequest.getName(), url);
+ } catch (UnauthorizedException e) {
+ throw new InvalidCredentialsOpenshiftException(
+ url, e,
+ "Could not {0} application \"{1}\" at \"{2}\": Invalid credentials user \"{3}\", password \"{4}\"",
+ applicationRequest.getAction().toHumanReadable(), applicationRequest.getName(), url, username,
+ password);
+ } catch (HttpClientException e) {
+ throw new OpenshiftEndpointException(
+ url, e, "Could not {0} application \"{1}\" at \"{2}\"",
+ applicationRequest.getAction().toHumanReadable(), applicationRequest.getName(), url);
+ }
}
protected Application requestApplicationAction(ApplicationRequest applicationRequest) throws OpenshiftException {
@@ -199,7 +224,7 @@
try {
String applicationRequestString =
new ApplicationRequestJsonMarshaller().marshall(applicationRequest);
- String request = new OpenshiftJsonRequestFactory(password, applicationRequestString).createString();
+ String request = new OpenshiftEnvelopeFactory(password, applicationRequestString).createString();
String response = createHttpClient(url).post(request);
response = JsonSanitizer.sanitize(response);
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/OpenshiftEnvelopeFactory.java (from rev 34759, trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/OpenshiftJsonRequestFactory.java)
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/OpenshiftEnvelopeFactory.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/OpenshiftEnvelopeFactory.java 2011-09-15 14:59:34 UTC (rev 34770)
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * 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.internal.request;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
+
+/**
+ * A factory that creates the json string that the openshift rest service
+ * would consume.
+ *
+ * @author André Dietisheim
+ */
+public class OpenshiftEnvelopeFactory implements IOpenshiftRequestFactory {
+
+ 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 OpenshiftEnvelopeFactory(String password, String... payloads) {
+ this.password = password;
+ this.payloads = payloads;
+ }
+
+ public String createString() throws OpenshiftException {
+ try {
+ StringBuilder builder = new StringBuilder();
+ appendPassword(builder);
+ builder.append(AMP);
+ appendPayload(builder);
+ return builder.toString();
+ } catch (UnsupportedEncodingException e) {
+ throw new OpenshiftException(e, "Could not create request");
+ }
+ }
+
+ 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/request/OpenshiftEnvelopeFactory.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/OpenshiftJsonRequestFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/OpenshiftJsonRequestFactory.java 2011-09-15 14:40:29 UTC (rev 34769)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/OpenshiftJsonRequestFactory.java 2011-09-15 14:59:34 UTC (rev 34770)
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.openshift.core.internal.request;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
-import org.jboss.ide.eclipse.as.openshift.core.OpenshiftEndpointException;
-import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
-
-/**
- * A factory that creates the json string that the openshift rest service
- * would consume.
- *
- * @author André Dietisheim
- */
-public class OpenshiftJsonRequestFactory implements IOpenshiftRequestFactory {
-
- 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 createString() throws OpenshiftException {
- try {
- StringBuilder builder = new StringBuilder();
- appendPassword(builder);
- builder.append(AMP);
- appendPayload(builder);
- return builder.toString();
- } catch (UnsupportedEncodingException e) {
- throw new OpenshiftException(e, "Could not create request");
- }
- }
-
- 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));
- }
-
- }
-}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/AbstractOpenshiftJsonResponseUnmarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/AbstractOpenshiftJsonResponseUnmarshaller.java 2011-09-15 14:40:29 UTC (rev 34769)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/AbstractOpenshiftJsonResponseUnmarshaller.java 2011-09-15 14:59:34 UTC (rev 34770)
@@ -29,7 +29,7 @@
String messages = getString(IOpenshiftJsonConstants.PROPERTY_MESSAGES, node);
String result = getString(IOpenshiftJsonConstants.PROPERTY_RESULT, node);
int exitCode = node.get(IOpenshiftJsonConstants.PROPERTY_EXIT_CODE).asInt();
- OPENSHIFTOBJECT openshiftObject = createOpenshiftObject(node.get(IOpenshiftJsonConstants.PROPERTY_DATA));
+ OPENSHIFTOBJECT openshiftObject = createFromResultNode(node.get(IOpenshiftJsonConstants.PROPERTY_RESULT));
return new OpenshiftResponse<OPENSHIFTOBJECT>(debug, messages, result, openshiftObject, exitCode);
} catch (IllegalArgumentException e) {
throw new OpenshiftException(e, "Could not parse response \"{0}\"", response);
@@ -40,7 +40,7 @@
- protected abstract OPENSHIFTOBJECT createOpenshiftObject(ModelNode dataNode);
+ protected abstract OPENSHIFTOBJECT createFromResultNode(ModelNode dataNode);
protected String getResponse() {
return response;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationResponseUnmarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationResponseUnmarshaller.java 2011-09-15 14:40:29 UTC (rev 34769)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationResponseUnmarshaller.java 2011-09-15 14:59:34 UTC (rev 34770)
@@ -31,7 +31,7 @@
}
@Override
- protected Application createOpenshiftObject(ModelNode node) {
+ protected Application createFromResultNode(ModelNode node) {
return new Application(applicationName, cartridge, service);
}
}
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusResponseUnmarshaller.java (from rev 34759, trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusUnmarshaller.java)
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusResponseUnmarshaller.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusResponseUnmarshaller.java 2011-09-15 14:59:34 UTC (rev 34770)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * 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.internal.response;
+
+import org.jboss.dmr.ModelNode;
+
+/**
+ * @author André Dietisheim
+ */
+public class ApplicationStatusResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<String> {
+
+ @Override
+ protected String createFromResultNode(ModelNode node) {
+ return node.asString();
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusResponseUnmarshaller.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusUnmarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusUnmarshaller.java 2011-09-15 14:40:29 UTC (rev 34769)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusUnmarshaller.java 2011-09-15 14:59:34 UTC (rev 34770)
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.openshift.core.internal.response;
-
-import org.jboss.dmr.ModelNode;
-import org.jboss.ide.eclipse.as.openshift.core.Application;
-import org.jboss.ide.eclipse.as.openshift.core.Cartridge;
-import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftService;
-
-/**
- * @author André Dietisheim
- */
-public class ApplicationStatusUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<Application> {
-
- private String applicationName;
- private Cartridge cartridge;
- private IOpenshiftService service;
-
- public ApplicationStatusUnmarshaller(String applicationName, IOpenshiftService service) {
- this.applicationName = applicationName;
- this.service = service;
- }
-
- @Override
- protected Application createOpenshiftObject(ModelNode node) {
- return new Application(applicationName, cartridge, service);
- }
-}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/DomainResponseUnmarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/DomainResponseUnmarshaller.java 2011-09-15 14:40:29 UTC (rev 34769)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/DomainResponseUnmarshaller.java 2011-09-15 14:59:34 UTC (rev 34770)
@@ -27,7 +27,7 @@
}
@Override
- protected Domain createOpenshiftObject(ModelNode node) {
+ protected Domain createFromResultNode(ModelNode node) {
User user = createUser(node);
return new Domain(domainName, user);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ListCartridgesResponseUnmarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ListCartridgesResponseUnmarshaller.java 2011-09-15 14:40:29 UTC (rev 34769)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ListCartridgesResponseUnmarshaller.java 2011-09-15 14:59:34 UTC (rev 34770)
@@ -27,7 +27,7 @@
public class ListCartridgesResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<List<Cartridge>> {
@Override
- protected List<Cartridge> createOpenshiftObject(ModelNode dataNode) {
+ protected List<Cartridge> createFromResultNode(ModelNode dataNode) {
List<Cartridge> cartridges = new ArrayList<Cartridge>();
ModelNode cartridgesNode = dataNode.get(IOpenshiftJsonConstants.PROPERTY_CARTS);
for (ModelNode cartridgeNode : cartridgesNode.asList()) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/UserInfoResponseUnmarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/UserInfoResponseUnmarshaller.java 2011-09-15 14:40:29 UTC (rev 34769)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/UserInfoResponseUnmarshaller.java 2011-09-15 14:59:34 UTC (rev 34770)
@@ -19,7 +19,7 @@
public class UserInfoResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<UserInfo> {
@Override
- protected UserInfo createOpenshiftObject(ModelNode node) {
+ protected UserInfo createFromResultNode(ModelNode node) {
return new UserInfo("", "", "", "", "");
}
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/MANIFEST.MF (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/MANIFEST.MF 2011-09-15 14:59:34 UTC (rev 34770)
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Export-Package: org.jboss.dmr;x-friends:="org.jboss.ide.eclipse.as.ope
+ nshift.test",org.jboss.ide.eclipse.as.openshift.core,org.jboss.ide.ec
+ lipse.as.openshift.core.internal;x-friends:="org.jboss.ide.eclipse.as
+ .openshift.test",org.jboss.ide.eclipse.as.openshift.core.internal.req
+ uest;x-friends:="org.jboss.ide.eclipse.as.openshift.test",org.jboss.i
+ de.eclipse.as.openshift.core.internal.request.marshalling;x-friends:=
+ "org.jboss.ide.eclipse.as.openshift.test",org.jboss.ide.eclipse.as.op
+ enshift.core.internal.response;x-friends:="org.jboss.ide.eclipse.as.o
+ penshift.test"
+Require-Bundle: org.eclipse.core.runtime,com.jcraft.jsch;bundle-versio
+ n="[0.1.41,2.0.0)"
+Bundle-Vendor: JBoss by Red Hat
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: jboss-dmr-1.0.0.Final.jar,.
+Bundle-Version: 0.0.1.v20110915-1640-M4
+Bundle-Name: Openshift Core Plugin
+Bundle-Activator: org.jboss.ide.eclipse.as.openshift.core.internal.Ope
+ nshiftCoreActivator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.jboss.ide.eclipse.as.openshift.core
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/Application.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/Application.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/ApplicationStatusReader.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/ApplicationStatusReader.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/Cartridge.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/Cartridge.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/Domain.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/Domain.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/IHttpClient.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/IHttpClient.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftJsonConstants.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftJsonConstants.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/InvalidCredentialsOpenshiftException.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/InvalidCredentialsOpenshiftException.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/OpenshiftEndpointException.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/OpenshiftEndpointException.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/OpenshiftException.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/OpenshiftException.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/SSHKey.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/SSHKey.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/User.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/User.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/UserInfo.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/UserInfo.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftCoreActivator.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftCoreActivator.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/BadRequestException.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/BadRequestException.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/HttpClientException.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/HttpClientException.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/InternalServerErrorException.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/InternalServerErrorException.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/NotFoundException.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/NotFoundException.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/UnauthorizedException.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/UnauthorizedException.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/UrlConnectionHttpClient.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/httpclient/UrlConnectionHttpClient.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractDomainRequest.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractDomainRequest.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractOpenshiftRequest.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractOpenshiftRequest.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/ApplicationAction.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/ApplicationAction.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/ApplicationRequest.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/ApplicationRequest.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/ChangeDomainRequest.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/ChangeDomainRequest.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/CreateDomainRequest.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/CreateDomainRequest.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/IOpenshiftRequest.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/IOpenshiftRequest.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/IOpenshiftRequestFactory.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/IOpenshiftRequestFactory.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/ListCartridgesRequest.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/ListCartridgesRequest.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/OpenshiftEnvelopeFactory.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/OpenshiftEnvelopeFactory.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/UserInfoRequest.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/UserInfoRequest.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/AbstractJsonMarshaller.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/AbstractJsonMarshaller.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/AbstractOpenshiftMarshaller.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/AbstractOpenshiftMarshaller.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ApplicationRequestJsonMarshaller.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ApplicationRequestJsonMarshaller.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/DomainRequestJsonMarshaller.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/DomainRequestJsonMarshaller.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/IOpenshiftMarshaller.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/IOpenshiftMarshaller.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ListCartridgesRequestJsonMarshaller.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ListCartridgesRequestJsonMarshaller.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/UserInfoRequestJsonMarshaller.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/UserInfoRequestJsonMarshaller.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/AbstractOpenshiftJsonResponseUnmarshaller.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/AbstractOpenshiftJsonResponseUnmarshaller.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationResponseUnmarshaller.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationResponseUnmarshaller.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusResponseUnmarshaller.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusResponseUnmarshaller.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/DomainResponseUnmarshaller.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/DomainResponseUnmarshaller.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/JsonSanitizer.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/JsonSanitizer.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/ListCartridgesResponseUnmarshaller.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/ListCartridgesResponseUnmarshaller.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/OpenshiftResponse.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/OpenshiftResponse.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/UserInfoResponseUnmarshaller.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/response/UserInfoResponseUnmarshaller.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/utils/Base64Encoder.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/utils/Base64Encoder.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/utils/StreamUtils.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/utils/StreamUtils.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/utils/StringUtils.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/utils/StringUtils.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/utils/UrlBuilder.class
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/classes/org/jboss/ide/eclipse/as/openshift/core/internal/utils/UrlBuilder.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/local-artifacts.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/local-artifacts.properties (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/local-artifacts.properties 2011-09-15 14:59:34 UTC (rev 34770)
@@ -0,0 +1,4 @@
+#Thu Sep 15 16:40:20 CEST 2011
+artifact.attached.p2metadata=/home/adietish/jboss-workspaces/jboss-tools/jbosstools-src/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/p2content.xml
+artifact.main=/home/adietish/jboss-workspaces/jboss-tools/jbosstools-src/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/org.jboss.ide.eclipse.as.openshift.core-0.0.1-SNAPSHOT.jar
+artifact.attached.p2artifacts=/home/adietish/jboss-workspaces/jboss-tools/jbosstools-src/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/p2artifacts.xml
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/local-artifacts.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/maven-archiver/pom.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/maven-archiver/pom.properties (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/maven-archiver/pom.properties 2011-09-15 14:59:34 UTC (rev 34770)
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Sep 15 16:40:20 CEST 2011
+version=0.0.1-SNAPSHOT
+groupId=org.jboss.tools.as.plugins
+artifactId=org.jboss.ide.eclipse.as.openshift.core
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/maven-archiver/pom.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/org.jboss.ide.eclipse.as.openshift.core-0.0.1-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/org.jboss.ide.eclipse.as.openshift.core-0.0.1-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/p2artifacts.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/p2artifacts.xml (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/p2artifacts.xml 2011-09-15 14:59:34 UTC (rev 34770)
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?artifactRepository version='1.1.0'?>
+<artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='org.jboss.ide.eclipse.as.openshift.core' version='0.0.1.v20110915-1640-M4'>
+ <properties size='6'>
+ <property name='artifact.size' value='137158'/>
+ <property name='download.size' value='137158'/>
+ <property name='download.md5' value='a68c12d624feebbe2f124302e9b95cd6'/>
+ <property name='maven-groupId' value='org.jboss.tools.as.plugins'/>
+ <property name='maven-artifactId' value='org.jboss.ide.eclipse.as.openshift.core'/>
+ <property name='maven-version' value='0.0.1-SNAPSHOT'/>
+ </properties>
+ </artifact>
+</artifacts>
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/p2artifacts.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/p2content.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/p2content.xml (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/p2content.xml 2011-09-15 14:59:34 UTC (rev 34770)
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<units size='1'>
+ <unit id='org.jboss.ide.eclipse.as.openshift.core' version='0.0.1.v20110915-1640-M4' singleton='false'>
+ <update id='org.jboss.ide.eclipse.as.openshift.core' range='[0.0.0,0.0.1.v20110915-1640-M4)' severity='0'/>
+ <properties size='5'>
+ <property name='org.eclipse.equinox.p2.name' value='Openshift Core Plugin'/>
+ <property name='org.eclipse.equinox.p2.provider' value='JBoss by Red Hat'/>
+ <property name='maven-groupId' value='org.jboss.tools.as.plugins'/>
+ <property name='maven-artifactId' value='org.jboss.ide.eclipse.as.openshift.core'/>
+ <property name='maven-version' value='0.0.1-SNAPSHOT'/>
+ </properties>
+ <provides size='9'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='org.jboss.ide.eclipse.as.openshift.core' version='0.0.1.v20110915-1640-M4'/>
+ <provided namespace='osgi.bundle' name='org.jboss.ide.eclipse.as.openshift.core' version='0.0.1.v20110915-1640-M4'/>
+ <provided namespace='java.package' name='org.jboss.dmr' version='0.0.0'/>
+ <provided namespace='java.package' name='org.jboss.ide.eclipse.as.openshift.core' version='0.0.0'/>
+ <provided namespace='java.package' name='org.jboss.ide.eclipse.as.openshift.core.internal' version='0.0.0'/>
+ <provided namespace='java.package' name='org.jboss.ide.eclipse.as.openshift.core.internal.request' version='0.0.0'/>
+ <provided namespace='java.package' name='org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling' version='0.0.0'/>
+ <provided namespace='java.package' name='org.jboss.ide.eclipse.as.openshift.core.internal.response' version='0.0.0'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='2'>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='com.jcraft.jsch' range='[0.1.41,2.0.0)'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='org.jboss.ide.eclipse.as.openshift.core' version='0.0.1.v20110915-1640-M4'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-ManifestVersion: 2
Created-By: Apache Maven
Archiver-Version: Plexus Archiver
Manifest-Version: 1.0
Bundle-Name: Openshift Core Plugin
Bundle-Vendor: JBoss by Red Hat
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: jboss-dmr-1.0.0.Final.jar,.
Build-Jdk: 1.6.0_24
Bundle-Version: 0.0.1.v20110915-1640-M4
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;x-friends:="org.jboss.ide.eclipse.as.openshift.test",org.jboss.ide.eclipse.as.openshift.core.internal.request;x-friends:="org.jboss.ide.eclipse.as.openshift.test",org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling;x-friends:="org.jboss.ide.eclipse.as.openshift.test",org.jboss.ide.eclipse.as.openshift.core.internal.response;x-friends:="org.jboss.ide.eclipse.as.openshift.test"
Requir!
e-Bundle: org.eclipse.core.runtime,com.jcraft.jsch;bundle-version="[0.1.41,2.0.0)"
Bundle-Activator: org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftCoreActivator
Bundle-SymbolicName: org.jboss.ide.eclipse.as.openshift.core
Built-By: adietish
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+</units>
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/target/p2content.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationIntegrationTest.java 2011-09-15 14:40:29 UTC (rev 34769)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationIntegrationTest.java 2011-09-15 14:59:34 UTC (rev 34770)
@@ -174,6 +174,19 @@
}
}
+ @Test
+ public void getStatusReturnsTheWholeLog() throws Exception {
+ String applicationName = createRandomApplicationName();
+ try {
+ Application application = openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7);
+ String applicationStatus = openshiftService.getStatus(application.getName(), application.getCartridge());
+ String applicationStatus2 = openshiftService.getStatus(application.getName(), application.getCartridge());
+ assertEquals(applicationStatus, applicationStatus2);
+ } finally {
+ silentlyDestroyApplication(applicationName, openshiftService);
+ }
+ }
+
private String createRandomApplicationName() {
return String.valueOf(System.currentTimeMillis());
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java 2011-09-15 14:40:29 UTC (rev 34769)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java 2011-09-15 14:59:34 UTC (rev 34770)
@@ -15,10 +15,16 @@
import java.net.URLEncoder;
import org.jboss.ide.eclipse.as.openshift.core.Cartridge;
+import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftService;
+import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.ApplicationAction;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.ApplicationRequest;
-import org.jboss.ide.eclipse.as.openshift.core.internal.request.OpenshiftJsonRequestFactory;
+import org.jboss.ide.eclipse.as.openshift.core.internal.request.OpenshiftEnvelopeFactory;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling.ApplicationRequestJsonMarshaller;
+import org.jboss.ide.eclipse.as.openshift.core.internal.response.ApplicationStatusResponseUnmarshaller;
+import org.jboss.ide.eclipse.as.openshift.core.internal.response.JsonSanitizer;
+import org.jboss.ide.eclipse.as.openshift.core.internal.response.OpenshiftResponse;
+import org.jboss.ide.eclipse.as.openshift.test.internal.core.fakes.NoopOpenshiftServiceFake;
import org.junit.Test;
/**
@@ -29,6 +35,40 @@
private static final String USERNAME = "toolsjboss(a)gmail.com";
private static final String PASSWORD = "1q2w3e";
+ private static final String APPLICATION_NAME = "1316010645406";
+ private static final Cartridge APPLICATION_CARTRIDGE = Cartridge.JBOSSAS_7;
+
+ private static final String statusResponse =
+ "{\"messages\":\"\","
+ + "\"debug\":\"\","
+ + "\"data\":null,"
+ + "\"api\":\"1.1.1\","
+ + "\"api_c\":[\"placeholder\"],"
+ + "\"result\":\""
+ + "tailing /var/lib/libra/664e4d4dbce74c69ac321053149546df/"
+ + APPLICATION_NAME
+ + "//"
+ + APPLICATION_CARTRIDGE
+ + "/standalone/log/server.log\n"
+ + "------ Tail of 1316010645406 application server.log ------\n"
+ + "10:30:38,700 INFO [org.apache.catalina.core.AprLifecycleListener] (MSC service thread 1-1) "
+ + "The Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path:"
+ + "/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64:"
+ + "/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib\n"
+ + "10:30:38,792 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-3) Starting Coyote HTTP/1.1 on http--127.1.7.1-8080\n"
+ + "10:30:38,836 INFO [org.jboss.as.connector] (MSC service thread 1-4) Starting JCA Subsystem (JBoss IronJacamar 1.0.3.Final)\n"
+ + "10:30:38,892 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-1) Bound data source [java:jboss/datasources/ExampleDS]\n"
+ + "10:30:39,293 INFO [org.jboss.as.deployment] (MSC service thread 1-2) Started FileSystemDeploymentService for directory /var/lib/libra/664e4d4dbce74c69ac321053149546df/1316010645406/jbossas-7.0/standalone/deployments\n"
+ + "10:30:39,314 INFO [org.jboss.as] (Controller Boot Thread) JBoss AS 7.0.1.Final \\\"Zap\\\" started in 2732ms - Started 82 of 107 services (22 services are passive or on-demand)\n"
+ + "10:30:39,339 INFO [org.jboss.as.server.deployment] (MSC service thread 1-3) Starting deployment of \\\"ROOT.war\\\"\n"
+ + "10:30:39,424 INFO [org.jboss.as.jpa] (MSC service thread 1-1) added javax.persistence.api dependency to ROOT.war\n"
+ + "10:30:39,700 INFO [org.jboss.web] (MSC service thread 1-2) registering web context: \n"
+ + "10:30:39,742 INFO [org.jboss.as.server.controller] (DeploymentScanner-threads - 2) Deployed \\\"ROOT.war\\\"\n"
+ + "\","
+ + "\"broker\":\"1.1.1\","
+ + "\"broker_c\":[\"namespace\",\"rhlogin\",\"ssh\",\"app_uuid\",\"debug\",\"alter\",\"cartridge\",\"cart_type\",\"action\",\"app_name\",\"api\"],"
+ + "\"exit_code\":0}";
+
@Test
public void canMarshallApplicationCreateRequest() throws Exception {
String expectedRequestString =
@@ -47,7 +87,7 @@
String createApplicationRequest = new ApplicationRequestJsonMarshaller().marshall(
new ApplicationRequest(
"test-application", Cartridge.JBOSSAS_7, ApplicationAction.CONFIGURE, USERNAME, true));
- String effectiveRequest = new OpenshiftJsonRequestFactory(PASSWORD, createApplicationRequest).createString();
+ String effectiveRequest = new OpenshiftEnvelopeFactory(PASSWORD, createApplicationRequest).createString();
assertEquals(expectedRequestString, effectiveRequest);
}
@@ -69,38 +109,27 @@
String createApplicationRequest = new ApplicationRequestJsonMarshaller().marshall(
new ApplicationRequest(
"test-application", Cartridge.JBOSSAS_7, ApplicationAction.DECONFIGURE, USERNAME, true));
- String effectiveRequest = new OpenshiftJsonRequestFactory(PASSWORD, createApplicationRequest).createString();
+ String effectiveRequest = new OpenshiftEnvelopeFactory(PASSWORD, createApplicationRequest).createString();
assertEquals(expectedRequestString, effectiveRequest);
}
@Test
- public void canUnmarshallStatsResponse() {
- String statusResponse =
- "{\"messages\":\"\","
- +"\"debug\":\"\","
- +"\"data\":null,"
- +"\"api\":\"1.1.1\","
- +"\"api_c\":[\"placeholder\"],"
- +"\"result\":\""
- +"tailing /var/lib/libra/664e4d4dbce74c69ac321053149546df/1316010645406//jbossas-7.0/standalone/log/server.log\n"
- +"------ Tail of 1316010645406 application server.log ------\n"
- +"10:30:38,700 INFO [org.apache.catalina.core.AprLifecycleListener] (MSC service thread 1-1) "
- +"The Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path:"
- +"/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64:"
- +"/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib\n"
- +"10:30:38,792 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-3) Starting Coyote HTTP/1.1 on http--127.1.7.1-8080\n"
- +"10:30:38,836 INFO [org.jboss.as.connector] (MSC service thread 1-4) Starting JCA Subsystem (JBoss IronJacamar 1.0.3.Final)\n"
- +"10:30:38,892 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-1) Bound data source [java:jboss/datasources/ExampleDS]\n"
- +"10:30:39,293 INFO [org.jboss.as.deployment] (MSC service thread 1-2) Started FileSystemDeploymentService for directory /var/lib/libra/664e4d4dbce74c69ac321053149546df/1316010645406/jbossas-7.0/standalone/deployments\n"
- +"10:30:39,314 INFO [org.jboss.as] (Controller Boot Thread) JBoss AS 7.0.1.Final \\\"Zap\\\" started in 2732ms - Started 82 of 107 services (22 services are passive or on-demand)\n"
- +"10:30:39,339 INFO [org.jboss.as.server.deployment] (MSC service thread 1-3) Starting deployment of \\\"ROOT.war\\\"\n"
- +"10:30:39,424 INFO [org.jboss.as.jpa] (MSC service thread 1-1) added javax.persistence.api dependency to ROOT.war\n"
- +"10:30:39,700 INFO [org.jboss.web] (MSC service thread 1-2) registering web context: \n"
- +"10:30:39,742 INFO [org.jboss.as.server.controller] (DeploymentScanner-threads - 2) Deployed \\\"ROOT.war\\\"\n"
- +"\","
- +"\"broker\":\"1.1.1\","
- +"\"broker_c\":[\"namespace\",\"rhlogin\",\"ssh\",\"app_uuid\",\"debug\",\"alter\",\"cartridge\",\"cart_type\",\"action\",\"app_name\",\"api\"],"
- +"\"exit_code\":0}";
+ public void canUnmarshallApplicationStatus() throws OpenshiftException {
+ String response = JsonSanitizer.sanitize(statusResponse);
+ OpenshiftResponse<String> openshiftResponse =
+ new ApplicationStatusResponseUnmarshaller().unmarshall(response);
+ String status = openshiftResponse.getOpenshiftObject();
}
+
+ @Test
+ public void canReadFromApplicationStatusReader() {
+
+ IOpenshiftService service = new NoopOpenshiftServiceFake() {
+ @Override
+ public String getStatus(String applicationName, Cartridge cartridge) throws OpenshiftException {
+ return statusResponse;
+ }
+ };
+ }
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainTest.java 2011-09-15 14:40:29 UTC (rev 34769)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainTest.java 2011-09-15 14:59:34 UTC (rev 34770)
@@ -23,7 +23,7 @@
import org.jboss.ide.eclipse.as.openshift.core.User;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.ChangeDomainRequest;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.CreateDomainRequest;
-import org.jboss.ide.eclipse.as.openshift.core.internal.request.OpenshiftJsonRequestFactory;
+import org.jboss.ide.eclipse.as.openshift.core.internal.request.OpenshiftEnvelopeFactory;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling.DomainRequestJsonMarshaller;
import org.jboss.ide.eclipse.as.openshift.core.internal.response.DomainResponseUnmarshaller;
import org.jboss.ide.eclipse.as.openshift.core.internal.response.JsonSanitizer;
@@ -48,7 +48,7 @@
CreateDomainRequest request = new CreateDomainRequest("myDomain", sshKey, USERNAME, true);
String requestString =
- new OpenshiftJsonRequestFactory(
+ new OpenshiftEnvelopeFactory(
PASSWORD,
new DomainRequestJsonMarshaller().marshall(request))
.createString();
@@ -80,7 +80,7 @@
ChangeDomainRequest request = new ChangeDomainRequest("myDomain", sshKey, USERNAME, true);
String requestString =
- new OpenshiftJsonRequestFactory(
+ new OpenshiftEnvelopeFactory(
PASSWORD,
new DomainRequestJsonMarshaller().marshall(request))
.createString();
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ListCartridgesTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ListCartridgesTest.java 2011-09-15 14:40:29 UTC (rev 34769)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ListCartridgesTest.java 2011-09-15 14:59:34 UTC (rev 34770)
@@ -19,7 +19,7 @@
import org.jboss.ide.eclipse.as.openshift.core.Cartridge;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.ListCartridgesRequest;
-import org.jboss.ide.eclipse.as.openshift.core.internal.request.OpenshiftJsonRequestFactory;
+import org.jboss.ide.eclipse.as.openshift.core.internal.request.OpenshiftEnvelopeFactory;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling.ListCartridgesRequestJsonMarshaller;
import org.jboss.ide.eclipse.as.openshift.core.internal.response.JsonSanitizer;
import org.jboss.ide.eclipse.as.openshift.core.internal.response.ListCartridgesResponseUnmarshaller;
@@ -42,7 +42,7 @@
String listCartridgeRequest = new ListCartridgesRequestJsonMarshaller().marshall(
new ListCartridgesRequest(USERNAME, true));
- String effectiveRequest = new OpenshiftJsonRequestFactory(PASSWORD, listCartridgeRequest).createString();
+ String effectiveRequest = new OpenshiftEnvelopeFactory(PASSWORD, listCartridgeRequest).createString();
assertEquals(expectedRequestString, effectiveRequest);
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserInfoTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserInfoTest.java 2011-09-15 14:40:29 UTC (rev 34769)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserInfoTest.java 2011-09-15 14:59:34 UTC (rev 34770)
@@ -14,7 +14,7 @@
import java.net.URLEncoder;
-import org.jboss.ide.eclipse.as.openshift.core.internal.request.OpenshiftJsonRequestFactory;
+import org.jboss.ide.eclipse.as.openshift.core.internal.request.OpenshiftEnvelopeFactory;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.UserInfoRequest;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling.UserInfoRequestJsonMarshaller;
import org.junit.Test;
@@ -37,7 +37,7 @@
+ "%7D";
String userInfoRequest = new UserInfoRequestJsonMarshaller().marshall(new UserInfoRequest(USERNAME, true));
- String effectiveRequest = new OpenshiftJsonRequestFactory(PASSWORD, userInfoRequest).createString();
+ String effectiveRequest = new OpenshiftEnvelopeFactory(PASSWORD, userInfoRequest).createString();
assertEquals(expectedRequestString, effectiveRequest);
}
14 years, 7 months
JBoss Tools SVN: r34769 - trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-09-15 10:40:29 -0400 (Thu, 15 Sep 2011)
New Revision: 34769
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/pom.xml
Log:
corrected plugin version to 0.0.1
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/pom.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/pom.xml 2011-09-15 14:37:49 UTC (rev 34768)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/pom.xml 2011-09-15 14:40:29 UTC (rev 34769)
@@ -6,6 +6,7 @@
<artifactId>plugins</artifactId>
<version>2.3.0-SNAPSHOT</version>
</parent>
+ <version>0.0.1-SNAPSHOT</version>
<groupId>org.jboss.tools.as.plugins</groupId>
<artifactId>org.jboss.ide.eclipse.as.egit.core</artifactId>
<packaging>eclipse-plugin</packaging>
14 years, 7 months
JBoss Tools SVN: r34768 - trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-09-15 10:37:49 -0400 (Thu, 15 Sep 2011)
New Revision: 34768
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/pom.xml
Log:
corrected plugin version to 0.0.1
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/pom.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/pom.xml 2011-09-15 13:44:33 UTC (rev 34767)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/pom.xml 2011-09-15 14:37:49 UTC (rev 34768)
@@ -8,5 +8,6 @@
</parent>
<groupId>org.jboss.tools.as.plugins</groupId>
<artifactId>org.jboss.ide.eclipse.as.openshift.core</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
14 years, 7 months