JBoss Tools SVN: r8081 - trunk/jsf/docs/userguide.
by jbosstools-commits＠lists.jboss.org
Author: afedosik
Date: 2008-05-14 11:07:27 -0400 (Wed, 14 May 2008)
New Revision: 8081
Modified:
trunk/jsf/docs/userguide/pom.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-319 xslt versions (enterprise styles) corrected
Modified: trunk/jsf/docs/userguide/pom.xml
===================================================================
--- trunk/jsf/docs/userguide/pom.xml 2008-05-14 14:42:54 UTC (rev 8080)
+++ trunk/jsf/docs/userguide/pom.xml 2008-05-14 15:07:27 UTC (rev 8081)
@@ -21,18 +21,18 @@
<dependency>
<groupId>com.jboss</groupId>
<artifactId>jbossent-docbook-xslt</artifactId>
- <version>1.1.0.Beta1</version>
+ <version>1.0.0.Beta1</version>
</dependency>
<dependency>
<groupId>com.jboss</groupId>
<artifactId>jbossent-jdocbook-style</artifactId>
- <version>1.1.0.Beta1</version>
+ <version>1.0.0.Beta1</version>
<type>jdocbook-style</type>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0.Beta1</version>
<type>jdocbook-style</type>
</dependency>
</dependencies>
@@ -81,25 +81,8 @@
</plugin>
</plugins>
</build>
-
- <distributionManagement>
- <repository>
- <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
- <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
- <!-- todo : replace this with direct svn access once the svnkit providers are available -->
- <id>repository.jboss.org</id>
- <url>file://${maven.repository.root}</url>
- </repository>
- <snapshotRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
- </snapshotRepository>
- </distributionManagement>
-
+
<properties>
<translation>en-US</translation>
</properties>
-
-
</project>
17 years, 11 months
JBoss Tools SVN: r8080 - trunk/jsf/features/org.jboss.tools.richfaces.feature.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-05-14 10:42:54 -0400 (Wed, 14 May 2008)
New Revision: 8080
Modified:
trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
Log:
removed old server adapters
Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
===================================================================
--- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2008-05-14 13:36:37 UTC (rev 8079)
+++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2008-05-14 14:42:54 UTC (rev 8080)
@@ -217,12 +217,12 @@
Each party waives its rights to a jury trial in any resulting
litigation.
</license>
-
- <url>
- <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/>
- <discovery label="JBossTools Development Update Site" url="http://download.jboss.org/updates/development"/>
- </url>
-
+
+ <url>
+ <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ <discovery label="JBossTools Development Update Site" url="http://download.jboss.org/updates/development"/>
+ </url>
+
<requires>
<import feature="org.jboss.tools.xulrunner.feature" version="1.8.1.3-20070904"/>
</requires>
@@ -354,24 +354,6 @@
version="0.0.0"/>
<plugin
- id="org.jboss.tools.jst.server.jetty"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.server.jrun"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.server.resin"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
id="org.jboss.tools.jst.web"
download-size="0"
install-size="0"
17 years, 11 months
JBoss Tools SVN: r8079 - branches/jbosstools-2.1.x/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-05-14 09:36:37 -0400 (Wed, 14 May 2008)
New Revision: 8079
Modified:
branches/jbosstools-2.1.x/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XActionProvider.java
Log:
JBIDE-2189 Merge to 2.1.x
Modified: branches/jbosstools-2.1.x/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XActionProvider.java
===================================================================
--- branches/jbosstools-2.1.x/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XActionProvider.java 2008-05-14 13:33:47 UTC (rev 8078)
+++ branches/jbosstools-2.1.x/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XActionProvider.java 2008-05-14 13:36:37 UTC (rev 8079)
@@ -14,6 +14,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
+import org.eclipse.jdt.ui.actions.JdtActionConstants;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ContributionItem;
import org.eclipse.jface.action.IContributionItem;
@@ -54,7 +55,9 @@
registerAction(actionBars, o, "CopyActions.Paste", ActionFactory.PASTE.getId());
registerAction(actionBars, o, "CopyActions.Cut", ActionFactory.CUT.getId());
if(o.getFileType() <= XModelObject.FILE) {
- actionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, new XOpenAction(o));
+ XOpenAction x = new XOpenAction(o);
+ actionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, x);
+ actionBars.setGlobalActionHandler(JdtActionConstants.OPEN, x);
}
}
}
17 years, 11 months
JBoss Tools SVN: r8078 - branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-05-14 09:33:47 -0400 (Wed, 14 May 2008)
New Revision: 8078
Modified:
branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/SeamActionProvider.java
Log:
JBIDE-2189 Merge to 2.1.x
Modified: branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/SeamActionProvider.java
===================================================================
--- branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/SeamActionProvider.java 2008-05-14 13:09:56 UTC (rev 8077)
+++ branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/SeamActionProvider.java 2008-05-14 13:33:47 UTC (rev 8078)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.seam.ui.views.actions;
+import org.eclipse.jdt.ui.actions.JdtActionConstants;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -57,6 +58,7 @@
if(element instanceof IOpenableElement) {
SeamOpenAction action = new SeamOpenAction((IOpenableElement)element);
actionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, action);
+ actionBars.setGlobalActionHandler(JdtActionConstants.OPEN, action);
}
}
17 years, 11 months
JBoss Tools SVN: r8077 - in branches/jbosstools-2.1.x: jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-05-14 09:09:56 -0400 (Wed, 14 May 2008)
New Revision: 8077
Modified:
branches/jbosstools-2.1.x/
branches/jbosstools-2.1.x/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java
Log:
Merged revisions 8076 via svnmerge from
https://svn.jboss.org/repos/jbosstools/trunk
........
r8076 | max.andersen(a)jboss.com | 2008-05-14 15:06:28 +0200 (Wed, 14 May 2008) | 1 line
JBDS-329
........
Property changes on: branches/jbosstools-2.1.x
___________________________________________________________________
Name: svnmerge-integrated
- /trunk:1-7997
+ /trunk:1-7997,8076
Modified: branches/jbosstools-2.1.x/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java
===================================================================
--- branches/jbosstools-2.1.x/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java 2008-05-14 13:06:28 UTC (rev 8076)
+++ branches/jbosstools-2.1.x/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java 2008-05-14 13:09:56 UTC (rev 8077)
@@ -62,7 +62,7 @@
public static final String JBOSS_AS_TYPE_ID = "org.jboss.ide.eclipse.as.42";
- public static final String JBOSS_AS_NAME = "JBoss Application Server 4.3";
+ public static final String JBOSS_AS_NAME = "JBoss Application Server 4.2";
public static final String JBOSS_AS_HOST = "localhost";
17 years, 11 months
JBoss Tools SVN: r8076 - trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-05-14 09:06:28 -0400 (Wed, 14 May 2008)
New Revision: 8076
Modified:
trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java
Log:
JBDS-329
Modified: trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java 2008-05-14 12:51:38 UTC (rev 8075)
+++ trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java 2008-05-14 13:06:28 UTC (rev 8076)
@@ -62,7 +62,7 @@
public static final String JBOSS_AS_TYPE_ID = "org.jboss.ide.eclipse.as.42";
- public static final String JBOSS_AS_NAME = "JBoss Application Server 4.3";
+ public static final String JBOSS_AS_NAME = "JBoss Application Server 4.2";
public static final String JBOSS_AS_HOST = "localhost";
17 years, 11 months
JBoss Tools SVN: r8075 - branches/jbosstools-2.1.x/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-05-14 08:51:38 -0400 (Wed, 14 May 2008)
New Revision: 8075
Modified:
branches/jbosstools-2.1.x/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/FreeCaretStyledText.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2192 Unhandled event loop exception when try to make OpenOn on <ui:include src="#{}"/>
Issue is fixed
Modified: branches/jbosstools-2.1.x/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/FreeCaretStyledText.java
===================================================================
--- branches/jbosstools-2.1.x/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/FreeCaretStyledText.java 2008-05-14 12:49:36 UTC (rev 8074)
+++ branches/jbosstools-2.1.x/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/FreeCaretStyledText.java 2008-05-14 12:51:38 UTC (rev 8075)
@@ -76,7 +76,10 @@
start = getCharCount();
if (start + length > getCharCount())
length = getCharCount() - start;
- super.redrawRange(start, length, clearBackground);
+ //FIX for JBIDE-2192
+ if (length > 0) {
+ super.redrawRange(start, length, clearBackground);
+ }
}
}
17 years, 11 months
JBoss Tools SVN: r8074 - trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-05-14 08:49:36 -0400 (Wed, 14 May 2008)
New Revision: 8074
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/FreeCaretStyledText.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2192 Unhandled event loop exception when try to make OpenOn on <ui:include src="#{}"/>
Issue is fixed
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/FreeCaretStyledText.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/FreeCaretStyledText.java 2008-05-14 10:34:00 UTC (rev 8073)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/FreeCaretStyledText.java 2008-05-14 12:49:36 UTC (rev 8074)
@@ -76,7 +76,11 @@
start = getCharCount();
if (start + length > getCharCount())
length = getCharCount() - start;
- super.redrawRange(start, length, clearBackground);
+
+ //FIX for JBIDE-2192
+ if (length > 0) {
+ super.redrawRange(start, length, clearBackground);
+ }
}
}
17 years, 11 months
JBoss Tools SVN: r8073 - in trunk/ws/plugins: org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-05-14 06:34:00 -0400 (Wed, 14 May 2008)
New Revision: 8073
Added:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java
Log:
JBIDE-2047: modify for merging web.xml
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2008-05-14 02:47:59 UTC (rev 8072)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2008-05-14 10:34:00 UTC (rev 8073)
@@ -18,7 +18,11 @@
org.eclipse.wst.command.env,
org.eclipse.jst.ws.axis2.consumption.core,
org.apache.ant,
- org.apache.xerces
+ org.apache.xerces,
+ org.eclipse.jst.j2ee,
+ org.eclipse.jst.j2ee.core,
+ org.eclipse.emf.common,
+ org.eclipse.emf.ecore
Eclipse-LazyStart: true
Export-Package: org.jboss.tools.ws.creation.core,
org.jboss.tools.ws.creation.core.commands,
Added: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java 2008-05-14 10:34:00 UTC (rev 8073)
@@ -0,0 +1,116 @@
+package org.jboss.tools.ws.creation.core.commands;
+
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.j2ee.model.IModelProvider;
+import org.eclipse.jst.j2ee.model.ModelProviderManager;
+import org.eclipse.jst.javaee.core.DisplayName;
+import org.eclipse.jst.javaee.core.JavaeeFactory;
+import org.eclipse.jst.javaee.core.UrlPatternType;
+import org.eclipse.jst.javaee.web.Servlet;
+import org.eclipse.jst.javaee.web.ServletMapping;
+import org.eclipse.jst.javaee.web.WebApp;
+import org.eclipse.jst.javaee.web.WebFactory;
+import org.eclipse.wst.common.environment.IEnvironment;
+import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
+import org.jboss.tools.ws.creation.core.data.ServiceModel;
+import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
+import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils;
+
+public class MergeWebXMLCommand extends AbstractDataModelOperation {
+
+ private ServiceModel model;
+
+ public MergeWebXMLCommand(ServiceModel model) {
+ this.model = model;
+ }
+
+ @Override
+ public IStatus execute(IProgressMonitor monitor, IAdaptable info)
+ throws ExecutionException {
+ IEnvironment environment = getEnvironment();
+ IStatus status = null;
+ status = mergeWebXML(getAxisServletDescriptor());
+ if (status.getSeverity() == Status.ERROR) {
+ environment.getStatusHandler().reportError(status);
+ return status;
+ }
+ return Status.OK_STATUS;
+ }
+
+ private IStatus mergeWebXML(final ServletDescriptor servletDescriptor) {
+ IStatus status = Status.OK_STATUS;
+ final IModelProvider provider = ModelProviderManager
+ .getModelProvider(JBossWSCreationUtils.getProjectByName(model
+ .getWebProjectName()));
+ provider.modify(new Runnable() {
+ public void run() {
+ Object object = provider.getModelObject();
+ if (object instanceof org.eclipse.jst.javaee.web.WebApp) {
+ WebApp webApp = (WebApp) object;
+ addServlet(JBossWSCreationUtils.getProjectByName(model
+ .getWebProjectName()), servletDescriptor, webApp);
+ }
+ }
+
+ }, null);
+ return status;
+ }
+
+ private ServletDescriptor getAxisServletDescriptor() {
+
+ ServletDescriptor sd = new ServletDescriptor();
+ sd._name = JBossWSCreationUtils.classNameFromQualifiedName(model
+ .getServiceClass());
+ sd._displayName = sd._name;
+ sd._className = model.getServiceClass();
+ sd._mappings = JBossWSCreationCoreMessages.SEPARATOR_JAVA + sd._name;
+ return sd;
+ }
+
+ @SuppressWarnings("unchecked")
+ public void addServlet(IProject webProject,
+ ServletDescriptor servletDescriptor, WebApp webapp) {
+ List theServlets = webapp.getServlets();
+ for (int i = 0; i < theServlets.size(); i++) {
+ Servlet aServlet = (Servlet) theServlets.get(i);
+ if (aServlet.getServletName().equals(servletDescriptor._name)) {
+ return;
+ }
+ }
+ WebFactory factory = WebFactory.eINSTANCE;
+ Servlet servlet = factory.createServlet();
+ servlet.setServletName(servletDescriptor._name);
+ servlet.setServletClass(servletDescriptor._className);
+ if (servletDescriptor._displayName != null) {
+ DisplayName displayNameObj = JavaeeFactory.eINSTANCE
+ .createDisplayName();
+ displayNameObj.setValue(servletDescriptor._displayName);
+ servlet.getDisplayNames().add(displayNameObj);
+ }
+ webapp.getServlets().add(servlet);
+
+ if (servletDescriptor._mappings != null) {
+ ServletMapping servletMapping = factory.createServletMapping();
+ servletMapping.setServletName(servlet.getServletName());
+ UrlPatternType url = JavaeeFactory.eINSTANCE.createUrlPatternType();
+ url.setValue(servletDescriptor._mappings);
+ servletMapping.getUrlPatterns().add(url);
+ webapp.getServletMappings().add(servletMapping);
+ }
+ }
+
+ public class ServletDescriptor {
+ String _name;
+ String _className;
+ String _displayName;
+ String _mappings;
+ }
+
+}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2008-05-14 02:47:59 UTC (rev 8072)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2008-05-14 10:34:00 UTC (rev 8073)
@@ -9,3 +9,4 @@
ERROR_MESSAGE_INVALID_BINDING_FILE={0} is not a valid JAX-WS or JAXB binding file
ERROR_READ_BINDING_FILE=Exception occurred while reading binding file
+SEPARATOR_JAVA=/
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2008-05-14 02:47:59 UTC (rev 8072)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2008-05-14 10:34:00 UTC (rev 8073)
@@ -16,6 +16,7 @@
public static String ERROR_MESSAGE_INVALID_BINDING_FILE;
public static String ERROR_READ_BINDING_FILE;
+ public static String SEPARATOR_JAVA;
private JBossWSCreationCoreMessages() {
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2008-05-14 02:47:59 UTC (rev 8072)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2008-05-14 10:34:00 UTC (rev 8073)
@@ -152,9 +152,17 @@
}
}
+ public static String classNameFromQualifiedName(String qualifiedCalssName){
+ //This was done due to not splitting with . Strange
+ qualifiedCalssName = qualifiedCalssName.replace('.', ':');
+ String[] parts = qualifiedCalssName.split(":");
+ if (parts.length == 0){
+ return "";
+ }
+ return parts[parts.length-1];
+ }
-
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java 2008-05-14 02:47:59 UTC (rev 8072)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java 2008-05-14 10:34:00 UTC (rev 8073)
@@ -12,6 +12,7 @@
import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
import org.jboss.tools.ws.creation.core.commands.BindingFilesValidationCommand;
import org.jboss.tools.ws.creation.core.commands.InitialCommand;
+import org.jboss.tools.ws.creation.core.commands.MergeWebXMLCommand;
import org.jboss.tools.ws.creation.core.commands.WSDL2JavaCommand;
import org.jboss.tools.ws.creation.core.commands.WSProviderInvokeCommand;
import org.jboss.tools.ws.creation.core.data.ServiceModel;
@@ -53,6 +54,7 @@
else if (ctx.getScenario().getValue() == WebServiceScenario.BOTTOMUP){
commands.add(new InitialCommand(model, this, WebServiceScenario.BOTTOMUP));
commands.add(new WSProviderInvokeCommand(model));
+ commands.add(new MergeWebXMLCommand(model));
//commands.add(new JbossWSRuntimeCommand(ResourcesPlugin.getWorkspace().getRoot().getProject(project)));
}
17 years, 11 months