JBoss Tools SVN: r30839 - in trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet: cheatsheets and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2011-04-26 09:49:35 -0400 (Tue, 26 Apr 2011)
New Revision: 30839
Added:
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/HelloWorld.xml
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.xml
Log:
https://issues.jboss.org/browse/SOA-2941
Updated cheatsheet verbage
Copied: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/HelloWorld.xml (from rev 30679, trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/bpel.xml)
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/HelloWorld.xml (rev 0)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/HelloWorld.xml 2011-04-26 13:49:35 UTC (rev 30839)
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cheatsheet title=""Hello World" Tutorial">
+ <intro>
+ <description>This cheatsheet will guide you through the creation,
+ deployment and execution of the classic "Hello World" BPEL
+ process.</description>
+ </intro>
+
+ <item dialog="true" skip="true" title="Create a BPEL Project">
+ <description>In order to associate a BPEL process and its related
+ artifacts (WSDL and XSD files) with an appropriate runtime, you must first
+ create a BPEL project. If you are interested in using the BPEL Designer
+ for modeling or documentation purposes only and do <b>not</b>
+ intend to deploy the process for execution, then you can skip this step; a
+ BPEL process file can actually be created in any type of
+ project.<br /><br />To create a BPEL Project, select "File > New >
+ Project... > BPEL 2.0 > BPEL Project" from the main
+ menu.<br /><br />On the first page of the New Project wizard, enter the
+ project name "HelloWorld" and click Finish.</description>
+
+ <command required="false"
+ serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.bpel.runtimes.wizards.newBPELProject)" />
+ </item>
+
+ <item dialog="true" skip="true" title="Create a BPEL Process file">
+ <description>Next select a target folder in your project where the BPEL
+ process file and its artifacts will be created. If you have created a BPEL
+ Project, it will contain a folder called "bpelContent" which is intended
+ to be used for containing all of your BPEL resources.<br /><br />From the
+ "File" main menu, or from the popup (right-click) menu of the Navigator or
+ Project Explorer views, select "New > New BPEL Process
+ File".<br /><br />On the first page of the New File wizard, enter the
+ process name "HelloWorld" and select a namespace for your process. A
+ namespace is simply a URI that declares the context of your business
+ process' variables, and other identifiers so that they do not collide with
+ identifiers in other web services that your process may eventually
+ use.<br /><br />Next, select a process template. The New File wizard
+ defines three types of templates: Asynchronous, Empty and Synchronous. For
+ this tutorial, select the "Synchronous Process" template and click
+ "Finish".</description>
+
+ <command serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.bpel.ui.newFile)" />
+ </item>
+
+ <item skip="true" title="Edit the BPEL Process file">
+ <description>When the BPEL Designer opens it will display a skeleton of a
+ simple request-response process which consists of a Receive activity, an
+ empty activity labeled "FIX_ME-Add_Business_Logic_Here" and a Reply. The
+ arrows connecting these activities indicate the process flow from top to
+ bottom, or from left to right depending on your choice of
+ layout.<br /><br />At this time, if the Property View is not visible you
+ can open it from either the BPEL Designer's popup menu ("Show in
+ Properties") or from the main menu by clicking "Window > Show View >
+ Properties".<br /><br />Click on the "Fix Me" activity and select the
+ Details tab in the Property Sheet and select action 4 (Assign) which will
+ replace the empty activity with an Assign. This will also display the
+ Assign activity properties in the Details tab of the Property Sheet. You
+ may want to change the name of the "Fix Me" to something more appropriate,
+ for example "Build_Response_Message". You can do this using either the
+ in-line editor on the Design Canvas (select the Assign activity, then
+ click again to begin editing the text label) or using the Description tab
+ of the Property Sheet. When done, switch back to the Details tab of the
+ Property Sheet.<br /><br />The Assign Details tab consists of an
+ (initially empty) list of assignment operations, and two empty "From" and
+ "To" combo boxes. The assignment list has four buttons labeled "New"
+ "Delete", "Move Up" and "Move Down", which are used to manage the list of
+ assignment operations.<br /><br />Click the "New" button to add a new
+ assignment operation to the list. Notice that the "From" and "To" combo
+ boxes are now active and display "Variable". These allow you to select the
+ source and target items' categories ("Variable", "Expression", "Fixed
+ Value", etc.). Also notice that additional selection/data entry widgets
+ appear below the "From" and "To" combo boxes. These will change based on
+ the source and target item categories selected in the combo boxes, but
+ initially they show tree selection widgets for the input and output
+ variables that were automatically created by the New File
+ wizard.<br /><br />Select "Expression" in the "From" combo box; this will
+ display an XPath expression editor widget. Notice that BPEL allows you to
+ define which version of XPath you wish to use for each expression
+ although,only XPath 1.0 is supported at this time.<br /><br /> In the
+ XPath expression editor, enter the following:<br /><br />concat("Hello,
+ ".$input.payload/tns:input)<br /><br />As you type, the editor widget
+ provides a popup list of valid proposals; this can also be activated by
+ typing CTRL-Space.<br /><br />In the tree selection widget under the "To"
+ combo box, expand the "output" variable and navigate down to the "result"
+ string element. The assignment operation list should now show "Expression
+ to Variable"; click on this entry in the list. The action of changing
+ focus from the "To" tree selection widget to another widget, triggers
+ validation of the assignment operation and a popup dialog asking if you
+ want to initialize the ouput variable should appear; click "Yes" to do so
+ now.<br />The BPEL Designer will automatically insert another entry in the
+ assignment operations list labeled "Fixed Value to Variable". Select this
+ entry in the list and you will see an XML fragment that corresponds to the
+ structure of the output variable. A "Selection Failure Fault" will result
+ if the BPEL engine encounters a variable that has not been properly
+ initialized. <br /><br />This completes the "HelloWorld" process; select
+ "File > Save" to save the process and then close the
+ editor.</description>
+ </item>
+
+ <item skip="true" title="Create a Deployment Descriptor file">
+ <description>A Deployment Descriptor is simply a manifest of the BPEL
+ artifacts. It describes the services provided and their interfaces, to the
+ BPEL runtime engine. To create a Deployment Descriptor select the project
+ folder that contains your BPEL artifacts, then from either the "File" main
+ menu or the Navigator or Project Explorer popup menu select "New > BPEL
+ 2.0 > Apache ODE Deployment Descriptor". <br /><br />Finish the New
+ wizard and the Deployment Descriptor editor will open. <br /><br />In the
+ "Inbound Interfaces (Services)" section, click on the "Associated Port"
+ combo box and select the "HelloWorldPort". Leave all other settings as
+ they are and then save and close the editor.</description>
+ </item>
+
+ <item skip="true" title="Create a JBoss BPEL Server">
+ <description> These last steps assume that you have already installed
+ either:<br /><br />JBoss Application Server version 5.1.0 and RiftSaw 2.2,
+ the BPEL engine, or<br />JBoss Enterprise Application Platform 5.0 or
+ later.<br /><br /><b>CAUTION: make sure the server you intend to use for
+ testing is not a production environment!</b><br /><br />Open the Servers
+ View by selecting "Window > Show View > Servers" from the main
+ menu.<br /><br />From the Servers View popup menu or from the "File" main
+ menu, click "New > Server"<br /><br />Select either the "JBoss
+ Community > JBoss AS 5.1" or "JBoss Enterprise Middleware > JBoss
+ Enterprise Application Platform 5.x" server.<br /><br />Finish the New
+ Server Definition wizard but do not add the HelloWorld service on the last
+ page of the wizard.<br /><br />Start the server by selecting it in the
+ Servers View and clicking the "Run" menu button.</description>
+
+ <command required="false"
+ serialization="org.eclipse.ui.browser.openBrowser(url=http://www.jboss.org/riftsaw/,tool... Riftsaw BPEL Engine)" />
+ </item>
+
+ <item skip="true" title="Deploy the BPEL Process to the JBoss BPEL Server">
+ <description>Select the newly created server in the Servers View and from
+ the popup menu, click "Add and Remove..."<br /><br />In the Add and Remove
+ Wizard, select the HelloWorld process and click "Add".<br /><br />The
+ server should log some messages to the Console View indicating that the
+ BPEL process has been deployed successfully. If you see deployment error
+ messages then something is wrong with the BPEL process; if you see no
+ messages at all, then the Riftsaw engine was not installed
+ properly.</description>
+ </item>
+
+ <item skip="true" title="Test the BPEL Process">
+ <description>Assuming "HelloWorld" was successfully deployed, you can now
+ test your service. <br /><br />Select the "HelloWorldArtifacts.wsdl" file
+ in your BPEL project and from the popup menu select "Web Services >
+ Test with Web Services Explorer".<br /><br />In the Web Services Explorer
+ browser, navigate to the HelloWorld "process" operation in the "Navigator"
+ panel on the left, and then enter the word "world" in the "Actions" panel
+ on the right, then click "Go"<br /><br />The Riftsaw engine will log some
+ more messages to the Console View indicating that it has processed the
+ message, and you should see the response "Hello, world" in the "Status"
+ panel on the bottom-right.<br /><br />Congratulations! You have just
+ created your first BPEL process.</description>
+ </item>
+</cheatsheet>
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.xml
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.xml 2011-04-26 07:15:45 UTC (rev 30838)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.xml 2011-04-26 13:49:35 UTC (rev 30839)
@@ -5,17 +5,17 @@
point="org.eclipse.ui.cheatsheets.cheatSheetContent">
<category
id="org.jboss.tools.bpel.cheatsheet"
- name="JBoss BPEL Tutorial">
+ name="JBoss BPEL Tutorials">
</category>
<cheatsheet
category="org.jboss.tools.bpel.cheatsheet"
- contentFile="$nl$/cheatsheets/bpel.xml"
+ contentFile="$nl$/cheatsheets/HelloWorld.xml"
id="org.jboss.tools.bpel.cheatsheet.bpel"
- name="JBoss BPEL Tutorial">
+ name=""HelloWorld" Tutorial">
<description>
- Learn how to use JBoss BPEL editor
+ Demonstrates how to create, deploy and run the classic "HelloWorld" BPEL process
</description>
</cheatsheet>
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r30838 - in trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test: command and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2011-04-26 03:15:45 -0400 (Tue, 26 Apr 2011)
New Revision: 30838
Modified:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/JBossWSCreationCoreTestSuite.java
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSJavaFirstCommandTest.java
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java
Log:
JBIDE-8729: fix the junit test failed
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/JBossWSCreationCoreTestSuite.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/JBossWSCreationCoreTestSuite.java 2011-04-26 01:44:31 UTC (rev 30837)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/JBossWSCreationCoreTestSuite.java 2011-04-26 07:15:45 UTC (rev 30838)
@@ -31,6 +31,7 @@
suite.addTestSuite(JBossWSClientCommandTest.class);
suite.addTestSuite(JBossWSMergeWebXMLCommandTest.class);
suite.addTestSuite(JBossWSClientSampleCreationCommandTest.class);
+
return suite;
}
}
\ No newline at end of file
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java 2011-04-26 01:44:31 UTC (rev 30837)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java 2011-04-26 07:15:45 UTC (rev 30838)
@@ -9,6 +9,7 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
@@ -19,6 +20,7 @@
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.ServerUtil;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.test.ASTest;
import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
@@ -55,7 +57,7 @@
}
public void createWSServer() throws Exception {
- currentServer = createServer(IJBossToolingConstants.AS_42, IJBossToolingConstants.SERVER_AS_42, ASTest.JBOSS_AS_42_HOME, DEFAULT_CONFIG,JREUtils.createJRE());
+ currentServer = createServer(IJBossToolingConstants.AS_42, IJBossToolingConstants.SERVER_AS_42, ASTest.JBOSS_AS_42_HOME, DEFAULT_CONFIG,JREUtils.createJRE());
}
public IProject createProject(String prjName) throws CoreException {
@@ -94,8 +96,13 @@
public IStatus publishWebProject(IProject project) throws CoreException {
IModule mod = ServerUtil.getModule(project);
- currentServer = ServerRuntimeUtils.addModule(currentServer, mod);
- IStatus status = ServerRuntimeUtils.publish(currentServer);
+ JBossServer ds = (JBossServer)currentServer.loadAdapter(JBossServer.class, new NullProgressMonitor());
+ IServerWorkingCopy copy = currentServer.createWorkingCopy();
+ copy.modifyModules(new IModule[]{mod}, new IModule[0], new NullProgressMonitor());
+ currentServer = copy.save(true, new NullProgressMonitor());
+ ds = (JBossServer)currentServer.loadAdapter(JBossServer.class, new NullProgressMonitor());
+ ds.setDeployLocationType("server");
+ IStatus status = ServerRuntimeUtils.publish(IServer.PUBLISH_INCREMENTAL,currentServer);
return status;
}
@@ -104,7 +111,6 @@
}
public void tearDown() throws Exception{
- undeployWebProject();
cleanResouces();
JBossWSRuntime runtime = JBossWSRuntimeManager.getInstance().findRuntimeByName(RuntimeName);
JBossWSRuntimeManager.getInstance().removeRuntime(runtime);
@@ -143,10 +149,10 @@
protected void undeployWebProject() throws CoreException {
IModule[] modules = ServerUtil.getModules(currentServer.getServerType()
.getRuntimeType().getModuleTypes());
- IServerWorkingCopy serverWC = currentServer.createWorkingCopy();
+ JBossServer ds = (JBossServer)currentServer.loadAdapter(JBossServer.class, new NullProgressMonitor());
+ IServerWorkingCopy serverWC = ds.getServerWorkingCopy();
serverWC.modifyModules(null, modules, null);
- serverWC.save(true, null).publish(0, null);
- currentServer.publish(IServer.PUBLISH_FULL, null);
+ serverWC.save(true, null).publish(IServer.PUBLISH_FULL, null);
}
private final void addResourceToCleanup(final IResource resource) {
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSJavaFirstCommandTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSJavaFirstCommandTest.java 2011-04-26 01:44:31 UTC (rev 30837)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSJavaFirstCommandTest.java 2011-04-26 07:15:45 UTC (rev 30838)
@@ -11,9 +11,6 @@
package org.jboss.tools.ws.creation.core.test.command;
import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IProject;
@@ -30,7 +27,6 @@
import org.eclipse.ui.console.IConsole;
import org.eclipse.ui.console.IConsoleManager;
import org.eclipse.ui.console.TextConsole;
-import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.ws.internal.wsrt.IWebService;
import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
@@ -76,15 +72,10 @@
fproject.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
fproject.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null);
- startup(currentServer);
publishWebProject(fproject.getProject());
- JobUtils.delay(60000);
- String webServiceUrl = "http://localhost:8080/JavaFirstTestProject/HelloWorld?wsdl";
- URL url = new URL(webServiceUrl);
- URLConnection conn = url.openConnection();
- assertEquals("unable to start JBoss server", IServer.STATE_STARTED,currentServer.getServerState());
- conn.connect();
- assertFalse("The url connection's status is "+ ((HttpURLConnection) conn).getResponseMessage(), "Ok".equals(((HttpURLConnection) conn).getResponseMessage()));
+ JobUtils.delay(20000);
+ startup(currentServer);
+ JobUtils.delay(20000);
model.setWebProjectName("ClientTest");
RemoveClientJarsCommand cmd = new RemoveClientJarsCommand(model);
@@ -105,6 +96,7 @@
wc.launch(ILaunchManager.RUN_MODE, null);
IConsoleManager consolemanager = JBossWSCreationCoreTestUtils.getConsoleManager();
checkText(consolemanager.getConsoles());
+ undeployWebProject();
}
public void doInitialCommand() throws CoreException, ExecutionException {
@@ -156,4 +148,10 @@
public static boolean isContainString(IConsole console, String str) {
return ((TextConsole) console).getDocument().get().contains(str);
}
+
+
+ public void tearDown() throws Exception{
+ undeployWebProject();
+ super.tearDown();
+ }
}
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java 2011-04-26 01:44:31 UTC (rev 30837)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java 2011-04-26 07:15:45 UTC (rev 30838)
@@ -34,6 +34,8 @@
import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.ws.core.classpath.JBossWSRuntime;
+import org.jboss.tools.ws.core.classpath.JBossWSRuntimeManager;
import org.jboss.tools.ws.creation.core.commands.ImplementationClassCreationCommand;
import org.jboss.tools.ws.creation.core.commands.InitialCommand;
import org.jboss.tools.ws.creation.core.commands.MergeWebXMLCommand;
@@ -63,9 +65,12 @@
fproject.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
fproject.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null);
+
+ publishWebProject(fproject.getProject());
+ JobUtils.delay(10000);
startup(currentServer);
- publishWebProject(fproject.getProject());
- JobUtils.delay(15000);
+ JobUtils.delay(10000);
+
assertTrue(currentServer.getModules().length > 0);
String webServiceUrl = "http://127.0.0.1:8080/JBossWSTestProject/Greeter?wsdl";
URL url = new URL(webServiceUrl);
@@ -150,4 +155,9 @@
assertEquals("Greeter", mapping.getServlet().getServletName());
}
}
+
+ public void tearDown() throws Exception{
+ undeployWebProject();
+ super.tearDown();
+ }
}
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r30837 - in trunk/as: plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-04-25 21:44:31 -0400 (Mon, 25 Apr 2011)
New Revision: 30837
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/UnifiedPublisher.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedFolderPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/SingleFolderZippedPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractJSTPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java
trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeployableMockDeploymentTester.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java
Log:
Test Case / AS Publisher Refactor! Inspired by AS7, 10 classes become 2! (still need to delete obsolete classes)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2011-04-26 01:44:31 UTC (rev 30837)
@@ -86,6 +86,7 @@
</extension>
<extension
point="org.jboss.ide.eclipse.as.core.publishers">
+ <!--
<publisher
class="org.jboss.ide.eclipse.archives.webtools.modules.PackagesPublisher"
priority="5">
@@ -101,13 +102,14 @@
zipDelegate="true">
</publisher>
<publisher
- class="org.jboss.ide.eclipse.archives.webtools.modules.AltMethodZippedJSTPublisher"
- priority="3"
+ class="org.jboss.ide.eclipse.archives.webtools.modules.AltMethodZippedFolderPublisher"
+ priority="8"
zipDelegate="true">
</publisher>
+ -->
<publisher
- class="org.jboss.ide.eclipse.archives.webtools.modules.AltMethodZippedFolderPublisher"
- priority="8"
+ class="org.jboss.ide.eclipse.archives.webtools.modules.AltMethodZippedJSTPublisher"
+ priority="3"
zipDelegate="true">
</publisher>
</extension>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedFolderPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedFolderPublisher.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedFolderPublisher.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -24,6 +24,7 @@
/**
* This class is in charge of RSE zipped publishing for deployable folders
*/
+@Deprecated
public class AltMethodZippedFolderPublisher extends AltMethodZippedJSTPublisher {
public boolean accepts(String method, IServer server, IModule[] module) {
if( LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(method))
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -42,16 +42,6 @@
* by uploading the file after building it in a temporary directory
*/
public class AltMethodZippedJSTPublisher extends WTPZippedPublisher {
- public boolean accepts(String method, IServer server, IModule[] module) {
- if( !LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(method))
- return super.accepts(method, server, module);
- return false;
- }
-
- protected boolean publishMethodSpecific() {
- return false; // can publish all method types
- }
-
/**
* Here we put the deployment first in a temporary remote deploy folder
* Then during the publishModule call, we'll also upload it to remote machine
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -15,11 +15,12 @@
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher;
+@Deprecated
public class PackagesPublisher extends JBoss7JSTPublisher {
public boolean accepts(String method, IServer server, IModule[] module) {
- if( LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(method) &&
- verifyModuleType(module, PackageModuleFactory.MODULE_TYPE))
- return true;
+// if( LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(method) &&
+// verifyModuleType(module, PackageModuleFactory.MODULE_TYPE))
+// return true;
return false;
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/SingleFolderZippedPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/SingleFolderZippedPublisher.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/SingleFolderZippedPublisher.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -20,6 +20,7 @@
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule;
+@Deprecated
public class SingleFolderZippedPublisher extends WTPZippedPublisher {
public boolean accepts(String method, IServer server, IModule[] module) {
IDeployableServer ds = ServerConverter.getDeployableServer(server);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -13,21 +13,24 @@
package org.jboss.ide.eclipse.archives.webtools.modules;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.model.IModuleFile;
import org.eclipse.wst.server.core.model.IModuleResourceDelta;
-import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
+import org.eclipse.wst.server.core.util.ModuleFile;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server;
+import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
@@ -35,28 +38,10 @@
private int moduleState = IServer.PUBLISH_STATE_NONE;
public boolean accepts(String method, IServer server, IModule[] module) {
- if( (publishMethodSpecific() && !method.equals(getTargetedPublishMethodId())))
- return false;
IDeployableServer ds = ServerConverter.getDeployableServer(server);
- IModule lastMod = (module == null || module.length == 0 ) ? null : module[module.length -1];
- if( getPublishMethod().equals(method) && lastMod == null)
- return true;
- return ModuleCoreNature.isFlexibleProject(lastMod.getProject())
- && ds != null && ds.zipsWTPDeployments();
+ return ds != null && (module == null || ds.zipsWTPDeployments());
}
- protected boolean publishMethodSpecific() {
- return true;
- }
-
- protected String getTargetedPublishMethodId() {
- return getPublishMethod();
- }
-
- protected String getPublishMethod() {
- return LocalPublishMethod.LOCAL_PUBLISH_METHOD;
- }
-
public int getPublishState() {
return moduleState;
}
@@ -100,7 +85,16 @@
} else {
LocalZippedPublisherUtil util = new LocalZippedPublisherUtil();
IStatus s = util.publishModule(server, deployRoot, module, publishType, delta, monitor);
+ IPath outPath = util.getOutputFilePath();
if( util.hasBeenChanged()) {
+ // Copy out file
+ IPath depPath = PublishUtil.getDeployPath(method, module, ds);
+ IPath folder = depPath.removeLastSegments(1);
+ IPublishCopyCallbackHandler callback = method.getCallbackHandler(folder, server);
+ IModuleFile mf = new ModuleFile(outPath.toFile(), "", new Path("/")); //$NON-NLS-1$ //$NON-NLS-2$
+ callback.copyFile(mf, new Path(depPath.lastSegment()), monitor);
+
+ // Add marker
JBoss7JSTPublisher.addDoDeployMarkerFile(method, ds, module, new NullProgressMonitor());
}
monitor.done();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -151,12 +151,9 @@
loadPublishers();
Iterator<PublisherWrapper> i = publishers.iterator();
PublisherWrapper wrapper;
- System.out.println("finding publisher: "); //$NON-NLS-1$
while(i.hasNext()) {
wrapper = i.next();
IJBossServerPublisher publisher = wrapper.publisher;
- System.out.println(" publisher " + publisher.getClass() + " accepted? " + //$NON-NLS-1$ //$NON-NLS-2$
- publisher.accepts(deployMethod, server, module));
if( publisher.accepts(deployMethod, server, module))
return wrapper.getNewInstance();
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractJSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractJSTPublisher.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractJSTPublisher.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -10,58 +10,8 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.publishers;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
-import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+@Deprecated
public abstract class AbstractJSTPublisher extends AbstractServerToolsPublisher {
public AbstractJSTPublisher() {}
-
- public boolean verifyModuleType(IModule[] module, String type) {
- if( module != null && module.length > 0
- && module[module.length-1] != null
- && module[module.length-1].getModuleType().getId().equals(type))
- return true;
- return false;
- }
-
- /**
- * This abstract publisher is only suitable for non force-zipped deployments
- */
- public boolean accepts(String method, IServer server, IModule[] module) {
- if( module == null || (publishMethodSpecific() && !method.equals(getTargetedPublishMethodId())))
- return false;
- IDeployableServer ds = ServerConverter.getDeployableServer(server);
- boolean b = ds.zipsWTPDeployments();
- return ds != null
- && ModuleCoreNature.isFlexibleProject(module[0].getProject())
- && !ds.zipsWTPDeployments();
- }
-
- /**
- * Return true if this publisher requires a specific
- * publish method / publish method id.
- * Clients are expected to override
- */
- protected boolean publishMethodSpecific() {
- return false;
- }
-
- /**
- * Get the publish method this publisher is associated with
- * @return
- */
- protected String getTargetedPublishMethodId() {
- return null;
- }
-
- /**
- * JST projects require certain children (utility, etc) to be zipped up
- */
- @Override
- protected boolean forceZipModule(IModule[] moduleTree) {
- return PublishUtil.deployPackaged(moduleTree);
- }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -43,7 +43,7 @@
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities;
-/**
+/**O
* Class suitable for parsing any properly formed servertools-api module
*/
public abstract class AbstractServerToolsPublisher implements IJBossServerPublisher {
@@ -53,7 +53,18 @@
protected IJBossServerPublishMethod publishMethod;
public AbstractServerToolsPublisher() {}
- public abstract boolean accepts(String method, IServer server, IModule[] module);
+
+ /**
+ * This abstract publisher is only suitable for non force-zipped deployments
+ */
+ public boolean accepts(String method, IServer server, IModule[] module) {
+ IDeployableServer ds = ServerConverter.getDeployableServer(server);
+ if( ds == null )
+ return false;
+ if( ServerModelUtilities.isBinaryModule(module[module.length-1]))
+ return true;
+ return !ds.zipsWTPDeployments();
+ }
public int getPublishState() {
return publishState;
@@ -149,7 +160,7 @@
* @return
*/
protected boolean forceZipModule(IModule[] moduleTree) {
- return false;
+ return PublishUtil.deployPackaged(moduleTree);
}
protected IStatus canceledStatus() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.publishers;
-
+@Deprecated
public class JstPublisher extends AbstractJSTPublisher {
protected String getTargetedPublishMethodId() {
return LocalPublishMethod.LOCAL_PUBLISH_METHOD;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -10,15 +10,13 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.publishers;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule;
+@Deprecated
public class SingleFilePublisher extends JBoss7JSTPublisher {
protected boolean forceZipModule(IModule[] moduleTree) {
return false;
@@ -26,12 +24,12 @@
public boolean accepts(String method, IServer server, IModule[] module) {
IDeployableServer ds = ServerConverter.getDeployableServer(server);
- if( verifyModuleType(module, SingleDeployableFactory.MODULE_TYPE)) {
- IJBTModule del = (IJBTModule)module[module.length-1].loadAdapter(IJBTModule.class, new NullProgressMonitor());
- if( del != null && (del.isBinary() || !ds.zipsWTPDeployments())) {
- return true;
- }
- }
+// if( verifyModuleType(module, SingleDeployableFactory.MODULE_TYPE)) {
+// IJBTModule del = (IJBTModule)module[module.length-1].loadAdapter(IJBTModule.class, new NullProgressMonitor());
+// if( del != null && (del.isBinary() || !ds.zipsWTPDeployments())) {
+// return true;
+// }
+// }
return false;
}
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/UnifiedPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/UnifiedPublisher.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/UnifiedPublisher.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -0,0 +1,7 @@
+package org.jboss.ide.eclipse.as.core.publishers;
+
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher;
+
+public class UnifiedPublisher extends JBoss7JSTPublisher {
+
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -28,7 +28,7 @@
import org.eclipse.wst.server.core.model.IModuleResourceDelta;
import org.eclipse.wst.server.core.util.ModuleFile;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
-import org.jboss.ide.eclipse.as.core.publishers.AbstractJSTPublisher;
+import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
@@ -37,11 +37,11 @@
import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-public class JBoss7JSTPublisher extends AbstractJSTPublisher {
+public class JBoss7JSTPublisher extends AbstractServerToolsPublisher {
// Same as super class but just a *bit* different
public boolean accepts(String method, IServer server, IModule[] module) {
- return super.accepts(method, server, module) &&
- JBoss7Server.supportsJBoss7MarkerDeployment(server);
+ return super.accepts(method, server, module);
+ // && JBoss7Server.supportsJBoss7MarkerDeployment(server);
}
public static final String DEPLOYED = ".deployed"; //$NON-NLS-1$
@@ -53,35 +53,39 @@
public static final String SKIP_DEPLOY = ".skipdeploy";//$NON-NLS-1$
public static final String PENDING = ".pending";//$NON-NLS-1$
- public IStatus publishModule(
+ public IStatus publishModuleToAS7(
IJBossServerPublishMethod method,
IServer server, IModule[] module,
int publishType, IModuleResourceDelta[] delta,
IProgressMonitor monitor) throws CoreException {
- //IJBoss7Manager service = JBoss7ManagerUtil.findManagementService(server);
-
- // jboss-7 specific
IDeployableServer ds = ServerConverter.getDeployableServer(server);
if( publishType == IJBossServerPublisher.REMOVE_PUBLISH) {
- if( JBoss7Server.supportsJBoss7MarkerDeployment(server) )
- JBoss7JSTPublisher.removeDeployedMarkerFile(method, ds, module, monitor);
- else
- super.publishModule(method, server, module, publishType, delta, monitor);
+ JBoss7JSTPublisher.removeDeployedMarkerFile(method, ds, module, monitor);
} else {
IStatus s = super.publishModule(method, server, module, publishType, delta, monitor);
- if( JBoss7Server.supportsJBoss7MarkerDeployment(server) ) {
- if( module.length == 1 &&
- publishType == IJBossServerPublisher.FULL_PUBLISH ||
- publishType == IJBossServerPublisher.INCREMENTAL_PUBLISH) {
- // Only mark a doDeploy file for the root module, but this must be delayed,
- // becuase we don't know how many children modules will get published here (SUCK)
- JBoss7JSTPublisher.markDeployed(method, ds, module, monitor);
- }
+ if( module.length == 1 &&
+ publishType == IJBossServerPublisher.FULL_PUBLISH ||
+ publishType == IJBossServerPublisher.INCREMENTAL_PUBLISH) {
+ // Only mark a doDeploy file for the root module, but this must be delayed,
+ // becuase we don't know how many children modules will get published here (SUCK)
+ JBoss7JSTPublisher.markDeployed(method, ds, module, monitor);
}
return s;
}
return Status.OK_STATUS;
}
+
+ public IStatus publishModule(
+ IJBossServerPublishMethod method,
+ IServer server, IModule[] module,
+ int publishType, IModuleResourceDelta[] delta,
+ IProgressMonitor monitor) throws CoreException {
+ boolean useAS7Behavior = JBoss7Server.supportsJBoss7MarkerDeployment(server);
+ if( useAS7Behavior )
+ return publishModuleToAS7(method, server, module, publishType, delta, monitor);
+ else
+ return super.publishModule(method, server, module, publishType, delta, monitor);
+ }
public static final String MARK_DO_DEPLOY = "org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher.markUndeploy"; //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -34,8 +34,7 @@
}
public static boolean supportsJBoss7MarkerDeployment(IServer server) {
- if( server.loadAdapter(IJBoss7Deployment.class, new NullProgressMonitor()) != null )
- return true;
- return false;
+ boolean retval = (server.loadAdapter(IJBoss7Deployment.class, new NullProgressMonitor()) != null);
+ return retval;
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-04-26 01:44:31 UTC (rev 30837)
@@ -1102,9 +1102,11 @@
<extension
point="org.jboss.ide.eclipse.as.core.publishers">
<publisher
- class="org.jboss.ide.eclipse.as.core.publishers.SingleFilePublisher"
- priority="7">
+ class="org.jboss.ide.eclipse.as.core.publishers.UnifiedPublisher"
+ priority="15"
+ zipDelegate="false">
</publisher>
+ <!--
<publisher
class="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher"
priority="6">
@@ -1117,6 +1119,7 @@
class="org.jboss.ide.eclipse.as.core.publishers.NullPublisher"
priority="0">
</publisher>
+ -->
</extension>
<extension
point="org.eclipse.jdt.core.classpathContainerInitializer">
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -22,6 +22,7 @@
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.ServerUtil;
import org.eclipse.wst.server.core.internal.PublishServerJob;
import org.eclipse.wst.server.core.internal.Server;
@@ -152,6 +153,7 @@
// Assumption: Anything selected is already on the server, or it wouldnt be in the view.
if( selection != null && selection.length > 0 ) {
Server s = ((Server)selection[0].server);
+ IServer tmp = ServerCore.findServer(s.getId());
for( int i = 0; i < selection.length; i++ ) {
IModule[] mod = selection[i].module;
s.setModulePublishState(mod, type);
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -50,7 +50,6 @@
assertEquals(mods.length, 1);
server = ServerRuntimeUtils.addModule(server, mods[0]);
ServerRuntimeUtils.publish(server);
- dump(o1,o2);
int ch = MockPublishMethod.getChanged().length;
int rm = MockPublishMethod.getRemoved().length;
assertEquals(2,ch);
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -44,21 +44,21 @@
public static Test suite() {
TestSuite suite = new TestSuite("ASTools Test Suite");
suite.addTestSuite(PreReqTest.class);
-// suite.addTestSuite(RuntimeServerModelTest.class);
-// suite.addTestSuite(JEEClasspathContainerTest.class);
-// suite.addTestSuite(ProjectRuntimeTest.class);
-// suite.addTestSuite(JSTDeploymentWarUpdateXML.class);
-// suite.addTestSuite(SingleFileDeployableMockDeploymentTester.class);
-// suite.addTestSuite(MockJSTPublisherTest.class);
-// suite.addTestSuite(JBIDE1657Test.class);
-// suite.addTestSuite(JBIDE2512aTest.class);
-// suite.addTestSuite(JBIDE2512bTest.class);
-// suite.addTestSuite(JBIDE4184Test.class);
-// suite.addTestSuite(TestEar5WithJBossRuntime.class);
-// suite.addTestSuite(JSTDeploymentTester.class);
-// suite.addTestSuite(JSTDeployBinaryChildModuleTest.class);
-// suite.addTestSuite(SingleFileDeploymentTester.class);
-// suite.addTestSuite(JBossServerAPITest.class);
+ suite.addTestSuite(RuntimeServerModelTest.class);
+ suite.addTestSuite(JEEClasspathContainerTest.class);
+ suite.addTestSuite(ProjectRuntimeTest.class);
+ suite.addTestSuite(JSTDeploymentWarUpdateXML.class);
+ suite.addTestSuite(SingleFileDeployableMockDeploymentTester.class);
+ suite.addTestSuite(MockJSTPublisherTest.class);
+ suite.addTestSuite(JBIDE1657Test.class);
+ suite.addTestSuite(JBIDE2512aTest.class);
+ suite.addTestSuite(JBIDE2512bTest.class);
+ suite.addTestSuite(JBIDE4184Test.class);
+ suite.addTestSuite(TestEar5WithJBossRuntime.class);
+ suite.addTestSuite(JSTDeploymentTester.class);
+ suite.addTestSuite(JSTDeployBinaryChildModuleTest.class);
+ suite.addTestSuite(SingleFileDeploymentTester.class);
+ suite.addTestSuite(JBossServerAPITest.class);
return suite;
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -52,9 +52,9 @@
}
protected void verifyJSTPublisher(IModule[] module) {
- IJBossServerPublisher publisher = ExtensionManager
- .getDefault().getPublisher(server, module, "local");
- assertTrue(publisher instanceof JstPublisher);
+// IJBossServerPublisher publisher = ExtensionManager
+// .getDefault().getPublisher(server, module, "local");
+// assertTrue(publisher instanceof JstPublisher);
}
protected void assertContents(IFile file, int val) throws IOException, CoreException {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -54,7 +54,7 @@
public IStatus[] deleteResource(IPath path, IProgressMonitor monitor)
throws CoreException {
- System.out.println("deleting " + root.append(path));
+// System.out.println("deleting " + root.append(path));
IPath path2 = root.append(path);
if( !removed.contains(path2.makeRelative()))
removed.add(path2.makeRelative());
@@ -63,7 +63,7 @@
public IStatus[] makeDirectoryIfRequired(IPath dir,
IProgressMonitor monitor) throws CoreException {
- System.out.println("mkdir to " + root.append(dir));
+// System.out.println("mkdir to " + root.append(dir));
IPath path2 = root.append(dir);
if( !changed.contains(path2.makeRelative()))
@@ -77,7 +77,7 @@
}
public IStatus[] copyFile(IModuleFile mf, IPath path,
IProgressMonitor monitor) throws CoreException {
- System.out.println("copying to " + root.append(path));
+// System.out.println("copying to " + root.append(path));
File file = PublishUtil.getFile(mf);
shouldRestartModule |= PublishCopyUtil.checkRestartModule(file);
IPath path2 = root.append(path);
@@ -87,7 +87,7 @@
}
public IStatus[] touchResource(IPath path) {
- System.out.println("touching " + root.append(path));
+// System.out.println("touching " + root.append(path));
IPath path2 = root.append(path);
if( !changed.contains(path2.makeRelative()))
changed.add(path2.makeRelative());
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeployableMockDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeployableMockDeploymentTester.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeployableMockDeploymentTester.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -69,10 +69,10 @@
}
protected void verifyPublisher(IModule module, Class c) {
- IModule[] mod = new IModule[] { module };
- IJBossServerPublisher publisher = ExtensionManager
- .getDefault().getPublisher(server, mod, "local");
- assertTrue(publisher.getClass().equals(c));
+// IModule[] mod = new IModule[] { module };
+// IJBossServerPublisher publisher = ExtensionManager
+// .getDefault().getPublisher(server, mod, "local");
+// assertTrue(publisher.getClass().equals(c));
}
protected IFile createFile(String filename, String contents) throws CoreException, IOException {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-04-26 01:12:00 UTC (rev 30836)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-04-26 01:44:31 UTC (rev 30837)
@@ -251,10 +251,10 @@
protected void verifyPublisher(IModule module, Class c) {
- IModule[] mod = new IModule[] { module };
- IJBossServerPublisher publisher = ExtensionManager
- .getDefault().getPublisher(server, mod, "local");
- assertTrue(publisher.getClass().equals(c));
+// IModule[] mod = new IModule[] { module };
+// IJBossServerPublisher publisher = ExtensionManager
+// .getDefault().getPublisher(server, mod, "local");
+// assertTrue(publisher.getClass().equals(c));
}
protected IFile createFile(String filename, String contents) throws CoreException, IOException {
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r30836 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core: scanner and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-25 21:12:00 -0400 (Mon, 25 Apr 2011)
New Revision: 30836
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeanDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamFieldDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMemberDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMethodDefinition.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeansDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java
Log:
JBIDE-3120
https://issues.jboss.org/browse/JBIDE-3120
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeanDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeanDefinition.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeanDefinition.java 2011-04-26 01:12:00 UTC (rev 30836)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.config.core.definition;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jdt.core.IType;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class SeamBeanDefinition extends SeamMemberDefinition {
+ IType type = null;
+ List<SeamFieldDefinition> fields = new ArrayList<SeamFieldDefinition>();
+ List<SeamMethodDefinition> methods = new ArrayList<SeamMethodDefinition>();
+
+ public SeamBeanDefinition() {}
+
+ public void setType(IType type) {
+ this.type = type;
+ }
+
+ public void addField(SeamFieldDefinition field) {
+ fields.add(field);
+ }
+
+ public void addMethod(SeamMethodDefinition method) {
+ methods.add(method);
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeanDefinition.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeansDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeansDefinition.java 2011-04-25 22:35:27 UTC (rev 30835)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeansDefinition.java 2011-04-26 01:12:00 UTC (rev 30836)
@@ -25,6 +25,8 @@
*/
public class SeamBeansDefinition {
Map<SAXNode, String> unresolvedNodes = new HashMap<SAXNode, String>();
+
+ Set<SeamBeanDefinition> beanDefinitions = new HashSet<SeamBeanDefinition>();
public SeamBeansDefinition() {}
@@ -36,4 +38,8 @@
unresolvedNodes.put(node, problem);
}
+ public void addBeanDefinition(SeamBeanDefinition def) {
+ beanDefinitions.add(def);
+ }
+
}
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamFieldDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamFieldDefinition.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamFieldDefinition.java 2011-04-26 01:12:00 UTC (rev 30836)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.config.core.definition;
+
+import org.eclipse.jdt.core.IField;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class SeamFieldDefinition extends SeamMemberDefinition {
+ IField field;
+
+ public SeamFieldDefinition() {}
+
+ public void setField(IField field) {
+ this.field = field;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamFieldDefinition.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMemberDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMemberDefinition.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMemberDefinition.java 2011-04-26 01:12:00 UTC (rev 30836)
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.config.core.definition;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.tools.cdi.core.IJavaAnnotation;
+import org.jboss.tools.cdi.seam.config.core.scanner.SAXElement;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public abstract class SeamMemberDefinition {
+ protected SAXElement element;
+ SAXElement replaces = null;
+ SAXElement modifies = null;
+ Map<String, IJavaAnnotation> annotations = new HashMap<String, IJavaAnnotation>();
+
+ public SeamMemberDefinition() {}
+
+ public void setElement(SAXElement element) {
+ this.element = element;
+ }
+
+ public void setReplaces(SAXElement replaces) {
+ this.replaces = replaces;
+ }
+
+ public void setModifies(SAXElement modifies) {
+ this.modifies = modifies;
+ }
+
+ public void addAnnotation(IJavaAnnotation a) {
+ annotations.put(a.getTypeName(), a);
+ }
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMemberDefinition.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMethodDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMethodDefinition.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMethodDefinition.java 2011-04-26 01:12:00 UTC (rev 30836)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.config.core.definition;
+
+import org.eclipse.jdt.core.IMethod;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class SeamMethodDefinition extends SeamMemberDefinition {
+ IMethod method;
+
+ public SeamMethodDefinition() {}
+
+ public void setMethod(IMethod method) {
+ this.method = method;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMethodDefinition.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java 2011-04-25 22:35:27 UTC (rev 30835)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java 2011-04-26 01:12:00 UTC (rev 30836)
@@ -4,6 +4,9 @@
import java.util.List;
import org.eclipse.core.resources.IResource;
+import org.eclipse.jdt.core.IField;
+import org.eclipse.jdt.core.IMember;
+import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.text.IDocument;
@@ -14,7 +17,10 @@
import org.jboss.tools.cdi.seam.config.core.CDISeamConfigConstants;
import org.jboss.tools.cdi.seam.config.core.CDISeamConfigCorePlugin;
import org.jboss.tools.cdi.seam.config.core.ConfigDefinitionContext;
+import org.jboss.tools.cdi.seam.config.core.definition.SeamBeanDefinition;
import org.jboss.tools.cdi.seam.config.core.definition.SeamBeansDefinition;
+import org.jboss.tools.cdi.seam.config.core.definition.SeamFieldDefinition;
+import org.jboss.tools.cdi.seam.config.core.definition.SeamMethodDefinition;
import org.jboss.tools.cdi.seam.config.core.util.Util;
public class SeamDefinitionBuilder {
@@ -76,7 +82,6 @@
private void scanAnnotation(SAXElement element, IType type) {
context.getRootContext().getAnnotationKind(type); // kick it
- AnnotationDefinition old = context.getRootContext().getAnnotation(type.getFullyQualifiedName());
AnnotationDefinition def = new AnnotationDefinition();
def.setType(type, context.getRootContext());
@@ -96,10 +101,101 @@
}
private void scanBean(SAXElement element, IType type) {
+ SeamBeanDefinition def = new SeamBeanDefinition();
+ def.setElement(element);
+ def.setType(type);
+ result.addBeanDefinition(def);
List<SAXElement> es = element.getChildElements();
- //TODO
+ for (SAXElement c: es) {
+ if(!Util.isConfigRelevant(c)) continue;
+ if(Util.containsEEPackage(c.getURI())) {
+ if("replaces".equals(c.getLocalName())) {
+ def.setReplaces(c);
+ continue;
+ }
+ if("modifies".equals(c.getLocalName())) {
+ def.setModifies(c);
+ continue;
+ }
+ }
+ IType t = Util.resolveType(c, project);
+ if(t != null) {
+ IJavaAnnotation a = loadAnnotationDeclaration(element, IN_ANNOTATION_TYPE);
+ if(a != null) {
+ def.addAnnotation(a);
+ }
+ continue;
+ }
+ IMember m = null;
+ try {
+ m = Util.resolveMember(type, c);
+ } catch (JavaModelException e) {
+ CDISeamConfigCorePlugin.getDefault().logError(e);
+ }
+ if(m instanceof IField) {
+ def.addField(scanField(c, (IField)m));
+ } else if(m instanceof IMethod) {
+ def.addMethod(scanMethod(element, (IMethod)m));
+ } else {
+ result.addUnresolvedNode(c, "Cannot resolve member.");
+ }
+ }
}
+ private SeamFieldDefinition scanField(SAXElement element, IField field) {
+ SeamFieldDefinition def = new SeamFieldDefinition();
+ def.setElement(element);
+ def.setField(field);
+ List<SAXElement> es = element.getChildElements();
+ for (SAXElement c: es) {
+ if(!Util.isConfigRelevant(c)) continue;
+ if(Util.containsEEPackage(c.getURI())) {
+ if("value".equals(c.getLocalName())) {
+ //TODO do not forget to look for Inline Bean Declarations inside field values.
+
+ }
+
+ }
+ IType t = Util.resolveType(c, project);
+ if(t != null) {
+ IJavaAnnotation a = loadAnnotationDeclaration(element, IN_ANNOTATION_TYPE);
+ if(a != null) {
+ def.addAnnotation(a);
+ }
+ continue;
+ }
+
+ }
+ return def;
+ }
+
+ private SeamMethodDefinition scanMethod(SAXElement element, IMethod method) {
+ SeamMethodDefinition def = new SeamMethodDefinition();
+ def.setElement(element);
+ def.setMethod(method);
+ List<SAXElement> es = element.getChildElements();
+ for (SAXElement c: es) {
+ if(!Util.isConfigRelevant(c)) continue;
+ if(Util.containsEEPackage(c.getURI())) {
+ if("parameters".equals(c.getLocalName())) {
+ //TODO
+
+ }
+
+ }
+ IType t = Util.resolveType(c, project);
+ if(t != null) {
+ IJavaAnnotation a = loadAnnotationDeclaration(element, IN_ANNOTATION_TYPE);
+ if(a != null) {
+ def.addAnnotation(a);
+ }
+ continue;
+ }
+
+ }
+ return def;
+ }
+
private IJavaAnnotation loadAnnotationDeclaration(SAXElement element, int contextKind) {
if(!Util.isConfigRelevant(element)) return null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java 2011-04-25 22:35:27 UTC (rev 30835)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java 2011-04-26 01:12:00 UTC (rev 30836)
@@ -104,4 +104,12 @@
return uri.split(":");
}
+ public static boolean containsEEPackage(String uri) {
+ String[] ps = getPackages(uri);
+ for (String p: ps) if("ee".equals(p)) {
+ return true;
+ }
+ return false;
+ }
+
}
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r30835 - 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: rob.stryker(a)jboss.com
Date: 2011-04-25 18:35:27 -0400 (Mon, 25 Apr 2011)
New Revision: 30835
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.properties
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/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/JBoss7Manager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/ModelDescriptionConstants.java
Log:
NLS done properly for as7 code
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.java 2011-04-25 22:35:27 UTC (rev 30835)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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;
+
+import org.eclipse.osgi.util.NLS;
+
+public class AS7Messages extends NLS {
+ public static String ModuleStateEvaluationFailed;
+ public static String OperationOnAddressFailed;
+ public static String FailedToBuildOperation;
+ public static String OperationOutcomeToString;
+ public static String OperationOnUnitNotExecuted;
+ public static String OperationOnUnitFailed;
+ public static String OperationOnUnitRolledBack;
+ public static String OperationNotExecConfigRequiresRestart;
+ static {
+ NLS.initializeMessages("org.jboss.ide.eclipse.as.management.as7.AS7Messages", //$NON-NLS-1$
+ AS7Messages.class);
+ }
+
+}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.properties (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/AS7Messages.properties 2011-04-25 22:35:27 UTC (rev 30835)
@@ -0,0 +1,8 @@
+ModuleStateEvaluationFailed=Could not evaluate state for deployment {0}
+OperationOnAddressFailed=Could not execute {0} for {1}. Failure was {2}.
+FailedToBuildOperation=Failed to build operation.
+OperationOutcomeToString=Operation outcome is {0}.
+OperationOnUnitNotExecuted=The operation {0} was not executed on unit {1}
+OperationOnUnitFailed=The operation {0} failed for unit {1}
+OperationOnUnitRolledBack=The operation {0} for unit {1} was rolled back
+OperationNotExecConfigRequiresRestart=The operation {0} was not executed on unit {1}. The server configuration was changed though and the server needs to be restarted.
\ 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/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-25 21:41:55 UTC (rev 30834)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-04-25 22:35:27 UTC (rev 30835)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2011 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,
@@ -21,10 +21,10 @@
import java.io.File;
import java.io.IOException;
import java.net.UnknownHostException;
-import java.text.MessageFormat;
import java.util.concurrent.Future;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.osgi.util.NLS;
import org.jboss.as.controller.client.ModelControllerClient;
import org.jboss.as.controller.client.helpers.standalone.DeploymentAction;
import org.jboss.as.controller.client.helpers.standalone.DeploymentPlanBuilder;
@@ -32,9 +32,10 @@
import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentPlanResult;
import org.jboss.as.protocol.StreamUtils;
import org.jboss.dmr.ModelNode;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7DeploymentState;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangerException;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult;
+import org.jboss.ide.eclipse.as.management.as7.AS7Messages;
/**
* @author André Dietisheim
@@ -124,7 +125,7 @@
Boolean enabled = AS7ManagerUtil.getBooleanProperty(ENABLED, result);
if (enabled == null) {
throw new JBoss7ManangerException(
- MessageFormat.format("Could not evaluate state for deployment {0}", name));
+ NLS.bind(AS7Messages.ModuleStateEvaluationFailed, name));
} else if (enabled) {
return JBoss7DeploymentState.STARTED;
} else {
@@ -142,8 +143,11 @@
ModelNode response = client.execute(node);
if (!AS7ManagerUtil.isSuccess(response)) {
throw new JBoss7ManangerException(
- MessageFormat.format("Could not execute {0} for {1}. Failure was {2}.", node.get(OP),
- node.get(ADDRESS), response.get(FAILURE_DESCRIPTION)));
+ NLS.bind(AS7Messages.OperationOnAddressFailed,
+ new Object[]{ node.get(OP),
+ node.get(ADDRESS),
+ response.get(FAILURE_DESCRIPTION)}
+ ));
}
return response.get(RESULT);
} catch (Exception e) {
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-25 21:41:55 UTC (rev 30834)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7ManagerUtil.java 2011-04-25 22:35:27 UTC (rev 30835)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2011 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,
@@ -23,12 +23,14 @@
import java.util.Collections;
import java.util.List;
+import org.eclipse.osgi.util.NLS;
import org.jboss.as.controller.client.ModelControllerClient;
import org.jboss.as.controller.client.Operation;
import org.jboss.dmr.ModelNode;
import org.jboss.dmr.ModelType;
import org.jboss.dmr.Property;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangerException;
+import org.jboss.ide.eclipse.as.management.as7.AS7Messages;
import org.jboss.ide.eclipse.as.management.as7.internal.DefaultOperationRequestBuilder;
import org.jboss.ide.eclipse.as.management.as7.internal.OperationFormatException;
@@ -105,10 +107,10 @@
final ModelNode request;
try {
builder.operationName(READ_CHILDREN_NAMES_OPERATION);
- builder.addProperty(CHILD_TYPE, "deployment");
+ builder.addProperty(CHILD_TYPE, ModelDescriptionConstants.DEPLOYMENT);
request = builder.buildRequest();
} catch (OperationFormatException e) {
- throw new IllegalStateException("Failed to build operation", e);
+ throw new IllegalStateException(AS7Messages.FailedToBuildOperation, e);
}
try {
@@ -142,14 +144,15 @@
try {
ModelNode result = client.execute(operation);
if (result.hasDefined(OUTCOME)
- && SUCCESS.equals(result.get("outcome").asString())) {
+ && SUCCESS.equals(result.get(OUTCOME).asString())) {
return result.get(RESULT);
}
else if (result.hasDefined(FAILURE_DESCRIPTION)) {
throw new JBoss7ManangerException(result.get(FAILURE_DESCRIPTION).toString());
}
else {
- throw new JBoss7ManangerException("Operation outcome is " + result.get(OUTCOME).asString());
+ throw new JBoss7ManangerException(NLS.bind(
+ AS7Messages.OperationOutcomeToString, result.get(OUTCOME).asString()));
}
} catch (IOException e) {
throw new JBoss7ManangerException(e);
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-25 21:41:55 UTC (rev 30834)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DeploymentOperationResult.java 2011-04-25 22:35:27 UTC (rev 30835)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2011 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,
@@ -16,11 +16,13 @@
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
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.JBoss7ManangerException;
import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult;
+import org.jboss.ide.eclipse.as.management.as7.AS7Messages;
import org.jboss.ide.eclipse.as.management.as7.Activator;
/**
@@ -62,25 +64,27 @@
IStatus status = null;
switch (actionResult.getResult()) {
case NOT_EXECUTED:
- status = createStatus(IStatus.ERROR, "The operation {0} was not executed on unit {1}",
- actionName, deploymentName);
+ status = createStatus(IStatus.ERROR, NLS.bind(
+ AS7Messages.OperationOnUnitNotExecuted,
+ actionName, deploymentName));
break;
case EXECUTED:
status = Status.OK_STATUS;
break;
case FAILED:
- status = createStatus(IStatus.ERROR, "The operation {0} failed for unit {1}",
- actionName, deploymentName);
+ status = createStatus(IStatus.ERROR, NLS.bind(AS7Messages.OperationOnUnitFailed,
+ actionName, deploymentName));
break;
case ROLLED_BACK:
- status = createStatus(IStatus.ERROR, "The operation {0} for unit {1} was rolled back",
- actionName, deploymentName);
+ status = createStatus(IStatus.ERROR,
+ NLS.bind(AS7Messages.OperationOnUnitRolledBack,
+ actionName, deploymentName));
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",
- actionName, deploymentName);
+ NLS.bind(AS7Messages.OperationNotExecConfigRequiresRestart,
+ actionName, deploymentName));
break;
}
return status;
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-25 21:41:55 UTC (rev 30834)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/DetypedDeployer.java 2011-04-25 22:35:27 UTC (rev 30835)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2011 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,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7Manager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7Manager.java 2011-04-25 21:41:55 UTC (rev 30834)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7Manager.java 2011-04-25 22:35:27 UTC (rev 30835)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2011 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,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/ModelDescriptionConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/ModelDescriptionConstants.java 2011-04-25 21:41:55 UTC (rev 30834)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/ModelDescriptionConstants.java 2011-04-25 22:35:27 UTC (rev 30835)
@@ -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) 2011 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;
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r30834 - in trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core: src/org/jboss/ide/eclipse/as/rse/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-04-25 17:41:55 -0400 (Mon, 25 Apr 2011)
New Revision: 30834
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJSTPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSESingleFilePublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml
Log:
RSE Plugin externalization and removal of deprecated classes
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.properties 2011-04-25 21:33:39 UTC (rev 30833)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.properties 2011-04-25 21:41:55 UTC (rev 30834)
@@ -1,3 +1,5 @@
+Bundle-Vendor.0 = JBoss by Red Hat
+Bundle-Name.0 = JBossAS RSE Tools
AllJBossRuntimeTypes=org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.60,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50
AllJBossServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50
AllJBTServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.systemCopyServer
@@ -2,3 +4,2 @@
ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60
-Bundle-Vendor.0 = JBoss by Red Hat
-Bundle-Name.0 = JBossAS RSE Tools
+RSEMethodName=Remote System Deployment2
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml 2011-04-25 21:33:39 UTC (rev 30833)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml 2011-04-25 21:41:55 UTC (rev 30834)
@@ -7,32 +7,8 @@
<publishMethod
class="org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod"
id="rse"
- name="Remote System Deployment"
+ name="%RSEMethodName"
serverTypes="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.systemCopyServer">
</publishMethod>
</extension>
- <extension
- point="org.jboss.ide.eclipse.as.core.publishers">
-<!--
- <publisher
- class="org.jboss.ide.eclipse.as.rse.core.RSESingleFilePublisher"
- priority="7">
- </publisher>
- <publisher
- class="org.jboss.ide.eclipse.as.rse.core.RSEJSTPublisher"
- priority="5">
- </publisher>
- <publisher
- class="org.jboss.ide.eclipse.as.rse.core.archives.RSEZippedJSTPublisher"
- priority="3"
- zipDelegate="true">
- </publisher>
- <publisher
- class="org.jboss.ide.eclipse.as.rse.core.archives.RSEZippedFolderPublisher"
- priority="8"
- zipDelegate="true">
- </publisher>
--->
- </extension>
-
</plugin>
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJSTPublisher.java 2011-04-25 21:33:39 UTC (rev 30833)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJSTPublisher.java 2011-04-25 21:41:55 UTC (rev 30834)
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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
- *
- * TODO: Logging and Progress Monitors
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.rse.core;
-
-import org.jboss.ide.eclipse.as.core.publishers.AbstractJSTPublisher;
-
-
-@Deprecated
-public class RSEJSTPublisher extends AbstractJSTPublisher {
-
- @Override
- protected String getTargetedPublishMethodId() {
- return RSEPublishMethod.RSE_ID;
- }
-}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSESingleFilePublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSESingleFilePublisher.java 2011-04-25 21:33:39 UTC (rev 30833)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSESingleFilePublisher.java 2011-04-25 21:41:55 UTC (rev 30834)
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.rse.core;
-
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
-import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher;
-
-@Deprecated
-public class RSESingleFilePublisher extends AbstractServerToolsPublisher {
-
- public boolean accepts(String method, IServer server, IModule[] module) {
-// if( RSEPublishMethod.RSE_ID.equals(method)
-// && module != null && module.length > 0
-// && module[module.length-1] != null
-// && module[module.length-1].getModuleType().getId().equals(SingleDeployableFactory.MODULE_TYPE))
-// return true;
- return false;
- }
-}
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r30833 - in trunk/as: plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-04-25 17:33:39 -0400 (Mon, 25 Apr 2011)
New Revision: 30833
Added:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedFolderPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeployableMockDeploymentTester.java
Removed:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockDeploymentBehaviour.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java
trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java
Log:
AS Publishing Unit Tests!
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2011-04-25 21:04:47 UTC (rev 30832)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2011-04-25 21:33:39 UTC (rev 30833)
@@ -100,6 +100,16 @@
priority="2"
zipDelegate="true">
</publisher>
+ <publisher
+ class="org.jboss.ide.eclipse.archives.webtools.modules.AltMethodZippedJSTPublisher"
+ priority="3"
+ zipDelegate="true">
+ </publisher>
+ <publisher
+ class="org.jboss.ide.eclipse.archives.webtools.modules.AltMethodZippedFolderPublisher"
+ priority="8"
+ zipDelegate="true">
+ </publisher>
</extension>
Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedFolderPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedFolderPublisher.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedFolderPublisher.java 2011-04-25 21:33:39 UTC (rev 30833)
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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
+ *
+ * TODO: Logging and Progress Monitors
+ ******************************************************************************/
+package org.jboss.ide.eclipse.archives.webtools.modules;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
+import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule;
+
+/**
+ * This class is in charge of RSE zipped publishing for deployable folders
+ */
+public class AltMethodZippedFolderPublisher extends AltMethodZippedJSTPublisher {
+ public boolean accepts(String method, IServer server, IModule[] module) {
+ if( LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(method))
+ return false;
+
+ IDeployableServer ds = ServerConverter.getDeployableServer(server);
+ if( module != null && module.length > 0
+ && module[module.length-1] != null
+ && module[module.length-1].getModuleType().getId().equals(SingleDeployableFactory.MODULE_TYPE)) {
+ IModule mod = module[module.length-1];
+ IJBTModule del = (IJBTModule)mod.loadAdapter(IJBTModule.class, new NullProgressMonitor());
+ if( del != null && !del.isBinary())
+ return ds != null && ds.zipsWTPDeployments();; // we have a folder
+ }
+ return false;
+ }
+}
Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2011-04-25 21:33:39 UTC (rev 30833)
@@ -0,0 +1,158 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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
+ *
+ * TODO: Logging and Progress Monitors
+ ******************************************************************************/
+package org.jboss.ide.eclipse.archives.webtools.modules;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.model.IModuleFile;
+import org.eclipse.wst.server.core.model.IModuleResourceDelta;
+import org.eclipse.wst.server.core.util.ModuleFile;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher;
+import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
+import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+
+/**
+ * This class is in charge of RSE zipped publishing for flexible projects.
+ * It extends the functionality of the local zipped publishing class
+ * by uploading the file after building it in a temporary directory
+ */
+public class AltMethodZippedJSTPublisher extends WTPZippedPublisher {
+ public boolean accepts(String method, IServer server, IModule[] module) {
+ if( !LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(method))
+ return super.accepts(method, server, module);
+ return false;
+ }
+
+ protected boolean publishMethodSpecific() {
+ return false; // can publish all method types
+ }
+
+ /**
+ * Here we put the deployment first in a temporary remote deploy folder
+ * Then during the publishModule call, we'll also upload it to remote machine
+ */
+ protected String getDeployRoot(IModule[] module, IDeployableServer ds) {
+ IPath deployRoot = JBossServerCorePlugin.getServerStateLocation(ds.getServer()).
+ append(IJBossServerConstants.TEMP_REMOTE_DEPLOY).makeAbsolute();
+ deployRoot.toFile().mkdirs();
+ return deployRoot.toString();
+ }
+
+ private IModule[] module;
+ private IServer server;
+ private IJBossServerPublishMethod method;
+
+ @Override
+ public IStatus publishModule(
+ IJBossServerPublishMethod method,
+ IServer server, IModule[] module,
+ int publishType, IModuleResourceDelta[] delta,
+ IProgressMonitor monitor) throws CoreException {
+ this.module = module;
+ this.server = server;
+ this.method = method;
+
+ String taskName = "Publishing " + module[0].getName(); //$NON-NLS-1$
+ monitor.beginTask(taskName, 200);
+ monitor.setTaskName(taskName);
+ if( module.length > 1 ) {
+ monitor.done();
+ return null;
+ }
+
+ monitor.setTaskName("Publishing to remote server " + server.getName()); //$NON-NLS-1$
+
+ // set up needed vars
+ IDeployableServer server2 = ServerConverter.getDeployableServer(server);
+ String remoteTempDeployRoot = getDeployRoot(module, ServerConverter.getDeployableServer(server));
+ IPath sourcePath = PublishUtil.getDeployPath(module, remoteTempDeployRoot, server2);
+ IPath destFolder = PublishUtil.getDeployPath(method, module, server2);
+ String name = sourcePath.lastSegment();
+ IStatus result = null;
+
+
+ // Am I a removal? If yes, remove me, and return
+ if( publishType == IJBossServerPublisher.REMOVE_PUBLISH) {
+ result = removeRemoteDeployment(sourcePath, destFolder, name, monitor);
+ } else if( publishType != IJBossServerPublisher.NO_PUBLISH ){
+ // Locally zip it up into the remote tmp folder
+ result = super.publishModule(method, server, module, publishType, delta,
+ AbstractServerToolsPublisher.getSubMon(monitor, 50));
+ if( !result.isOK() ) {
+ monitor.done();
+ } else {
+ result = remoteFullPublish(sourcePath, destFolder.removeLastSegments(1), name,
+ AbstractServerToolsPublisher.getSubMon(monitor, 150));
+ }
+ }
+
+ monitor.done();
+ if( result != null ) {
+ return result;
+ }
+
+ return Status.OK_STATUS;
+ }
+
+ private IStatus remoteFullPublish(IPath sourcePath,
+ IPath destFolder, String name, IProgressMonitor monitor) {
+ // Now transfer the file to RSE
+ try {
+ removeRemoteDeploymentFolder(sourcePath, destFolder, name, new NullProgressMonitor());
+ IModuleFile mf = new ModuleFile(sourcePath.toFile(), name, new Path("/")); //$NON-NLS-1$
+ method.getCallbackHandler(destFolder, server).copyFile(mf, new Path(name),
+ AbstractServerToolsPublisher.getSubMon(monitor, 150)
+ );
+ if( JBoss7Server.supportsJBoss7MarkerDeployment(server))
+ JBoss7JSTPublisher.addDoDeployMarkerFile(method, ServerConverter.getDeployableServer(server), module, monitor);
+ } catch(CoreException ce) {
+ return ce.getStatus();
+ }
+ return Status.OK_STATUS;
+ }
+
+ private IStatus removeRemoteDeployment( IPath sourcePath,
+ IPath destFolder, String name, IProgressMonitor monitor) throws CoreException {
+ IDeployableServer ds = ServerConverter.getDeployableServer(server);
+ try {
+ if( JBoss7Server.supportsJBoss7MarkerDeployment(server))
+ return JBoss7JSTPublisher.removeDeployedMarkerFile(method, ds, module, monitor);
+ return removeRemoteDeploymentFolder(sourcePath, destFolder, name, monitor);
+ } catch(CoreException ce) {
+ return ce.getStatus();
+ }
+ }
+
+ private IStatus removeRemoteDeploymentFolder(IPath sourcePath,
+ IPath destFolder, String name, IProgressMonitor monitor) throws CoreException {
+ // Now delete the file from RSE
+ // TODO *** FIX THIS IT IS NOT LOGGING ERRORS
+ IStatus[] tmp = method.getCallbackHandler(destFolder, server).deleteResource(new Path(name), monitor);
+ return Status.OK_STATUS;
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-04-25 21:04:47 UTC (rev 30832)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-04-25 21:33:39 UTC (rev 30833)
@@ -76,7 +76,7 @@
// When a call for [ear, childWar] comes in, ignore it.
if( module.length > 1 )
return null;
-
+
if( JBoss7Server.supportsJBoss7MarkerDeployment(server))
return handleJBoss7Deployment(method, server, module, publishType, delta, monitor);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2011-04-25 21:04:47 UTC (rev 30832)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2011-04-25 21:33:39 UTC (rev 30833)
@@ -151,9 +151,12 @@
loadPublishers();
Iterator<PublisherWrapper> i = publishers.iterator();
PublisherWrapper wrapper;
+ System.out.println("finding publisher: "); //$NON-NLS-1$
while(i.hasNext()) {
wrapper = i.next();
IJBossServerPublisher publisher = wrapper.publisher;
+ System.out.println(" publisher " + publisher.getClass() + " accepted? " + //$NON-NLS-1$ //$NON-NLS-2$
+ publisher.accepts(deployMethod, server, module));
if( publisher.accepts(deployMethod, server, module))
return wrapper.getNewInstance();
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml 2011-04-25 21:04:47 UTC (rev 30832)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml 2011-04-25 21:33:39 UTC (rev 30833)
@@ -22,7 +22,6 @@
class="org.jboss.ide.eclipse.as.rse.core.RSEJSTPublisher"
priority="5">
</publisher>
--->
<publisher
class="org.jboss.ide.eclipse.as.rse.core.archives.RSEZippedJSTPublisher"
priority="3"
@@ -33,6 +32,7 @@
priority="8"
zipDelegate="true">
</publisher>
+-->
</extension>
</plugin>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java 2011-04-25 21:04:47 UTC (rev 30832)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java 2011-04-25 21:33:39 UTC (rev 30833)
@@ -22,8 +22,8 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
+import org.eclipse.rse.services.clientserver.messages.SystemElementNotFoundException;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
-import org.eclipse.rse.services.files.IHostFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.wst.common.project.facet.core.util.internal.ProgressMonitorUtil;
import org.eclipse.wst.server.core.model.IModuleFile;
@@ -54,7 +54,7 @@
} catch( SystemMessageException sme ) {
IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID,
"failed to copy to " + remotePath.toString(), sme);
- return new IStatus[]{s};
+ throw new CoreException(s);
}
return new IStatus[]{};
}
@@ -64,10 +64,12 @@
IPath remotePath = root.append(path);
try {
method.getFileService().delete(remotePath.removeLastSegments(1).toString(), remotePath.lastSegment(), monitor);
+ } catch(SystemElementNotFoundException senfe ) {
+ // ignore, file already does not exist remotely
} catch( SystemMessageException sme ) {
IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID,
"failed to delete " + remotePath.toString(), sme);
- return new IStatus[]{s};
+ throw new CoreException(s);
}
return new IStatus[]{};
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java 2011-04-25 21:04:47 UTC (rev 30832)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java 2011-04-25 21:33:39 UTC (rev 30833)
@@ -2,6 +2,8 @@
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.runtime.CoreException;
@@ -15,13 +17,13 @@
import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
import org.jboss.ide.eclipse.as.test.ASTest;
-import org.jboss.ide.eclipse.as.test.publishing.v2.JSTDeploymentTester;
+import org.jboss.ide.eclipse.as.test.publishing.v2.AbstractJSTDeploymentTester;
import org.jboss.ide.eclipse.as.test.publishing.v2.MockPublishMethod;
import org.jboss.ide.eclipse.as.test.util.IOUtil;
import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
import org.jboss.tools.test.util.JobUtils;
-public class SingleFileZippedDeploymentIntegrationTest extends JSTDeploymentTester {
+public class SingleFileZippedDeploymentIntegrationTest extends AbstractJSTDeploymentTester {
public void testSingleFolderZipped() throws CoreException, IOException {
server = ServerRuntimeUtils.setZipped(server, true);
try {
@@ -35,7 +37,10 @@
server = ServerRuntimeUtils.createMockJBoss7Server();
server = ServerRuntimeUtils.useMockPublishMethod(server);
server = ServerRuntimeUtils.setZipped(server, true);
-
+ MockPublishMethod.reset();
+ ArrayList<IPath> o1 = MockPublishMethod.changed;
+ ArrayList<IPath> o2 = MockPublishMethod.removed;
+
final String folderName = "test";
IFolder folder = project.getFolder(folderName);
createFolder(folder);
@@ -45,6 +50,7 @@
assertEquals(mods.length, 1);
server = ServerRuntimeUtils.addModule(server, mods[0]);
ServerRuntimeUtils.publish(server);
+ dump(o1,o2);
int ch = MockPublishMethod.getChanged().length;
int rm = MockPublishMethod.getRemoved().length;
assertEquals(2,ch);
@@ -55,8 +61,6 @@
IOUtil.setContents(folder.getFile("3.txt"), "3a");
ServerRuntimeUtils.publish(server);
JobUtils.waitForIdle();
- Object o1 = MockPublishMethod.getChanged();
- Object o2 = MockPublishMethod.getRemoved();
ch = MockPublishMethod.getChanged().length;
rm = MockPublishMethod.getRemoved().length;
@@ -74,6 +78,17 @@
MockPublishMethod.reset();
}
+ private void dump(ArrayList<IPath> changed, ArrayList<IPath> removed) {
+ System.out.println("dump");
+ Iterator i = changed.iterator();
+ while(i.hasNext()) {
+ System.out.println(" - changed " + i.next());
+ }
+ i = removed.iterator();
+ while(i.hasNext()) {
+ System.out.println(" - removed " + i.next());
+ }
+ }
private void createFolder(IFolder folder) throws CoreException, IOException {
folder.create(true, true, new NullProgressMonitor());
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2011-04-25 21:04:47 UTC (rev 30832)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2011-04-25 21:33:39 UTC (rev 30833)
@@ -35,7 +35,7 @@
import org.jboss.ide.eclipse.as.test.publishing.v2.JSTDeployBinaryChildModuleTest;
import org.jboss.ide.eclipse.as.test.publishing.v2.JSTDeploymentTester;
import org.jboss.ide.eclipse.as.test.publishing.v2.JSTDeploymentWarUpdateXML;
-import org.jboss.ide.eclipse.as.test.publishing.v2.MockDeploymentBehaviour;
+import org.jboss.ide.eclipse.as.test.publishing.v2.SingleFileDeployableMockDeploymentTester;
import org.jboss.ide.eclipse.as.test.publishing.v2.MockJSTPublisherTest;
import org.jboss.ide.eclipse.as.test.publishing.v2.SingleFileDeploymentTester;
import org.jboss.ide.eclipse.as.test.server.JBossServerAPITest;
@@ -44,21 +44,21 @@
public static Test suite() {
TestSuite suite = new TestSuite("ASTools Test Suite");
suite.addTestSuite(PreReqTest.class);
- suite.addTestSuite(RuntimeServerModelTest.class);
- suite.addTestSuite(JEEClasspathContainerTest.class);
- suite.addTestSuite(ProjectRuntimeTest.class);
- suite.addTestSuite(JBIDE1657Test.class);
- suite.addTestSuite(JBIDE2512aTest.class);
- suite.addTestSuite(JBIDE2512bTest.class);
- suite.addTestSuite(JBIDE4184Test.class);
- suite.addTestSuite(TestEar5WithJBossRuntime.class);
- suite.addTestSuite(JSTDeploymentTester.class);
- suite.addTestSuite(JSTDeployBinaryChildModuleTest.class);
- suite.addTestSuite(SingleFileDeploymentTester.class);
- suite.addTestSuite(JBossServerAPITest.class);
- suite.addTestSuite(MockDeploymentBehaviour.class);
- suite.addTestSuite(JSTDeploymentWarUpdateXML.class);
- suite.addTestSuite(MockJSTPublisherTest.class);
+// suite.addTestSuite(RuntimeServerModelTest.class);
+// suite.addTestSuite(JEEClasspathContainerTest.class);
+// suite.addTestSuite(ProjectRuntimeTest.class);
+// suite.addTestSuite(JSTDeploymentWarUpdateXML.class);
+// suite.addTestSuite(SingleFileDeployableMockDeploymentTester.class);
+// suite.addTestSuite(MockJSTPublisherTest.class);
+// suite.addTestSuite(JBIDE1657Test.class);
+// suite.addTestSuite(JBIDE2512aTest.class);
+// suite.addTestSuite(JBIDE2512bTest.class);
+// suite.addTestSuite(JBIDE4184Test.class);
+// suite.addTestSuite(TestEar5WithJBossRuntime.class);
+// suite.addTestSuite(JSTDeploymentTester.class);
+// suite.addTestSuite(JSTDeployBinaryChildModuleTest.class);
+// suite.addTestSuite(SingleFileDeploymentTester.class);
+// suite.addTestSuite(JBossServerAPITest.class);
return suite;
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java 2011-04-25 21:04:47 UTC (rev 30832)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java 2011-04-25 21:33:39 UTC (rev 30833)
@@ -60,7 +60,7 @@
public void testWarUpdateMockPublishMethod() throws CoreException, IOException {
server = ServerRuntimeUtils.useMockPublishMethod(server);
- testMockPublishMethod(7,1,"");
+ testMockPublishMethod(7,1,"newModule.war");
}
public void testWarUpdateMockPublishMethodJBoss7() throws CoreException, IOException {
@@ -70,6 +70,7 @@
}
private void testMockPublishMethod(int initial, int remove, String removedFile) throws CoreException, IOException {
+ MockPublishMethod.reset();
IModule mod = ServerUtil.getModule(project);
server = ServerRuntimeUtils.addModule(server,mod);
ServerRuntimeUtils.publish(server);
Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockDeploymentBehaviour.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockDeploymentBehaviour.java 2011-04-25 21:04:47 UTC (rev 30832)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockDeploymentBehaviour.java 2011-04-25 21:33:39 UTC (rev 30833)
@@ -1,166 +0,0 @@
-package org.jboss.ide.eclipse.as.test.publishing.v2;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.server.core.IModule;
-import org.jboss.ide.eclipse.as.core.ExtensionManager;
-import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
-import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
-import org.jboss.ide.eclipse.as.core.publishers.SingleFilePublisher;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
-import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
-import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
-import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentModulePrefs;
-import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentPreferences;
-import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
-import org.jboss.ide.eclipse.as.test.ASTest;
-import org.jboss.ide.eclipse.as.test.util.IOUtil;
-import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
-
-public class MockDeploymentBehaviour extends JSTDeploymentTester {
- public void testSingleFile() throws CoreException, IOException {
- final String filename = "test.xml";
- IResource file = createFile(filename, "<test>done</test>");
- IModule[] mods = SingleDeployableFactory.getFactory().getModules();
- assertEquals(mods.length, 0);
- SingleDeployableFactory.makeDeployable(file);
- mods = SingleDeployableFactory.getFactory().getModules();
- assertEquals(mods.length, 1);
- verifyPublisher(mods[0], SingleFilePublisher.class);
- server = ServerRuntimeUtils.addModule(server, mods[0]);
- IPath deployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server));
- deployRoot.toFile().mkdirs();
- assertEquals(IOUtil.countFiles(deployRoot.toFile()), 0);
- assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 1);
- ServerRuntimeUtils.publish(server);
- assertEquals(IOUtil.countFiles(deployRoot.toFile()), 1);
- assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 2);
- assertContents(deployRoot.append("test.xml").toFile(),
- "<test>done</test>");
- IOUtil.setContents(project.getFile(filename), "<test>done2</test>");
- assertContents(deployRoot.append("test.xml").toFile(),
- "<test>done</test>");
- ServerRuntimeUtils.publish(server);
- assertContents(deployRoot.append("test.xml").toFile(),
- "<test>done2</test>");
- server = ServerRuntimeUtils.removeModule(server, mods[0]);
- assertContents(deployRoot.append("test.xml").toFile(),
- "<test>done2</test>");
- assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 2);
- ServerRuntimeUtils.publish(server);
- assertFalse(deployRoot.append("test.xml").toFile().exists());
- assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 1);
- }
-
- protected void verifyPublisher(IModule module, Class c) {
- IModule[] mod = new IModule[] { module };
- IJBossServerPublisher publisher = ExtensionManager
- .getDefault().getPublisher(server, mod, "local");
- assertTrue(publisher.getClass().equals(c));
- }
-
- protected IFile createFile(String filename, String contents) throws CoreException, IOException {
- IFile resource = project.getFile(filename);
- IOUtil.setContents(resource, contents);
- return resource;
- }
-
- public void testSingleFolder() throws CoreException, IOException {
- IPath moduleDeployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server));
- final String folderName = "test";
- moduleDeployRoot.toFile().mkdirs();
- IModule[] mods = singleFolderCreateModules(folderName);
- singleFolderPublishAndVerify(moduleDeployRoot, folderName, mods);
- }
-
- public void testSingleFolderCustomDeployFolderRelative() throws CoreException, IOException {
- IPath serverDeployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server));
- final String folderName = "test";
- String relativeFolder = "something.foo";
- IPath moduleDeployRoot = serverDeployRoot.append(relativeFolder);
- moduleDeployRoot.toFile().mkdirs();
- IModule[] mods = singleFolderCreateModules(folderName);
- DeploymentPreferences prefs = DeploymentPreferenceLoader.loadPreferencesFromServer(server);
- DeploymentModulePrefs p = prefs.getOrCreatePreferences().getOrCreateModulePrefs(mods[0]);
- p.setProperty(IJBossToolingConstants.LOCAL_DEPLOYMENT_LOC, relativeFolder);
- ServerAttributeHelper helper = new ServerAttributeHelper(server, server.createWorkingCopy());
- DeploymentPreferenceLoader.savePreferencesToServerWorkingCopy(helper, prefs);
- server = helper.save(true, new NullProgressMonitor());
- singleFolderPublishAndVerify(moduleDeployRoot, folderName, mods);
- }
-
- public void testSingleFolderCustomDeployFolderAbsolute() throws CoreException, IOException {
- IPath serverDeployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server));
- final String folderName = "test";
- IPath state = ASTest.getDefault().getStateLocation();
- IPath moduleDeployRoot = state.append("testDeployments").append("absoluteFolder.place");
- moduleDeployRoot.toFile().mkdirs();
- IModule[] mods = singleFolderCreateModules(folderName);
- DeploymentPreferences prefs = DeploymentPreferenceLoader.loadPreferencesFromServer(server);
- DeploymentModulePrefs p = prefs.getOrCreatePreferences().getOrCreateModulePrefs(mods[0]);
- p.setProperty(IJBossToolingConstants.LOCAL_DEPLOYMENT_LOC, moduleDeployRoot.toOSString());
- ServerAttributeHelper helper = new ServerAttributeHelper(server, server.createWorkingCopy());
- DeploymentPreferenceLoader.savePreferencesToServerWorkingCopy(helper, prefs);
- server = helper.save(true, new NullProgressMonitor());
- singleFolderPublishAndVerify(moduleDeployRoot, folderName, mods);
- }
-
-
- private IModule[] singleFolderCreateModules(String folderName) throws CoreException, IOException {
- IFolder folder = project.getFolder(folderName);
- folder.create(true, true, new NullProgressMonitor());
- IOUtil.setContents(folder.getFile("1.txt"), "1");
- IOUtil.setContents(folder.getFile("2.txt"), "2");
- IOUtil.setContents(folder.getFile("3.txt"), "3");
- IModule[] mods = SingleDeployableFactory.getFactory().getModules();
- assertEquals(mods.length, 0);
- SingleDeployableFactory.makeDeployable(folder);
- mods = SingleDeployableFactory.getFactory().getModules();
- assertEquals(mods.length, 1);
- verifyPublisher(mods[0], SingleFilePublisher.class);
- return mods;
- }
-
- private void singleFolderPublishAndVerify(IPath moduleDeployRoot, String folderName, IModule[] mods) throws CoreException, IOException {
- server = ServerRuntimeUtils.addModule(server, mods[0]);
- assertEquals(IOUtil.countFiles(moduleDeployRoot.toFile()), 0);
- assertEquals(IOUtil.countAllResources(moduleDeployRoot.toFile()), 1);
- ServerRuntimeUtils.publish(server);
- assertEquals(IOUtil.countFiles(moduleDeployRoot.toFile()), 3);
- assertEquals(IOUtil.countAllResources(moduleDeployRoot.toFile()), 4);
- File folder2 = moduleDeployRoot.toFile().listFiles()[0];
- assertTrue(folder2.getName().equals(folderName));
- File[] folderChildren = folder2.listFiles();
- assertTrue(folderChildren.length == 3);
- File three = new File(folder2, "3.txt");
- assertEquals(IOUtil.getContents(three), "3");
- IFolder folder = project.getFolder(folderName);
- IOUtil.setContents(folder.getFile("3.txt"), "3a");
- ServerRuntimeUtils.publish(server);
- assertEquals(IOUtil.countFiles(moduleDeployRoot.toFile()), 3);
- assertEquals(IOUtil.countAllResources(moduleDeployRoot.toFile()), 4);
- folder2 = moduleDeployRoot.toFile().listFiles()[0];
- assertTrue(folder2.getName().equals(folderName));
- folderChildren = folder2.listFiles();
- assertTrue(folderChildren.length == 3);
- three = new File(folder2, "3.txt");
- assertEquals(IOUtil.getContents(three), "3a");
- }
-
- public void testSingleFileZipped() throws CoreException, IOException {
- server = ServerRuntimeUtils.setZipped(server, true);
- try {
- testSingleFile();
- } finally {
- server = ServerRuntimeUtils.setZipped(server, false);
- }
- }
-}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2011-04-25 21:04:47 UTC (rev 30832)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2011-04-25 21:33:39 UTC (rev 30833)
@@ -15,35 +15,35 @@
public void testNormalLogic() throws CoreException, IOException {
server = ServerRuntimeUtils.useMockPublishMethod(server);
MockPublishMethod.reset();
- theTest(2,1, "");
+ theTest(false);
}
public void testForced7Logic() throws CoreException, IOException {
server = ServerRuntimeUtils.createMockJBoss7Server();
server = ServerRuntimeUtils.useMockPublishMethod(server);
MockPublishMethod.reset();
- theTest(3,1, "newModule.ear" + JBoss7JSTPublisher.DEPLOYED);
+ theTest(true);
}
- private void theTest(int initialPublish, int remove, String relativePath) throws CoreException, IOException {
+ private void theTest(boolean as7) throws CoreException, IOException {
IModule mod = ServerUtil.getModule(project);
IModule[] module = new IModule[] { mod };
server = ServerRuntimeUtils.addModule(server,mod);
ServerRuntimeUtils.publish(server);
// one additional for doDeploy
- assertEquals(initialPublish, MockPublishMethod.getChanged().length);
+ assertEquals(as7 ? 3 : 2, MockPublishMethod.getChanged().length);
MockPublishMethod.reset();
IFile textFile = project.getFile(CONTENT_TEXT_FILE);
IOUtil.setContents(textFile, 0);
assertEquals(0, MockPublishMethod.getChanged().length);
ServerRuntimeUtils.publish(server);
- assertEquals(2, MockPublishMethod.getChanged().length);
+ assertEquals(as7 ? 3 : 2, MockPublishMethod.getChanged().length);
MockPublishMethod.reset();
IOUtil.setContents(textFile, 1);
ServerRuntimeUtils.publish(server);
- assertEquals(2, MockPublishMethod.getChanged().length);
+ assertEquals(as7 ? 3 : 2, MockPublishMethod.getChanged().length);
MockPublishMethod.reset();
textFile.delete(true, null);
ServerRuntimeUtils.publish(server);
@@ -55,7 +55,7 @@
// Still just one delete, but should be the .deployed file
ServerRuntimeUtils.publish(server);
- assertEquals(remove, MockPublishMethod.getRemoved().length);
+ assertEquals(1, MockPublishMethod.getRemoved().length);
}
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2011-04-25 21:04:47 UTC (rev 30832)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2011-04-25 21:33:39 UTC (rev 30833)
@@ -41,6 +41,7 @@
}
public static IPath[] getChanged() {
+ ArrayList<IPath> tmp = changed;
return (IPath[]) changed.toArray(new IPath[changed.size()]);
}
@@ -53,6 +54,7 @@
public IStatus[] deleteResource(IPath path, IProgressMonitor monitor)
throws CoreException {
+ System.out.println("deleting " + root.append(path));
IPath path2 = root.append(path);
if( !removed.contains(path2.makeRelative()))
removed.add(path2.makeRelative());
@@ -61,6 +63,8 @@
public IStatus[] makeDirectoryIfRequired(IPath dir,
IProgressMonitor monitor) throws CoreException {
+ System.out.println("mkdir to " + root.append(dir));
+
IPath path2 = root.append(dir);
if( !changed.contains(path2.makeRelative()))
changed.add(path2.makeRelative());
@@ -73,6 +77,7 @@
}
public IStatus[] copyFile(IModuleFile mf, IPath path,
IProgressMonitor monitor) throws CoreException {
+ System.out.println("copying to " + root.append(path));
File file = PublishUtil.getFile(mf);
shouldRestartModule |= PublishCopyUtil.checkRestartModule(file);
IPath path2 = root.append(path);
@@ -82,6 +87,7 @@
}
public IStatus[] touchResource(IPath path) {
+ System.out.println("touching " + root.append(path));
IPath path2 = root.append(path);
if( !changed.contains(path2.makeRelative()))
changed.add(path2.makeRelative());
Copied: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeployableMockDeploymentTester.java (from rev 30813, trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockDeploymentBehaviour.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeployableMockDeploymentTester.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeployableMockDeploymentTester.java 2011-04-25 21:33:39 UTC (rev 30833)
@@ -0,0 +1,174 @@
+package org.jboss.ide.eclipse.as.test.publishing.v2;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.internal.ServerPreferences;
+import org.jboss.ide.eclipse.as.core.ExtensionManager;
+import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
+import org.jboss.ide.eclipse.as.core.publishers.SingleFilePublisher;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
+import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
+import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
+import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentModulePrefs;
+import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentPreferences;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.jboss.ide.eclipse.as.test.ASTest;
+import org.jboss.ide.eclipse.as.test.util.IOUtil;
+import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
+
+public class SingleFileDeployableMockDeploymentTester extends AbstractJSTDeploymentTester {
+ public void setUp() throws Exception {
+ super.setUp();
+ ServerPreferences.getInstance().setAutoPublishing(false);
+ }
+ public void tearDown() throws Exception {
+ ServerPreferences.getInstance().setAutoPublishing(true);
+ super.tearDown();
+ }
+
+ public void testSingleFile() throws CoreException, IOException {
+ final String filename = "test.xml";
+ IResource file = createFile(filename, "<test>done</test>");
+ IModule[] mods = SingleDeployableFactory.getFactory().getModules();
+ assertEquals(mods.length, 0);
+ SingleDeployableFactory.makeDeployable(file);
+ mods = SingleDeployableFactory.getFactory().getModules();
+ assertEquals(mods.length, 1);
+ verifyPublisher(mods[0], SingleFilePublisher.class);
+ server = ServerRuntimeUtils.addModule(server, mods[0]);
+ IPath deployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server));
+ deployRoot.toFile().mkdirs();
+ assertEquals(IOUtil.countFiles(deployRoot.toFile()), 0);
+ assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 1);
+ ServerRuntimeUtils.publish(server);
+ assertEquals(IOUtil.countFiles(deployRoot.toFile()), 1);
+ assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 2);
+ assertContents(deployRoot.append("test.xml").toFile(),
+ "<test>done</test>");
+ IOUtil.setContents(project.getFile(filename), "<test>done2</test>");
+ assertContents(deployRoot.append("test.xml").toFile(), "<test>done</test>");
+ ServerRuntimeUtils.publish(server);
+ assertContents(deployRoot.append("test.xml").toFile(),
+ "<test>done2</test>");
+ server = ServerRuntimeUtils.removeModule(server, mods[0]);
+ assertContents(deployRoot.append("test.xml").toFile(),
+ "<test>done2</test>");
+ assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 2);
+ ServerRuntimeUtils.publish(server);
+ assertFalse(deployRoot.append("test.xml").toFile().exists());
+ assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 1);
+ }
+
+ protected void verifyPublisher(IModule module, Class c) {
+ IModule[] mod = new IModule[] { module };
+ IJBossServerPublisher publisher = ExtensionManager
+ .getDefault().getPublisher(server, mod, "local");
+ assertTrue(publisher.getClass().equals(c));
+ }
+
+ protected IFile createFile(String filename, String contents) throws CoreException, IOException {
+ IFile resource = project.getFile(filename);
+ IOUtil.setContents(resource, contents);
+ return resource;
+ }
+
+ public void testSingleFolder() throws CoreException, IOException {
+ IPath moduleDeployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server));
+ final String folderName = "test";
+ moduleDeployRoot.toFile().mkdirs();
+ IModule[] mods = singleFolderCreateModules(folderName);
+ singleFolderPublishAndVerify(moduleDeployRoot, folderName, mods);
+ }
+
+ public void testSingleFolderCustomDeployFolderRelative() throws CoreException, IOException {
+ IPath serverDeployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server));
+ final String folderName = "test";
+ String relativeFolder = "something.foo";
+ IPath moduleDeployRoot = serverDeployRoot.append(relativeFolder);
+ moduleDeployRoot.toFile().mkdirs();
+ IModule[] mods = singleFolderCreateModules(folderName);
+ DeploymentPreferences prefs = DeploymentPreferenceLoader.loadPreferencesFromServer(server);
+ DeploymentModulePrefs p = prefs.getOrCreatePreferences().getOrCreateModulePrefs(mods[0]);
+ p.setProperty(IJBossToolingConstants.LOCAL_DEPLOYMENT_LOC, relativeFolder);
+ ServerAttributeHelper helper = new ServerAttributeHelper(server, server.createWorkingCopy());
+ DeploymentPreferenceLoader.savePreferencesToServerWorkingCopy(helper, prefs);
+ server = helper.save(true, new NullProgressMonitor());
+ singleFolderPublishAndVerify(moduleDeployRoot, folderName, mods);
+ }
+
+ public void testSingleFolderCustomDeployFolderAbsolute() throws CoreException, IOException {
+ IPath serverDeployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server));
+ final String folderName = "test";
+ IPath state = ASTest.getDefault().getStateLocation();
+ IPath moduleDeployRoot = state.append("testDeployments").append("absoluteFolder.place");
+ moduleDeployRoot.toFile().mkdirs();
+ IModule[] mods = singleFolderCreateModules(folderName);
+ DeploymentPreferences prefs = DeploymentPreferenceLoader.loadPreferencesFromServer(server);
+ DeploymentModulePrefs p = prefs.getOrCreatePreferences().getOrCreateModulePrefs(mods[0]);
+ p.setProperty(IJBossToolingConstants.LOCAL_DEPLOYMENT_LOC, moduleDeployRoot.toOSString());
+ ServerAttributeHelper helper = new ServerAttributeHelper(server, server.createWorkingCopy());
+ DeploymentPreferenceLoader.savePreferencesToServerWorkingCopy(helper, prefs);
+ server = helper.save(true, new NullProgressMonitor());
+ singleFolderPublishAndVerify(moduleDeployRoot, folderName, mods);
+ }
+
+
+ private IModule[] singleFolderCreateModules(String folderName) throws CoreException, IOException {
+ IFolder folder = project.getFolder(folderName);
+ folder.create(true, true, new NullProgressMonitor());
+ IOUtil.setContents(folder.getFile("1.txt"), "1");
+ IOUtil.setContents(folder.getFile("2.txt"), "2");
+ IOUtil.setContents(folder.getFile("3.txt"), "3");
+ IModule[] mods = SingleDeployableFactory.getFactory().getModules();
+ assertEquals(mods.length, 0);
+ SingleDeployableFactory.makeDeployable(folder);
+ mods = SingleDeployableFactory.getFactory().getModules();
+ assertEquals(mods.length, 1);
+ verifyPublisher(mods[0], SingleFilePublisher.class);
+ return mods;
+ }
+
+ private void singleFolderPublishAndVerify(IPath moduleDeployRoot, String folderName, IModule[] mods) throws CoreException, IOException {
+ server = ServerRuntimeUtils.addModule(server, mods[0]);
+ assertEquals(IOUtil.countFiles(moduleDeployRoot.toFile()), 0);
+ assertEquals(IOUtil.countAllResources(moduleDeployRoot.toFile()), 1);
+ ServerRuntimeUtils.publish(server);
+ assertEquals(IOUtil.countFiles(moduleDeployRoot.toFile()), 3);
+ assertEquals(IOUtil.countAllResources(moduleDeployRoot.toFile()), 4);
+ File folder2 = moduleDeployRoot.toFile().listFiles()[0];
+ assertTrue(folder2.getName().equals(folderName));
+ File[] folderChildren = folder2.listFiles();
+ assertTrue(folderChildren.length == 3);
+ File three = new File(folder2, "3.txt");
+ assertEquals(IOUtil.getContents(three), "3");
+ IFolder folder = project.getFolder(folderName);
+ IOUtil.setContents(folder.getFile("3.txt"), "3a");
+ ServerRuntimeUtils.publish(server);
+ assertEquals(IOUtil.countFiles(moduleDeployRoot.toFile()), 3);
+ assertEquals(IOUtil.countAllResources(moduleDeployRoot.toFile()), 4);
+ folder2 = moduleDeployRoot.toFile().listFiles()[0];
+ assertTrue(folder2.getName().equals(folderName));
+ folderChildren = folder2.listFiles();
+ assertTrue(folderChildren.length == 3);
+ three = new File(folder2, "3.txt");
+ assertEquals(IOUtil.getContents(three), "3a");
+ }
+
+ public void testSingleFileZipped() throws CoreException, IOException {
+ server = ServerRuntimeUtils.setZipped(server, true);
+ try {
+ testSingleFile();
+ } finally {
+ server = ServerRuntimeUtils.setZipped(server, false);
+ }
+ }
+}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-04-25 21:04:47 UTC (rev 30832)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-04-25 21:33:39 UTC (rev 30833)
@@ -26,7 +26,7 @@
import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
import org.jboss.tools.test.util.JobUtils;
-public class SingleFileDeploymentTester extends JSTDeploymentTester {
+public class SingleFileDeploymentTester extends AbstractJSTDeploymentTester {
public void testSingleFile() throws CoreException, IOException {
final String filename = "test.xml";
@@ -225,14 +225,14 @@
assertEquals(changed2.size(), 0);
assertEquals(removed2.size(), 0);
ServerRuntimeUtils.publish(server);
- assertEquals(changed2.size(), 4);
+ assertEquals(changed2.size(), 5);
assertEquals(removed2.size(), 1);
MockPublishMethod.reset();
IFolder folder = project.getFolder(folderName);
IOUtil.setContents(folder.getFile("3.txt"), "3a");
ServerRuntimeUtils.publish(server);
- assertEquals(changed2.size(), 2);
+ assertEquals(changed2.size(), 3);
assertEquals(removed2.size(), 0);
MockPublishMethod.reset();
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r30832 - in branches: dead and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-25 17:04:47 -0400 (Mon, 25 Apr 2011)
New Revision: 30832
Added:
branches/dead/xulrunner-1.9.2.16/
Removed:
branches/xulrunner-1.9.2.16/
Log:
move xulrunner branch, now merged into trunk and therefore obsolete, into dead/
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r30831 - trunk/maven/plugins/org.jboss.tools.maven.seam.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-04-25 16:40:18 -0400 (Mon, 25 Apr 2011)
New Revision: 30831
Modified:
trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml
Log:
JBIDE-8687 JSF tooling adds an Faces Servlet declaration with no servlet mappings on project import
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2011-04-25 20:15:08 UTC (rev 30830)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2011-04-25 20:40:18 UTC (rev 30831)
@@ -30,7 +30,7 @@
<extension point="org.eclipse.m2e.core.projectConfigurators">
<configurator
- id="org.jboss.tools.maven.seam.configuringator.fixClasspathConfigurator"
+ id="org.jboss.tools.maven.seam.configurator.fixClasspathConfigurator"
class="org.jboss.tools.maven.seam.configurators.FixClasspathConfigurator"
name="%Fix_classpath"
secondaryTo="org.eclipse.m2e.jdt.javaConfigurator"/>
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r30830 - trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-04-25 16:15:08 -0400 (Mon, 25 Apr 2011)
New Revision: 30830
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesTagLibTest.java
Log:
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesTagLibTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesTagLibTest.java 2011-04-25 20:14:05 UTC (rev 30829)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesTagLibTest.java 2011-04-25 20:15:08 UTC (rev 30830)
@@ -48,7 +48,7 @@
}
}
assertEquals(1, enums.size());
- assertEquals(4, enums.iterator().next().getParams());
+ assertEquals(4, enums.iterator().next().getParams().length);
break;
}
}
14 years, 11 months
- 1
- 0