JBoss Tools SVN: r30804 - in trunk/as/plugins: org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-23 07:55:49 -0400 (Sat, 23 Apr 2011)
New Revision: 30804
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/Deployable.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7DeploymentManager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementInterface.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7DeploymentState.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagementUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7ManagerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DeploymentOperationResult.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DetypedDeployer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBossDeploymentManager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBossManagementService.java
Log:
[JBIDE-8769] corrected licence
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7DeploymentManager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7DeploymentManager.java 2011-04-23 11:49:54 UTC (rev 30803)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7DeploymentManager.java 2011-04-23 11:55:49 UTC (rev 30804)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.v7;
import java.io.File;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementInterface.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementInterface.java 2011-04-23 11:49:54 UTC (rev 30803)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementInterface.java 2011-04-23 11:55:49 UTC (rev 30804)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.v7;
public interface IJBoss7ManagementInterface {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementService.java 2011-04-23 11:49:54 UTC (rev 30803)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementService.java 2011-04-23 11:55:49 UTC (rev 30804)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.v7;
/**
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7DeploymentState.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7DeploymentState.java 2011-04-23 11:49:54 UTC (rev 30803)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7DeploymentState.java 2011-04-23 11:55:49 UTC (rev 30804)
@@ -1,24 +1,13 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/*******************************************************************************
+ * 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.core.server.internal.v7;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagementUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagementUtil.java 2011-04-23 11:49:54 UTC (rev 30803)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagementUtil.java 2011-04-23 11:55:49 UTC (rev 30804)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.v7;
import org.eclipse.wst.server.core.IServer;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-04-23 11:49:54 UTC (rev 30803)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-04-23 11:55:49 UTC (rev 30804)
@@ -1,24 +1,13 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/*******************************************************************************
+ * 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.management.as7.deployment;
import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.ADDRESS;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7ManagerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7ManagerUtil.java 2011-04-23 11:49:54 UTC (rev 30803)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7ManagerUtil.java 2011-04-23 11:55:49 UTC (rev 30804)
@@ -1,24 +1,13 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/*******************************************************************************
+ * 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.management.as7.deployment;
import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.CHILD_TYPE;
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/Deployable.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/Deployable.java 2011-04-23 11:49:54 UTC (rev 30803)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/Deployable.java 2011-04-23 11:55:49 UTC (rev 30804)
@@ -1,96 +0,0 @@
-package org.jboss.ide.eclipse.as.management.as7.deployment;
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.jboss.as.controller.client.helpers.standalone.DeploymentAction;
-import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentActionResult;
-import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentPlanResult;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangementException;
-import org.jboss.ide.eclipse.as.management.as7.Activator;
-
-public class Deployable {
-
- private String name;
- private File file;
- private Future<ServerDeploymentPlanResult> resultFuture;
- private long timeout;
- private DeploymentAction action;
-
- protected Deployable(String name, File file, long timeout) {
- this.name = name;
- this.file = file;
- this.timeout = timeout;
- }
-
- protected void setDeploymentAction(DeploymentAction action) {
- this.action = action;
- }
-
- protected void setResultFuture(Future<ServerDeploymentPlanResult> resultFuture) {
- this.resultFuture = resultFuture;
- }
-
- public File getFile() {
- return file;
- }
-
- public String getName() {
- return name;
- }
-
- public IStatus getStatus() throws JBoss7ManangementException {
- if (resultFuture == null
- || action == null) {
- return null;
- }
- try {
- ServerDeploymentPlanResult result = resultFuture.get(timeout, TimeUnit.MILLISECONDS);
- ServerDeploymentActionResult actionResult = result.getDeploymentActionResult(action.getId());
- return createStatus(action, actionResult);
- } catch (Exception e) {
- throw new JBoss7ManangementException(e);
- }
- }
-
- private IStatus createStatus(DeploymentAction action, ServerDeploymentActionResult actionResult) {
- if (actionResult == null) {
- return null;
- }
-
- IStatus status = null;
- switch (actionResult.getResult()) {
- case NOT_EXECUTED:
- status = createStatus(IStatus.ERROR, "The operation {0} was not executed on unit {1}", action
- .getType().name(), getName());
- break;
- case EXECUTED:
- status = Status.OK_STATUS;
- break;
- case FAILED:
- status = createStatus(IStatus.ERROR, "The operation {0} failed for unit {1}", action.getType()
- .name(), getName());
- break;
- case ROLLED_BACK:
- status = createStatus(IStatus.ERROR, "The operation {0} for unit {1} was rolled back", action
- .getType().name(), getName());
- break;
- case CONFIGURATION_MODIFIED_REQUIRES_RESTART:
- status = createStatus(
- IStatus.WARNING,
- "The operation {0} was not executed on unit {1}. The server configuration was changed though and the server needs to be restarted",
- action.getType().name(), getName());
- break;
- }
- return status;
- }
-
- private IStatus createStatus(int severity, String messagePattern, Object... messageArguments) {
- return new Status(severity, Activator.getContext().getBundle().getSymbolicName(), MessageFormat.format(
- messagePattern, messageArguments));
- }
-}
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DeploymentOperationResult.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DeploymentOperationResult.java 2011-04-23 11:49:54 UTC (rev 30803)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DeploymentOperationResult.java 2011-04-23 11:55:49 UTC (rev 30804)
@@ -1,24 +1,13 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/*******************************************************************************
+ * 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.management.as7.deployment;
import java.text.MessageFormat;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DetypedDeployer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DetypedDeployer.java 2011-04-23 11:49:54 UTC (rev 30803)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DetypedDeployer.java 2011-04-23 11:55:49 UTC (rev 30804)
@@ -1,24 +1,13 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/*******************************************************************************
+ * 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.management.as7.deployment;
import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.ADD;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBossDeploymentManager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBossDeploymentManager.java 2011-04-23 11:49:54 UTC (rev 30803)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBossDeploymentManager.java 2011-04-23 11:55:49 UTC (rev 30804)
@@ -1,24 +1,13 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/*******************************************************************************
+ * 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.management.as7.deployment;
import java.io.File;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBossManagementService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBossManagementService.java 2011-04-23 11:49:54 UTC (rev 30803)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBossManagementService.java 2011-04-23 11:55:49 UTC (rev 30804)
@@ -1,24 +1,13 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/*******************************************************************************
+ * 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.management.as7.deployment;
import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentManager;
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r30803 - trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-23 07:49:54 -0400 (Sat, 23 Apr 2011)
New Revision: 30803
Modified:
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerIntegrationTest.java
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerTestUtils.java
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/Activator.java
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DetypedDeployerIntegrationTest.java
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/JBossManagementIntegrationTest.java
Log:
[JBIDE-8690] corrected licence
Modified: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerIntegrationTest.java
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerIntegrationTest.java 2011-04-23 11:48:01 UTC (rev 30802)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerIntegrationTest.java 2011-04-23 11:49:54 UTC (rev 30803)
@@ -1,24 +1,13 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/*******************************************************************************
+ * 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.management.as7.tests;
import static org.hamcrest.MatcherAssert.assertThat;
Modified: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerTestUtils.java
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerTestUtils.java 2011-04-23 11:48:01 UTC (rev 30802)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerTestUtils.java 2011-04-23 11:49:54 UTC (rev 30803)
@@ -1,24 +1,13 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/*******************************************************************************
+ * 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.management.as7.tests;
import java.io.BufferedInputStream;
Modified: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/Activator.java
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/Activator.java 2011-04-23 11:48:01 UTC (rev 30802)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/Activator.java 2011-04-23 11:49:54 UTC (rev 30803)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.management.as7.tests;
import org.osgi.framework.BundleActivator;
Modified: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DetypedDeployerIntegrationTest.java
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DetypedDeployerIntegrationTest.java 2011-04-23 11:48:01 UTC (rev 30802)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DetypedDeployerIntegrationTest.java 2011-04-23 11:49:54 UTC (rev 30803)
@@ -1,24 +1,13 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/*******************************************************************************
+ * 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.management.as7.tests;
import static org.hamcrest.Matchers.hasItems;
Modified: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/JBossManagementIntegrationTest.java
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/JBossManagementIntegrationTest.java 2011-04-23 11:48:01 UTC (rev 30802)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/JBossManagementIntegrationTest.java 2011-04-23 11:49:54 UTC (rev 30803)
@@ -1,24 +1,13 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/*******************************************************************************
+ * 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.management.as7.tests;
import static org.hamcrest.MatcherAssert.assertThat;
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r30802 - trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-23 07:48:01 -0400 (Sat, 23 Apr 2011)
New Revision: 30802
Added:
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerIntegrationTest.java
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerTestUtils.java
Removed:
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/JBossManagementTestUtils.java
Modified:
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DetypedDeployerIntegrationTest.java
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/JBossManagementIntegrationTest.java
Log:
[JBIDE-8690] corrected tests
Added: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerIntegrationTest.java
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerIntegrationTest.java (rev 0)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerIntegrationTest.java 2011-04-23 11:48:01 UTC (rev 30802)
@@ -0,0 +1,167 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ide.eclipse.as.management.as7.tests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+import java.util.concurrent.ExecutionException;
+
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7DeploymentState;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangementException;
+import org.jboss.ide.eclipse.as.management.as7.deployment.AS7Manager;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ *
+ * @author André Dietisheim
+ */
+public class AS7ManagerIntegrationTest {
+
+ private AS7Manager manager;
+
+ @Before
+ public void setUp() throws UnknownHostException {
+ this.manager = new AS7Manager(AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT);
+ }
+
+ @After
+ public void tearDown() {
+ manager.dispose();
+ }
+
+ @Ignore
+ @Test
+ public void canDeploy() throws Exception {
+ File warFile = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.MINIMALISTIC_WAR);
+ try {
+ AS7ManagerTestUtils.waitUntilFinished(manager.deploy(warFile));
+
+ String response = AS7ManagerTestUtils.waitForRespose(
+ "minimalistic", AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.WEB_PORT);
+ assertTrue(response != null
+ && response.indexOf("minimalistic") >= 0);
+ } finally {
+ AS7ManagerTestUtils.quietlyUndeploy(warFile, manager);
+ }
+ }
+
+ @Ignore
+ @Test
+ public void deployedWarIsResponding() throws Exception {
+ File warFile = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.MINIMALISTIC_WAR);
+ try {
+ AS7ManagerTestUtils.waitUntilFinished(manager.deploy(warFile));
+
+ String response = AS7ManagerTestUtils.waitForRespose(
+ "minimalistic", AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.WEB_PORT);
+ assertTrue(response != null
+ && response.indexOf("minimalistic") >= 0);
+
+ } finally {
+ AS7ManagerTestUtils.quietlyUndeploy(warFile, manager);
+ }
+ }
+
+ @Ignore
+ @Test(expected = JBoss7ManangementException.class)
+ public void cannotDeployWarTwice() throws Exception {
+ File warFile = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.MINIMALISTIC_WAR);
+ try {
+ AS7ManagerTestUtils.waitUntilFinished(manager.deploy(warFile));
+ AS7ManagerTestUtils.waitUntilFinished(manager.deploy(warFile));
+ } finally {
+ AS7ManagerTestUtils.quietlyUndeploy(warFile, manager);
+ }
+ }
+
+ @Ignore
+ @Test(expected = JBoss7ManangementException.class)
+ public void cannotUndeployNondeployed() throws JBoss7ManangementException, InterruptedException, ExecutionException {
+ AS7ManagerTestUtils.waitUntilFinished(manager.undeploy("inexistant"));
+ }
+
+ @Ignore
+ @Test
+ public void canReplaceWar() throws Exception {
+ File warFile = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.MINIMALISTIC_WAR);
+ File warFile2 = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.GWT_HELLOWORLD_WAR);
+ String name = warFile.getName();
+ try {
+ AS7ManagerTestUtils.waitUntilFinished(manager.deploy(name, warFile));
+ AS7ManagerTestUtils.waitUntilFinished(manager.replace(name, warFile2));
+ String response = AS7ManagerTestUtils.waitForRespose(
+ "minimalistic", AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.WEB_PORT);
+ assertTrue(response != null
+ && response.indexOf("GWT") >= 0);
+ } finally {
+ AS7ManagerTestUtils.quietlyUndeploy(name, manager);
+ }
+ }
+
+ @Test
+ public void getEnabledStateIfDeploymentIsDeployed() throws URISyntaxException, IOException, JBoss7ManangementException {
+ String deploymentName = "testDeployment";
+ File warFile = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.MINIMALISTIC_WAR);
+ try {
+ AS7ManagerTestUtils.waitUntilFinished(manager.deploy(deploymentName, warFile));
+ JBoss7DeploymentState state = manager.getDeploymentState(deploymentName);
+ assertNotNull(state);
+ assertThat(state, equalTo(JBoss7DeploymentState.STARTED));
+ } finally {
+ AS7ManagerTestUtils.quietlyUndeploy(deploymentName, manager);
+ }
+ }
+
+ @Test
+ public void getDisabledStateIfDeploymentIsOnlyAdded() throws URISyntaxException, IOException, JBoss7ManangementException {
+ String deploymentName = "testDeployment";
+ File warFile = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.MINIMALISTIC_WAR);
+ try {
+ AS7ManagerTestUtils.waitUntilFinished(manager.add(deploymentName, warFile));
+ JBoss7DeploymentState state = manager.getDeploymentState(deploymentName);
+ assertNotNull(state);
+ assertThat(state, equalTo(JBoss7DeploymentState.STOPPED));
+ } finally {
+ AS7ManagerTestUtils.quietlyRemove(deploymentName, manager);
+ }
+ }
+
+ @Test(expected = JBoss7ManangementException.class)
+ public void getErrorIfDeploymentIsNotDeployed() throws URISyntaxException, IOException, JBoss7ManangementException {
+ String deploymentName = "testDeployment";
+ try {
+ manager.getDeploymentState(deploymentName);
+ } finally {
+ AS7ManagerTestUtils.quietlyUndeploy(deploymentName, manager);
+ }
+ }
+}
Property changes on: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerIntegrationTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerTestUtils.java (from rev 30773, trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/JBossManagementTestUtils.java)
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerTestUtils.java (rev 0)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerTestUtils.java 2011-04-23 11:48:01 UTC (rev 30802)
@@ -0,0 +1,141 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ide.eclipse.as.management.as7.tests;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.net.HttpURLConnection;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangementException;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult;
+import org.jboss.ide.eclipse.as.management.as7.deployment.AS7Manager;
+import org.osgi.framework.Bundle;
+
+/**
+ * @author André Dietisheim
+ */
+public class AS7ManagerTestUtils {
+
+ public static final String GWT_HELLOWORLD_WAR = "gwt-helloworld.war";
+ public static final String MINIMALISTIC_WAR = "minimalistic.war";
+
+ public static final String HOST = "localhost";
+ public static final int MGMT_PORT = 9999;
+ public static final int WEB_PORT = 8080;
+
+ private static final String WAR_FOLDER = "/wars/";
+ private static final String BUNDLE_ID = "org.jboss.ide.eclipse.as.management.as7.tests";
+
+ private static final int RESPONSE_TIMEOUT = 10 * 1024;
+ private static final long WAIT_TIMEOUT = 10 * 1024;
+
+ public static File getWarFile(String name) throws URISyntaxException, IOException {
+ Bundle bundle = Platform.getBundle(BUNDLE_ID);
+ URL entryUrl = bundle.getEntry(WAR_FOLDER + name);
+ return new File(FileLocator.resolve(entryUrl).toURI());
+ }
+
+ public static String waitForRespose(String name, String host, int port) throws IOException {
+ waitForResponseCode(200, name, host, port);
+ return getResponse(name, host, port);
+ }
+
+ public static void quietlyUndeploy(File file, AS7Manager manager) {
+ quietlyUndeploy(file.getName(), manager);
+ }
+
+ public static void quietlyUndeploy(String name, AS7Manager manager) {
+ try {
+ // DetypedDeployer.undeploy(name, AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT);
+ waitUntilFinished(manager.undeploy(name));
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+
+ public static void quietlyRemove(String name, AS7Manager manager) {
+ try {
+ //DetypedDeployer.remove(name, AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT);
+ waitUntilFinished(manager.remove(name));
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+
+ public static void waitUntilFinished(IJBoss7DeploymentResult result) throws JBoss7ManangementException {
+ result.getStatus(); // wait for operation to finish
+ }
+
+
+ public static String getResponse(String name, String host, int port) throws IOException {
+ URL url = new URL("http://" + host + ":" + port + "/" + name);
+ HttpURLConnection connection = connect(url);
+ return toString(new BufferedInputStream(connection.getInputStream()));
+ }
+
+ public static HttpURLConnection waitForResponseCode(int code, String name, String host, int port)
+ throws IOException {
+ URL url = new URL("http://" + host + ":" + port + "/" + name);
+ long until = System.currentTimeMillis() + WAIT_TIMEOUT;
+ while (System.currentTimeMillis() < until) {
+ HttpURLConnection connection = connect(url);
+ try {
+ if (connection.getResponseCode() == code) {
+ return connection;
+ }
+ } catch (FileNotFoundException e) {
+ if (code == 404) {
+ return connection;
+ }
+ throw e;
+ }
+ }
+ throw new RuntimeException("wait on url " + url + " for response code " + code + " timed out.");
+ }
+
+ private static HttpURLConnection connect(URL url) throws IOException {
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setUseCaches(false);
+ connection.setDoInput(true);
+ connection.setAllowUserInteraction(false);
+ connection.setConnectTimeout(RESPONSE_TIMEOUT);
+ connection.setInstanceFollowRedirects(true);
+ connection.setDoOutput(false);
+ return connection;
+ }
+
+ public static String toString(InputStream in) throws IOException {
+ StringWriter writer = new StringWriter();
+ for (int data = -1; ((data = in.read()) != -1);) {
+ writer.write(data);
+ }
+ return writer.toString();
+ }
+}
Property changes on: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerTestUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DetypedDeployerIntegrationTest.java
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DetypedDeployerIntegrationTest.java 2011-04-23 05:50:30 UTC (rev 30801)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DetypedDeployerIntegrationTest.java 2011-04-23 11:48:01 UTC (rev 30802)
@@ -40,11 +40,11 @@
@Test
public void canDeploy() throws Exception {
- File warFile = JBossManagementTestUtils.getWarFile(JBossManagementTestUtils.MINIMALISTIC_WAR);
+ File warFile = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.MINIMALISTIC_WAR);
try {
- DetypedDeployer.deploy(warFile, JBossManagementTestUtils.HOST, JBossManagementTestUtils.MGMT_PORT);
+ DetypedDeployer.deploy(warFile, AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT);
- String response = JBossManagementTestUtils.waitForRespose("minimalistic", JBossManagementTestUtils.HOST, JBossManagementTestUtils.WEB_PORT);
+ String response = AS7ManagerTestUtils.waitForRespose("minimalistic", AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.WEB_PORT);
assertTrue(response.indexOf("minimalistic") >= 0);
} finally {
@@ -54,10 +54,10 @@
@Test(expected = JBoss7ManangementException.class)
public void cannotDeployWarTwice() throws Exception {
- File warFile = JBossManagementTestUtils.getWarFile(JBossManagementTestUtils.MINIMALISTIC_WAR);
+ File warFile = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.MINIMALISTIC_WAR);
try {
- DetypedDeployer.deploy(warFile, JBossManagementTestUtils.HOST, JBossManagementTestUtils.MGMT_PORT);
- DetypedDeployer.deploy(warFile, JBossManagementTestUtils.HOST, JBossManagementTestUtils.MGMT_PORT);
+ DetypedDeployer.deploy(warFile, AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT);
+ DetypedDeployer.deploy(warFile, AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT);
} finally {
quietlyUndeploy(warFile);
}
@@ -65,14 +65,14 @@
@Test
public void canReplaceWar() throws Exception {
- File warFile = JBossManagementTestUtils.getWarFile(JBossManagementTestUtils.MINIMALISTIC_WAR);
- File warFile2 = JBossManagementTestUtils.getWarFile(JBossManagementTestUtils.GWT_HELLOWORLD_WAR);
+ File warFile = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.MINIMALISTIC_WAR);
+ File warFile2 = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.GWT_HELLOWORLD_WAR);
String name = warFile.getName();
try {
- DetypedDeployer.deploy(name, warFile, JBossManagementTestUtils.HOST, JBossManagementTestUtils.MGMT_PORT);
- DetypedDeployer.replace(name, warFile2, JBossManagementTestUtils.HOST, JBossManagementTestUtils.MGMT_PORT);
- String response = JBossManagementTestUtils.waitForRespose(
- "minimalistic", JBossManagementTestUtils.HOST, JBossManagementTestUtils.WEB_PORT);
+ DetypedDeployer.deploy(name, warFile, AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT);
+ DetypedDeployer.replace(name, warFile2, AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT);
+ String response = AS7ManagerTestUtils.waitForRespose(
+ "minimalistic", AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.WEB_PORT);
assertTrue(response.indexOf("GWT") >= 0);
} finally {
quietlyUndeploy(warFile);
@@ -81,19 +81,19 @@
@Test(expected = JBoss7ManangementException.class)
public void cannotUndeployNondeployed() throws JBoss7ManangementException {
- DetypedDeployer.undeploy("inexistant", JBossManagementTestUtils.HOST, JBossManagementTestUtils.MGMT_PORT);
+ DetypedDeployer.undeploy("inexistant", AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT);
}
@Test
public void canQueryDeploymentdeployedState() throws Exception {
- File warFile = JBossManagementTestUtils.getWarFile(JBossManagementTestUtils.MINIMALISTIC_WAR);
- File warFile2 = JBossManagementTestUtils.getWarFile(JBossManagementTestUtils.GWT_HELLOWORLD_WAR);
+ File warFile = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.MINIMALISTIC_WAR);
+ File warFile2 = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.GWT_HELLOWORLD_WAR);
try {
- DetypedDeployer.deploy(warFile, JBossManagementTestUtils.HOST, JBossManagementTestUtils.MGMT_PORT);
- DetypedDeployer.deploy(warFile2, JBossManagementTestUtils.HOST, JBossManagementTestUtils.MGMT_PORT);
- List<String> deployments = DetypedDeployer.getDeployments(JBossManagementTestUtils.HOST, JBossManagementTestUtils.MGMT_PORT);
+ DetypedDeployer.deploy(warFile, AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT);
+ DetypedDeployer.deploy(warFile2, AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT);
+ List<String> deployments = DetypedDeployer.getDeployments(AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT);
assertThat(deployments.size(), is(2));
- assertThat(deployments, hasItems(JBossManagementTestUtils.MINIMALISTIC_WAR, JBossManagementTestUtils.GWT_HELLOWORLD_WAR));
+ assertThat(deployments, hasItems(AS7ManagerTestUtils.MINIMALISTIC_WAR, AS7ManagerTestUtils.GWT_HELLOWORLD_WAR));
} finally {
quietlyUndeploy(warFile);
quietlyUndeploy(warFile2);
@@ -102,7 +102,7 @@
private void quietlyUndeploy(File file) {
try {
- DetypedDeployer.undeploy(file.getName(), JBossManagementTestUtils.HOST, JBossManagementTestUtils.MGMT_PORT);
+ DetypedDeployer.undeploy(file.getName(), AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT);
} catch (Exception e) {
e.printStackTrace();
// ignore
Modified: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/JBossManagementIntegrationTest.java
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/JBossManagementIntegrationTest.java 2011-04-23 05:50:30 UTC (rev 30801)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/JBossManagementIntegrationTest.java 2011-04-23 11:48:01 UTC (rev 30802)
@@ -50,7 +50,7 @@
@Before
public void setUp() throws UnknownHostException {
- this.manager = new AS7Manager(JBossManagementTestUtils.HOST, JBossManagementTestUtils.MGMT_PORT);
+ this.manager = new AS7Manager(AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT);
}
@After
@@ -61,97 +61,97 @@
@Ignore
@Test
public void canDeploy() throws Exception {
- File warFile = JBossManagementTestUtils.getWarFile(JBossManagementTestUtils.MINIMALISTIC_WAR);
+ File warFile = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.MINIMALISTIC_WAR);
try {
- JBossManagementTestUtils.waitUntilFinished(manager.deploy(warFile));
+ AS7ManagerTestUtils.waitUntilFinished(manager.deploy(warFile));
- String response = JBossManagementTestUtils.waitForRespose(
- "minimalistic", JBossManagementTestUtils.HOST, JBossManagementTestUtils.WEB_PORT);
+ String response = AS7ManagerTestUtils.waitForRespose(
+ "minimalistic", AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.WEB_PORT);
assertTrue(response != null
&& response.indexOf("minimalistic") >= 0);
} finally {
- JBossManagementTestUtils.quietlyUndeploy(warFile, manager);
+ AS7ManagerTestUtils.quietlyUndeploy(warFile, manager);
}
}
@Ignore
@Test
public void deployedWarIsResponding() throws Exception {
- File warFile = JBossManagementTestUtils.getWarFile(JBossManagementTestUtils.MINIMALISTIC_WAR);
+ File warFile = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.MINIMALISTIC_WAR);
try {
- JBossManagementTestUtils.waitUntilFinished(manager.deploy(warFile));
+ AS7ManagerTestUtils.waitUntilFinished(manager.deploy(warFile));
- String response = JBossManagementTestUtils.waitForRespose(
- "minimalistic", JBossManagementTestUtils.HOST, JBossManagementTestUtils.WEB_PORT);
+ String response = AS7ManagerTestUtils.waitForRespose(
+ "minimalistic", AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.WEB_PORT);
assertTrue(response != null
&& response.indexOf("minimalistic") >= 0);
} finally {
- JBossManagementTestUtils.quietlyUndeploy(warFile, manager);
+ AS7ManagerTestUtils.quietlyUndeploy(warFile, manager);
}
}
@Ignore
@Test(expected = JBoss7ManangementException.class)
public void cannotDeployWarTwice() throws Exception {
- File warFile = JBossManagementTestUtils.getWarFile(JBossManagementTestUtils.MINIMALISTIC_WAR);
+ File warFile = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.MINIMALISTIC_WAR);
try {
- JBossManagementTestUtils.waitUntilFinished(manager.deploy(warFile));
- JBossManagementTestUtils.waitUntilFinished(manager.deploy(warFile));
+ AS7ManagerTestUtils.waitUntilFinished(manager.deploy(warFile));
+ AS7ManagerTestUtils.waitUntilFinished(manager.deploy(warFile));
} finally {
- JBossManagementTestUtils.quietlyUndeploy(warFile, manager);
+ AS7ManagerTestUtils.quietlyUndeploy(warFile, manager);
}
}
@Ignore
@Test(expected = JBoss7ManangementException.class)
public void cannotUndeployNondeployed() throws JBoss7ManangementException, InterruptedException, ExecutionException {
- JBossManagementTestUtils.waitUntilFinished(manager.undeploy("inexistant"));
+ AS7ManagerTestUtils.waitUntilFinished(manager.undeploy("inexistant"));
}
@Ignore
@Test
public void canReplaceWar() throws Exception {
- File warFile = JBossManagementTestUtils.getWarFile(JBossManagementTestUtils.MINIMALISTIC_WAR);
- File warFile2 = JBossManagementTestUtils.getWarFile(JBossManagementTestUtils.GWT_HELLOWORLD_WAR);
+ File warFile = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.MINIMALISTIC_WAR);
+ File warFile2 = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.GWT_HELLOWORLD_WAR);
String name = warFile.getName();
try {
- JBossManagementTestUtils.waitUntilFinished(manager.deploy(name, warFile));
- JBossManagementTestUtils.waitUntilFinished(manager.replace(name, warFile2));
- String response = JBossManagementTestUtils.waitForRespose(
- "minimalistic", JBossManagementTestUtils.HOST, JBossManagementTestUtils.WEB_PORT);
+ AS7ManagerTestUtils.waitUntilFinished(manager.deploy(name, warFile));
+ AS7ManagerTestUtils.waitUntilFinished(manager.replace(name, warFile2));
+ String response = AS7ManagerTestUtils.waitForRespose(
+ "minimalistic", AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.WEB_PORT);
assertTrue(response != null
&& response.indexOf("GWT") >= 0);
} finally {
- JBossManagementTestUtils.quietlyUndeploy(name, manager);
+ AS7ManagerTestUtils.quietlyUndeploy(name, manager);
}
}
@Test
public void getEnabledStateIfDeploymentIsDeployed() throws URISyntaxException, IOException, JBoss7ManangementException {
String deploymentName = "testDeployment";
- File warFile = JBossManagementTestUtils.getWarFile(JBossManagementTestUtils.MINIMALISTIC_WAR);
+ File warFile = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.MINIMALISTIC_WAR);
try {
- JBossManagementTestUtils.waitUntilFinished(manager.deploy(deploymentName, warFile));
+ AS7ManagerTestUtils.waitUntilFinished(manager.deploy(deploymentName, warFile));
JBoss7DeploymentState state = manager.getDeploymentState(deploymentName);
assertNotNull(state);
assertThat(state, equalTo(JBoss7DeploymentState.STARTED));
} finally {
- JBossManagementTestUtils.quietlyUndeploy(deploymentName, manager);
+ AS7ManagerTestUtils.quietlyUndeploy(deploymentName, manager);
}
}
@Test
public void getDisabledStateIfDeploymentIsOnlyAdded() throws URISyntaxException, IOException, JBoss7ManangementException {
String deploymentName = "testDeployment";
- File warFile = JBossManagementTestUtils.getWarFile(JBossManagementTestUtils.MINIMALISTIC_WAR);
+ File warFile = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.MINIMALISTIC_WAR);
try {
- JBossManagementTestUtils.waitUntilFinished(manager.add(deploymentName, warFile));
+ AS7ManagerTestUtils.waitUntilFinished(manager.add(deploymentName, warFile));
JBoss7DeploymentState state = manager.getDeploymentState(deploymentName);
assertNotNull(state);
assertThat(state, equalTo(JBoss7DeploymentState.STOPPED));
} finally {
- JBossManagementTestUtils.quietlyRemove(deploymentName, manager);
+ AS7ManagerTestUtils.quietlyRemove(deploymentName, manager);
}
}
@@ -161,7 +161,7 @@
try {
manager.getDeploymentState(deploymentName);
} finally {
- JBossManagementTestUtils.quietlyUndeploy(deploymentName, manager);
+ AS7ManagerTestUtils.quietlyUndeploy(deploymentName, manager);
}
}
}
Deleted: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/JBossManagementTestUtils.java
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/JBossManagementTestUtils.java 2011-04-23 05:50:30 UTC (rev 30801)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/JBossManagementTestUtils.java 2011-04-23 11:48:01 UTC (rev 30802)
@@ -1,141 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ide.eclipse.as.management.as7.tests;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.net.HttpURLConnection;
-import java.net.URISyntaxException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangementException;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult;
-import org.jboss.ide.eclipse.as.management.as7.deployment.AS7Manager;
-import org.osgi.framework.Bundle;
-
-/**
- * @author André Dietisheim
- */
-public class JBossManagementTestUtils {
-
- public static final String GWT_HELLOWORLD_WAR = "gwt-helloworld.war";
- public static final String MINIMALISTIC_WAR = "minimalistic.war";
-
- public static final String HOST = "localhost";
- public static final int MGMT_PORT = 9999;
- public static final int WEB_PORT = 8080;
-
- private static final String WAR_FOLDER = "/wars/";
- private static final String BUNDLE_ID = "org.jboss.ide.eclipse.as.management.as7.tests";
-
- private static final int RESPONSE_TIMEOUT = 10 * 1024;
- private static final long WAIT_TIMEOUT = 10 * 1024;
-
- public static File getWarFile(String name) throws URISyntaxException, IOException {
- Bundle bundle = Platform.getBundle(BUNDLE_ID);
- URL entryUrl = bundle.getEntry(WAR_FOLDER + name);
- return new File(FileLocator.resolve(entryUrl).toURI());
- }
-
- public static String waitForRespose(String name, String host, int port) throws IOException {
- waitForResponseCode(200, name, host, port);
- return getResponse(name, host, port);
- }
-
- public static void quietlyUndeploy(File file, AS7Manager manager) {
- quietlyUndeploy(file.getName(), manager);
- }
-
- public static void quietlyUndeploy(String name, AS7Manager manager) {
- try {
- // DetypedDeployer.undeploy(name, JBossManagementTestUtils.HOST, JBossManagementTestUtils.MGMT_PORT);
- waitUntilFinished(manager.undeploy(name));
- } catch (Exception e) {
- // ignore
- }
- }
-
- public static void quietlyRemove(String name, AS7Manager manager) {
- try {
- //DetypedDeployer.remove(name, JBossManagementTestUtils.HOST, JBossManagementTestUtils.MGMT_PORT);
- waitUntilFinished(manager.remove(name));
- } catch (Exception e) {
- // ignore
- }
- }
-
- public static void waitUntilFinished(IJBoss7DeploymentResult result) throws JBoss7ManangementException {
- result.getStatus(); // wait for operation to finish
- }
-
-
- public static String getResponse(String name, String host, int port) throws IOException {
- URL url = new URL("http://" + host + ":" + port + "/" + name);
- HttpURLConnection connection = connect(url);
- return toString(new BufferedInputStream(connection.getInputStream()));
- }
-
- public static HttpURLConnection waitForResponseCode(int code, String name, String host, int port)
- throws IOException {
- URL url = new URL("http://" + host + ":" + port + "/" + name);
- long until = System.currentTimeMillis() + WAIT_TIMEOUT;
- while (System.currentTimeMillis() < until) {
- HttpURLConnection connection = connect(url);
- try {
- if (connection.getResponseCode() == code) {
- return connection;
- }
- } catch (FileNotFoundException e) {
- if (code == 404) {
- return connection;
- }
- throw e;
- }
- }
- throw new RuntimeException("wait on url " + url + " for response code " + code + " timed out.");
- }
-
- private static HttpURLConnection connect(URL url) throws IOException {
- HttpURLConnection connection = (HttpURLConnection) url.openConnection();
- connection.setUseCaches(false);
- connection.setDoInput(true);
- connection.setAllowUserInteraction(false);
- connection.setConnectTimeout(RESPONSE_TIMEOUT);
- connection.setInstanceFollowRedirects(true);
- connection.setDoOutput(false);
- return connection;
- }
-
- public static String toString(InputStream in) throws IOException {
- StringWriter writer = new StringWriter();
- for (int data = -1; ((data = in.read()) != -1);) {
- writer.write(data);
- }
- return writer.toString();
- }
-}
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r30801 - trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable_branch.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-23 01:50:30 -0400 (Sat, 23 Apr 2011)
New Revision: 30801
Modified:
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable...
Log:
replace absolute paths w/ relative ones
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable... 2011-04-23 05:46:17 UTC (rev 30800)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable... 2011-04-23 05:50:30 UTC (rev 30801)
@@ -7,50 +7,50 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1303423736000'/>
+<property name='p2.timestamp' value='1303537697000'/>
</properties>
<children size='34'>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
+<child location='../../jbosstools-3.2_stable_branch.component--archives/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--as/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--birt/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--bpel/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--cdi/all/repo/'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
+<child location='../../jbosstools-3.2_stable_branch.component--common/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--deltacloud/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--esb/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--examples/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--flow/all/repo/'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
+<child location='../../jbosstools-3.2_stable_branch.component--freemarker/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--gwt/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--hibernatetools/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--jbpm/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--jmx/all/repo/'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
+<child location='../../jbosstools-3.2_stable_branch.component--jsf/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--jst/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--maven/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--modeshape/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--portlet/all/repo/'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
+<child location='../../jbosstools-3.2_stable_branch.component--runtime/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--seam/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--smooks/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--struts/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--tests/all/repo/'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
+<child location='../../jbosstools-3.2_stable_branch.component--tptp/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--usage/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--vpe/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--ws/all/repo/'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-pi4soa-3.1...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-teiid-desi...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-drools-5.2...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.2...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/xulrunner-1.9.1.2/all...'/>
+<child location='../../jbosstools-pi4soa-3.1_stable_branch/all/repo/'/>
+<child location='../../jbosstools-teiid-designer-7.4_stable_branch/all/repo/'/>
+<child location='../../jbosstools-drools-5.2_stable_branch/all/repo/'/>
+<child location='../../jbosstools-savara-1.2_stable_branch/tools/'/>
+<child location='../../xulrunner-1.9.1.2/all/repo/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable... 2011-04-23 05:46:17 UTC (rev 30800)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable... 2011-04-23 05:50:30 UTC (rev 30801)
@@ -7,50 +7,50 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1303423736000'/>
+<property name='p2.timestamp' value='1303537697000'/>
</properties>
<children size='34'>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
+<child location='../../jbosstools-3.2_stable_branch.component--archives/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--as/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--birt/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--bpel/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--cdi/all/repo/'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
+<child location='../../jbosstools-3.2_stable_branch.component--common/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--deltacloud/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--esb/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--examples/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--flow/all/repo/'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
+<child location='../../jbosstools-3.2_stable_branch.component--freemarker/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--gwt/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--hibernatetools/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--jbpm/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--jmx/all/repo/'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
+<child location='../../jbosstools-3.2_stable_branch.component--jsf/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--jst/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--maven/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--modeshape/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--portlet/all/repo/'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
+<child location='../../jbosstools-3.2_stable_branch.component--runtime/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--seam/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--smooks/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--struts/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--tests/all/repo/'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...'/>
+<child location='../../jbosstools-3.2_stable_branch.component--tptp/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--usage/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--vpe/all/repo/'/>
+<child location='../../jbosstools-3.2_stable_branch.component--ws/all/repo/'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-pi4soa-3.1...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-teiid-desi...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-drools-5.2...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.2...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/xulrunner-1.9.1.2/all...'/>
+<child location='../../jbosstools-pi4soa-3.1_stable_branch/all/repo/'/>
+<child location='../../jbosstools-teiid-designer-7.4_stable_branch/all/repo/'/>
+<child location='../../jbosstools-drools-5.2_stable_branch/all/repo/'/>
+<child location='../../jbosstools-savara-1.2_stable_branch/tools/'/>
+<child location='../../xulrunner-1.9.1.2/all/repo/'/>
</children>
</repository>
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r30800 - in trunk/download.jboss.org/jbosstools/builds/staging/_composite_: trunk and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-23 01:46:17 -0400 (Sat, 23 Apr 2011)
New Revision: 30800
Modified:
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
Log:
switch trunk and 3.3.indigo composites (same thing) to use XR 1.9.2 instead of 1.9.1.2
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo... 2011-04-23 05:33:44 UTC (rev 30799)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo... 2011-04-23 05:46:17 UTC (rev 30800)
@@ -7,7 +7,7 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1303423884000'/>
+<property name='p2.timestamp' value='1303537339000'/>
</properties>
<children size='33'>
@@ -49,7 +49,7 @@
<child location='../../jbosstools-teiid-designer-7.5_trunk/all/repo/'/>
<child location='../../jbosstools-drools-5.2_trunk/all/repo/'/>
-<child location='../../xulrunner-1.9.1.2/all/repo/'/>
+<child location='../../xulrunner-1.9.2/all/repo/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo... 2011-04-23 05:33:44 UTC (rev 30799)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo... 2011-04-23 05:46:17 UTC (rev 30800)
@@ -7,7 +7,7 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1303423884000'/>
+<property name='p2.timestamp' value='1303537339000'/>
</properties>
<children size='33'>
@@ -49,7 +49,7 @@
<child location='../../jbosstools-teiid-designer-7.5_trunk/all/repo/'/>
<child location='../../jbosstools-drools-5.2_trunk/all/repo/'/>
-<child location='../../xulrunner-1.9.1.2/all/repo/'/>
+<child location='../../xulrunner-1.9.2/all/repo/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2011-04-23 05:33:44 UTC (rev 30799)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2011-04-23 05:46:17 UTC (rev 30800)
@@ -7,7 +7,7 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1303423884000'/>
+<property name='p2.timestamp' value='1303537339000'/>
</properties>
<children size='33'>
@@ -49,7 +49,7 @@
<child location='../../jbosstools-teiid-designer-7.5_trunk/all/repo/'/>
<child location='../../jbosstools-drools-5.2_trunk/all/repo/'/>
-<child location='../../xulrunner-1.9.1.2/all/repo/'/>
+<child location='../../xulrunner-1.9.2/all/repo/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2011-04-23 05:33:44 UTC (rev 30799)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2011-04-23 05:46:17 UTC (rev 30800)
@@ -7,7 +7,7 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1303423884000'/>
+<property name='p2.timestamp' value='1303537339000'/>
</properties>
<children size='33'>
@@ -49,7 +49,7 @@
<child location='../../jbosstools-teiid-designer-7.5_trunk/all/repo/'/>
<child location='../../jbosstools-drools-5.2_trunk/all/repo/'/>
-<child location='../../xulrunner-1.9.1.2/all/repo/'/>
+<child location='../../xulrunner-1.9.2/all/repo/'/>
</children>
</repository>
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r30799 - in branches/xulrunner-1.9.2.16/xulrunner/features: org.mozilla.xulrunner.feature and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-23 01:33:44 -0400 (Sat, 23 Apr 2011)
New Revision: 30799
Modified:
branches/xulrunner-1.9.2.16/xulrunner/features/org.mozilla.xpcom.feature/feature.xml
branches/xulrunner-1.9.2.16/xulrunner/features/org.mozilla.xpcom.feature/pom.xml
branches/xulrunner-1.9.2.16/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
branches/xulrunner-1.9.2.16/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml
Log:
because cannot have 5-part osgi version (1.9.2.16.qualifier) use 1.9.216.qualifier instead; change copyrights to 2011 and pom.xml to match feature.xml
Modified: branches/xulrunner-1.9.2.16/xulrunner/features/org.mozilla.xpcom.feature/feature.xml
===================================================================
--- branches/xulrunner-1.9.2.16/xulrunner/features/org.mozilla.xpcom.feature/feature.xml 2011-04-23 05:15:16 UTC (rev 30798)
+++ branches/xulrunner-1.9.2.16/xulrunner/features/org.mozilla.xpcom.feature/feature.xml 2011-04-23 05:33:44 UTC (rev 30799)
@@ -2,7 +2,7 @@
<feature
id="org.mozilla.xpcom.feature"
label="XPCOM Feature"
- version="1.9.2.16.qualifier"
+ version="1.9.216.qualifier"
provider-name="JBoss by Red Hat">
<description>
@@ -10,7 +10,7 @@
</description>
<copyright>
- (c) 2010 JBoss by Red Hat
+ (c) 2011 JBoss by Red Hat
</copyright>
<license>
Modified: branches/xulrunner-1.9.2.16/xulrunner/features/org.mozilla.xpcom.feature/pom.xml
===================================================================
--- branches/xulrunner-1.9.2.16/xulrunner/features/org.mozilla.xpcom.feature/pom.xml 2011-04-23 05:15:16 UTC (rev 30798)
+++ branches/xulrunner-1.9.2.16/xulrunner/features/org.mozilla.xpcom.feature/pom.xml 2011-04-23 05:33:44 UTC (rev 30799)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.xulrunner.features</groupId>
<artifactId>org.mozilla.xpcom.feature</artifactId>
- <version>1.9.2.16-SNAPSHOT</version>
+ <version>1.9.216-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
\ No newline at end of file
Modified: branches/xulrunner-1.9.2.16/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
===================================================================
--- branches/xulrunner-1.9.2.16/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2011-04-23 05:15:16 UTC (rev 30798)
+++ branches/xulrunner-1.9.2.16/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2011-04-23 05:33:44 UTC (rev 30799)
@@ -2,7 +2,7 @@
<feature
id="org.mozilla.xulrunner.feature"
label="XulRunner Feature"
- version="1.9.2.16.qualifier"
+ version="1.9.216.qualifier"
provider-name="JBoss by Red Hat"
os="linux,macosx,win32"
ws="carbon,cocoa,gtk,win32"
@@ -13,7 +13,7 @@
</description>
<copyright>
- (c) 2010 JBoss by Red Hat
+ (c) 2011 JBoss by Red Hat
</copyright>
<license>
Modified: branches/xulrunner-1.9.2.16/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml
===================================================================
--- branches/xulrunner-1.9.2.16/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml 2011-04-23 05:15:16 UTC (rev 30798)
+++ branches/xulrunner-1.9.2.16/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml 2011-04-23 05:33:44 UTC (rev 30799)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.xulrunner.features</groupId>
<artifactId>org.mozilla.xulrunner.feature</artifactId>
- <version>1.9.2.16-SNAPSHOT</version>
+ <version>1.9.216-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
\ No newline at end of file
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r30798 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-23 01:15:16 -0400 (Sat, 23 Apr 2011)
New Revision: 30798
Modified:
trunk/build/parent/pom.xml
Log:
org.jboss.tools:org.jboss.tools.target.platform should be 0.0.2-SNAPSHOT not 0.0.3-SNAPSHOT (https://issues.jboss.org/browse/JBIDE-8778)
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-04-23 00:44:43 UTC (rev 30797)
+++ trunk/build/parent/pom.xml 2011-04-23 05:15:16 UTC (rev 30798)
@@ -316,7 +316,7 @@
<artifact>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.target.platform</artifactId>
- <version>0.0.3-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<classifier>${target.platform.classifier.unified}</classifier>
</artifact>
</target>
14 years, 11 months
- 1
- 0
Newsletter Fri, 22 Apr 2011 20:14:14 -0800
by jbosstools-commits＠lists.jboss.org
Halo!!
Do you want a suitable future, grow in money earning power, and pat on the back :)?
Today only:
We can assist with Diplomas from prestigious universities based on your present knowledge and professional experience.
Get a Degree in 6 weeks with our program!
~Our program will let ANYONE with professional experience
get a 100% verified Degree:
~Doctorate
~Bachelors
~Masters
- Think about it...
- Just follow YOUR Dreams!
- Live a much better life by earning or upgrading your degree.
This is a rare way to make a right move and receive your due
benefits... if you are qualified but are lacking that piece of paper. Get one from us in a short time.
Contact 7 days a week! to start improving your life!
~CALL US~
1-305-460-2287
Please leave us a message with your phone number with country code if outside USA and name and we'll call you back as soon as possible.
It is your chance...
Make the right decision.
Sincerely.
Do Not Reply to this Email.
We do not reply to text inquiries, and our server will reject all response traffic.
We apologize for any inconvenience this may have caused you.
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r30797 - in cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test: .settings and 10 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-04-22 20:44:43 -0400 (Fri, 22 Apr 2011)
New Revision: 30797
Added:
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/.classpath
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/.project
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/.settings/
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/.settings/org.eclipse.jdt.core.prefs
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/META-INF/
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/build.properties
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-8202
Added: cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/.classpath
===================================================================
--- cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/.classpath (rev 0)
+++ cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/.classpath 2011-04-23 00:44:43 UTC (rev 30797)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/.project
===================================================================
--- cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/.project (rev 0)
+++ cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/.project 2011-04-23 00:44:43 UTC (rev 30797)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.cdi.seam.text.ext.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
Property changes on: cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/.settings/org.eclipse.jdt.core.prefs 2011-04-23 00:44:43 UTC (rev 30797)
@@ -0,0 +1,12 @@
+#Tue Apr 19 18:03:27 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF (rev 0)
+++ cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF 2011-04-23 00:44:43 UTC (rev 30797)
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.jboss.tools.cdi.seam.text.ext.test
+Bundle-Version: 1.2.0.qualifier
+Require-Bundle: org.junit;bundle-version="3.8.2",
+ org.eclipse.core.resources;bundle-version="3.5.0",
+ org.eclipse.jface.text;bundle-version="3.5.0",
+ org.eclipse.ui.ide;bundle-version="3.5.0",
+ org.jboss.tools.common.text.ext;bundle-version="2.0.0",
+ org.eclipse.core.runtime;bundle-version="3.5.0",
+ org.jboss.tools.cdi.text.ext;bundle-version="1.0.0",
+ org.eclipse.jdt.ui;bundle-version="3.5.0",
+ org.eclipse.core.commands;bundle-version="3.5.0",
+ org.jboss.tools.cdi.core.test;bundle-version="1.0.0",
+ org.eclipse.jdt.core;bundle-version="3.5.0",
+ org.eclipse.wst.xml.ui,
+ org.eclipse.jface;bundle-version="3.6.0",
+ org.jboss.tools.cdi.text.ext.test;bundle-version="1.2.0",
+ org.jboss.tools.cdi.seam.text.ext;bundle-version="1.2.0"
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %Bundle-Vendor.0
+Export-Package: org.jboss.tools.cdi.seam.text.ext.test
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+
Property changes on: cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/build.properties
===================================================================
--- cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/build.properties (rev 0)
+++ cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/build.properties 2011-04-23 00:44:43 UTC (rev 30797)
@@ -0,0 +1,3 @@
+source.. = src/
+bin.includes = META-INF/,\
+ .
Property changes on: cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/build.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java
===================================================================
--- cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java (rev 0)
+++ cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java 2011-04-23 00:44:43 UTC (rev 30797)
@@ -0,0 +1,22 @@
+package org.jboss.tools.cdi.seam.text.ext.test;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.text.Region;
+import org.jboss.tools.cdi.seam.text.ext.hyperlink.CDISeamResourceLoadingHyperlinkDetector;
+import org.jboss.tools.cdi.text.ext.test.HyperlinkDetectorTest;
+
+public class CDISeamResourceLoadingHyperlinkDetectorTest extends HyperlinkDetectorTest{
+
+ public void testCDISeamResourceLoadingHyperlinkDetector() throws Exception {
+ ArrayList<Region> regionList = new ArrayList<Region>();
+ regionList.add(new Region(115, 6));
+ regionList.add(new Region(133, 6));
+ regionList.add(new Region(140, 6));
+ regionList.add(new Region(196, 6));
+ regionList.add(new Region(250, 6));
+
+ checkRegions("JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/ResourceLoader.java", regionList, new CDISeamResourceLoadingHyperlinkDetector());
+ }
+
+}
Property changes on: cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java
===================================================================
--- cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java (rev 0)
+++ cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java 2011-04-23 00:44:43 UTC (rev 30797)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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.tools.cdi.seam.text.ext.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class CdiSeamTextExtAllTests {
+ public static Test suite() {
+ // it could be done here because it is not needed to be enabled back
+ //JavaModelManager.getIndexManager().disable();
+
+ //TestSuite suiteAll = new TestSuite("CDI Core Tests");
+
+ TestSuite suite = new TestSuite("CDI Seam OpenOns Tests");
+ suite.addTestSuite(CDISeamResourceLoadingHyperlinkDetectorTest.class);
+
+ return suite;
+ }
+}
\ No newline at end of file
Property changes on: cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r30796 - cdi/plugins.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-04-22 20:44:32 -0400 (Fri, 22 Apr 2011)
New Revision: 30796
Added:
cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/
Log:
https://issues.jboss.org/browse/JBIDE-8202
14 years, 11 months
- 1
- 0