[200515] Moving constants out ot the Message file.
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientCodegenCommand.java b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientCodegenCommand.java
index c5540a0..b6138bc 100644
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientCodegenCommand.java
+++ b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientCodegenCommand.java
@@ -17,6 +17,7 @@
* 20070813 196173 sandakith@wso2.com - Lahiru Sandakith, Fix 196173, DWP custom location fix
* 20070814 187840 sandakith@wso2.com - Lahiru Sandakith, Fixing 187840 ITE message
* 20070814 193593 sandakith@wso2.com - Lahiru Sandakith, custom package name fix
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.consumption.core.command;
@@ -36,6 +37,7 @@
import org.eclipse.jst.ws.axis2.consumption.core.utils.ContentCopyUtils;
import org.eclipse.jst.ws.axis2.consumption.core.utils.WSDL2JavaGenerator;
import org.eclipse.jst.ws.axis2.consumption.core.utils.WSDLPropertyReader;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.core.utils.ClassLoadingUtil;
import org.eclipse.jst.ws.axis2.core.utils.FacetContainerUtils;
import org.eclipse.jst.ws.axis2.core.utils.FileUtils;
@@ -65,16 +67,16 @@
model.getWebProjectName()).toOSString();
String matadataDir = FileUtils.addAnotherNodeToPath(
workspaceDirectory,
- Axis2ConsumptionUIMessages.DIR_DOT_METADATA);
+ Axis2Constants.DIR_DOT_METADATA);
String matadataPluginsDir = FileUtils.addAnotherNodeToPath(
matadataDir,
- Axis2ConsumptionUIMessages.DIR_DOT_PLUGINS);
+ Axis2Constants.DIR_DOT_PLUGINS);
String matadataAxis2Dir = FileUtils.addAnotherNodeToPath(
matadataPluginsDir,
- Axis2ConsumptionUIMessages.AXIS2_PROJECT);
+ Axis2Constants.AXIS2_PROJECT);
String tempCodegenOutputLocation = FileUtils.addAnotherNodeToPath(
matadataAxis2Dir,
- Axis2ConsumptionUIMessages.CODEGEN_RESULTS);
+ Axis2Constants.CODEGEN_RESULTS);
File tempCodegenOutputLocationFile = new File(tempCodegenOutputLocation);
if (tempCodegenOutputLocationFile.exists()){
FileUtils.deleteDirectories(tempCodegenOutputLocation);
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientDefaultingCommand.java
index 69d913b..1a23ca5 100644
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientDefaultingCommand.java
+++ b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientDefaultingCommand.java
@@ -15,6 +15,7 @@
* 20070508 175030 sandakith@wso2.com - Lahiru Sandakith, WSDL not passed to Axis2 client fix
* 20070612 192047 sandakith@wso2.com - Lahiru Sandakith, 192047
* 20070612 192047 kathy@ca.ibm.com - Kathy Chan
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.consumption.core.command;
@@ -24,8 +25,8 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jst.ws.axis2.consumption.core.data.DataModel;
-import org.eclipse.jst.ws.axis2.consumption.core.messages.Axis2ConsumptionUIMessages;
import org.eclipse.jst.ws.axis2.consumption.core.utils.DefaultCodegenUtil;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
@@ -47,7 +48,7 @@
String wsdlURL = ws.getWebServiceClientInfo().getWsdlURL();
model.setWsdlURI(wsdlURL);
- model.setDatabindingType(Axis2ConsumptionUIMessages.DATA_BINDING_ADB);
+ model.setDatabindingType(Axis2Constants.DATA_BINDING_ADB);
model.setASync(false);
model.setSync(false);
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientTestCaseIntegrateCommand.java b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientTestCaseIntegrateCommand.java
index 5afc552..0076552 100644
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientTestCaseIntegrateCommand.java
+++ b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientTestCaseIntegrateCommand.java
@@ -11,6 +11,7 @@
* -------- -------- -----------------------------------------------------------
* 20070518 187311 sandakith@wso2.com - Lahiru Sandakith, Fixing test resource addition
* 20070608 191055 sandakith@wso2.com - Lahiru Sandakith, Duplicate classpath entry fix
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.consumption.core.command;
@@ -33,7 +34,7 @@
import org.eclipse.jdt.internal.core.JavaProject;
import org.eclipse.jst.ws.axis2.consumption.core.data.DataModel;
import org.eclipse.jst.ws.axis2.consumption.core.messages.Axis2ConsumptionUIMessages;
-import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.core.utils.FileUtils;
import org.eclipse.jst.ws.internal.common.J2EEUtils;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
@@ -134,8 +135,8 @@
private String CopyJUnitJarToProject(String workspace) throws ExecutionException, IOException {
File relativeWebInfJunitFile = new File(FileUtils.addAnotherNodeToPath(
J2EEUtils.getWebInfPath(project).toOSString(),
- Axis2CoreUIMessages.DIR_LIB+File.separator+
- Axis2ConsumptionUIMessages.JUNIT_JAR));
+ Axis2Constants.DIR_LIB+File.separator+
+ Axis2Constants.JUNIT_JAR));
File obsaluteWebInfJunitFile = new File(FileUtils.addAnotherNodeToPath(
workspace,
@@ -150,10 +151,10 @@
* @throws ExecutionException
*/
private File getFrameworkJunitFile() throws ExecutionException {
- IPath junitJarPath=BundleUtils.getJarredPluginPath(Axis2ConsumptionUIMessages.JUNIT_BUNDLE);
+ IPath junitJarPath=BundleUtils.getJarredPluginPath(Axis2Constants.JUNIT_BUNDLE);
if (junitJarPath != null){
return new File(FileUtils.addAnotherNodeToPath(junitJarPath.toOSString(),
- Axis2ConsumptionUIMessages.JUNIT_JAR));
+ Axis2Constants.JUNIT_JAR));
}else{
throw new ExecutionException(Axis2ConsumptionUIMessages.ERROR_JUNIT_JAR_NOT_FOUND);
}
@@ -167,7 +168,7 @@
*/
private IPath getPathToTestFolder(IProject project, String workspace) {
String pathToTest = project.getFullPath().toOSString() + File.separator
- + Axis2CoreUIMessages.DIR_TEST;
+ + Axis2Constants.DIR_TEST;
IPath pathToTestFolder = new Path(pathToTest);
return pathToTestFolder;
}
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/messages/Axis2ConsumptionUIMessages.java b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/messages/Axis2ConsumptionUIMessages.java
index aafaa8d..0610327 100644
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/messages/Axis2ConsumptionUIMessages.java
+++ b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/messages/Axis2ConsumptionUIMessages.java
@@ -15,6 +15,7 @@
* 20070517 187307 sandakith@wso2.com - Lahiru Sandakith
* 20070518 187311 sandakith@wso2.com - Lahiru Sandakith, Fixing test resource addition
* 20070601 190505 pmoogk@ca.ibm.com - Peter Moogk
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.consumption.core.messages;
@@ -24,14 +25,6 @@
private static final String BUNDLE_NAME =
"org.eclipse.jst.ws.axis2.consumption.core.messages.Axis2ConsumptionUI";//$NON-NLS-1$
- public static final String DATA_BINDING_ADB="ADB"; //$NON-NLS-1$
- public static final String DATA_BINDING_NONE="NONE"; //$NON-NLS-1$
- public static final String DIR_DOT_METADATA=".metadata"; //$NON-NLS-1$
- public static final String DIR_DOT_PLUGINS=".plugins"; //$NON-NLS-1$
- public static final String AXIS2_PROJECT="org.eclipse.jst.ws.axis2"; //$NON-NLS-1$
- public static final String CODEGEN_RESULTS="codegen"; //$NON-NLS-1$
- public static final String JUNIT_JAR="junit.jar"; //$NON-NLS-1$
- public static final String JUNIT_BUNDLE="org.junit"; //$NON-NLS-1$
private Axis2ConsumptionUIMessages() {
// Do not instantiate
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/widgets/Axis2ProxyWidget.java b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/widgets/Axis2ProxyWidget.java
index fa4023f..ec9a381 100644
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/widgets/Axis2ProxyWidget.java
+++ b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/widgets/Axis2ProxyWidget.java
@@ -16,6 +16,7 @@
* Text not accessible on AXIS2 wizard pages.
* 20070523 174876 sandakith@wso2.com - Lahiru Sandakith, Persist Preferences inside Framework
* 20070823 200413 sandakith@wso2.com - Lahiru Sandakith, Namespace to Package table fix
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.internal.axis2.consumption.ui.widgets;
@@ -27,6 +28,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.core.context.Axis2EmitterContext;
import org.eclipse.jst.ws.axis2.core.plugin.WebServiceAxis2CorePlugin;
import org.eclipse.jst.ws.axis2.consumption.core.data.DataModel;
@@ -432,8 +434,8 @@
* Fill the combo with proper databinding names
*/
private void fillDatabinderCombo() {
- databindingTypeCombo.add(Axis2ConsumptionUIMessages.DATA_BINDING_ADB);
- databindingTypeCombo.add(Axis2ConsumptionUIMessages.DATA_BINDING_NONE);
+ databindingTypeCombo.add(Axis2Constants.DATA_BINDING_ADB);
+ databindingTypeCombo.add(Axis2Constants.DATA_BINDING_NONE);
databindingTypeCombo.select(0);
}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis2.core/META-INF/MANIFEST.MF
index 15f44d6..aa4cfb8 100644
--- a/bundles/org.eclipse.jst.ws.axis2.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.axis2.core/META-INF/MANIFEST.MF
@@ -28,7 +28,8 @@
org.eclipse.wst.command.env.ui,
org.eclipse.wst.server.core
Eclipse-LazyStart: true
-Export-Package: org.eclipse.jst.ws.axis2.core.context,
+Export-Package: org.eclipse.jst.ws.axis2.core.constant,
+ org.eclipse.jst.ws.axis2.core.context,
org.eclipse.jst.ws.axis2.core.plugin,
org.eclipse.jst.ws.axis2.core.plugin.messages,
org.eclipse.jst.ws.axis2.core.utils
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/constant/Axis2Constants.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/constant/Axis2Constants.java
new file mode 100644
index 0000000..abe8e2a
--- /dev/null
+++ b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/constant/Axis2Constants.java
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright (c) 2007 WSO2 Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * WSO2 Inc. - initial API and implementation
+ * yyyymmdd bug Email and other contact information
+ * -------- -------- -----------------------------------------------------------
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
+ *******************************************************************************/
+package org.eclipse.jst.ws.axis2.core.constant;
+
+public class Axis2Constants {
+
+ //Axis2 Core Plugin Constants
+ public static final String DIR_TEMPWAR="tempwar"; //$NON-NLS-1$
+ public static final String DIR_EXPLOADED_TEMPWAR="exploadedwar"; //$NON-NLS-1$
+ public static final String DIR_LIB="lib"; //$NON-NLS-1$
+ public static final String DIR_TEST="test"; //$NON-NLS-1$
+ public static final String FILE_AXIS2_WAR="axis2.war"; //$NON-NLS-1$
+ public static final String NULL=""; //$NON-NLS-1$
+ public static final String ADB="adb"; //$NON-NLS-1$
+ public static final String AAR="aar"; //$NON-NLS-1$
+ public static final String JAR="jar"; //$NON-NLS-1$
+ public static final String TEMP_AXIS2_FACET_DIR="org.apache.axis2.facet"; //$NON-NLS-1$
+ public static final String DIR_DOT_METADATA=".metadata"; //$NON-NLS-1$
+ public static final String DIR_DOT_PLUGINS=".plugins"; //$NON-NLS-1$
+ public static final String DIR_UNZIP="nzip"; //$NON-NLS-1$
+ public static final String LOCAL_SERVER_PORT="http://localhost:8080"; //$NON-NLS-1$
+ public static final String SERVICES="services"; //$NON-NLS-1$
+ public static final String WEBAPP_EXPLODED_SERVER_LOCATION_FILE=
+ "server.properties"; //$NON-NLS-1$
+ public static final String SERVER_STATUS_LOCATION_FILE="status.properties"; //$NON-NLS-1$
+ public static final String WAR_STATUS_LOCATION_FILE="war.properties"; //$NON-NLS-1$
+ public static final String PROPERTY_KEY_PATH="path"; //$NON-NLS-1$
+ public static final String PROPERTY_KEY_STATUS="status"; //$NON-NLS-1$
+ public static final String SERVER_STATUS_PASS="pass"; //$NON-NLS-1$
+ public static final String SERVER_STATUS_FAIL="fail"; //$NON-NLS-1$
+
+ //Axis2 Creation Plugin Constants
+ public static final String FILE_SERVICES_XML="services.xml"; //$NON-NLS-1$
+ public static final String FILE_XML="*.xml"; //$NON-NLS-1$
+ public static final String DIR_META_INF="META-INF"; //$NON-NLS-1$
+ public static final String DIR_BUILD="build"; //$NON-NLS-1$
+ public static final String DIR_SRC="src"; //$NON-NLS-1$
+ public static final String DIR_CLASSES="classes"; //$NON-NLS-1$
+ public static final String DIR_RESOURCES="resources"; //$NON-NLS-1$
+ public static final String DIR_WEB_INF="WEB-INF"; //$NON-NLS-1$
+ public static final String DIR_SERVICES="services"; //$NON-NLS-1$
+ public static final String DIR_WEBSERVICES="webservices"; //$NON-NLS-1$
+ public static final String DIR_WEBCONTENT="WebContent"; //$NON-NLS-1$
+ public static final String JAR_TASK="jar"; //$NON-NLS-1$
+ public static final String AXIS2_PROJECT="org.eclipse.jst.ws.axis2"; //$NON-NLS-1$
+ public static final String CODEGEN_RESULTS="codegen"; //$NON-NLS-1$
+ public static final String DATA_BINDING_ADB="ADB"; //$NON-NLS-1$
+ public static final String DATA_BINDING_NONE="NONE"; //$NON-NLS-1$
+ public static final String SKELETON_SUFFIX="Skeleton.java"; //$NON-NLS-1$
+
+
+ //Axis2 Consumption Plugin Constants
+ public static final String JUNIT_JAR="junit.jar"; //$NON-NLS-1$
+ public static final String JUNIT_BUNDLE="org.junit"; //$NON-NLS-1$
+ public static final String DIR_AXIS2_WEB="axis2-web"; //$NON-NLS-1$
+ public static final String FILE_WEB_XML="web.xml"; //$NON-NLS-1$
+ public static final String FILE_SERVLET_API="servletapi"; //$NON-NLS-1$
+ public static final String[] AXIS2_LIB_PREFIXES = { //$NON-NLS-1$
+ "ant",
+ "axiom",
+ "axis2",
+ "commons",
+ "log4j",
+ "neethi",
+ "stax",
+ "wsdl4j",
+ "wstx",
+ "xbean",
+ "XmlSchema",
+ "woden",
+ "activation",
+ "annogen",
+ "backport-util"
+ };
+}
+
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/context/Axis2EmitterDefaults.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/context/Axis2EmitterDefaults.java
index 421c868..6fac9c8 100644
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/context/Axis2EmitterDefaults.java
+++ b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/context/Axis2EmitterDefaults.java
@@ -11,10 +11,11 @@
* -------- -------- -----------------------------------------------------------
* 20070516 183147 sandakith@wso2.com - Lahiru Sandakith Fix for the persisting DBCS paths
* 20070523 174876 sandakith@wso2.com - Lahiru Sandakith, Persist Preferences inside Framework
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.core.context;
-import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
public class Axis2EmitterDefaults {
@@ -23,19 +24,19 @@
//Axis2 Preferences
//Service Code generation Options
- public static final String PREFERENCE_SERVICE_DATABINDING_DEFAULT = Axis2CoreUIMessages.ADB;
+ public static final String PREFERENCE_SERVICE_DATABINDING_DEFAULT = Axis2Constants.ADB;
public static final boolean PREFERENCE_SERVICE_INTERFACE_SKELETON_DEFAULT = false;
public static final boolean PREFERENCE_SERVICE_GENERATE_ALL_DEFAULT = false;
//Client Code generation Options
public static final boolean PREFERENCE_CLIENT_SYNC_DEFAULT = false;
public static final boolean PREFERENCE_CLIENT_ASYNC_DEFAULT = false;
- public static final String PREFERENCE_CLIENT_DATABINDING_DEFAULT = Axis2CoreUIMessages.ADB;
+ public static final String PREFERENCE_CLIENT_DATABINDING_DEFAULT = Axis2Constants.ADB;
public static final boolean PREFERENCE_CLIENT_TESTCASE_DEFAULT = false;
public static final boolean PREFERENCE_CLIENT_GENERATE_ALL_DEFAULT = false;
//Service Archive Options
- private static String PREFERENCE_AAR_EXTENTION_DEFAULT = Axis2CoreUIMessages.AAR; //aarExtention
+ private static String PREFERENCE_AAR_EXTENTION_DEFAULT = Axis2Constants.AAR; //aarExtention
/**
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/plugin/messages/Axis2CoreUIMessages.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/plugin/messages/Axis2CoreUIMessages.java
index d79b135..741c5e4 100644
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/plugin/messages/Axis2CoreUIMessages.java
+++ b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/plugin/messages/Axis2CoreUIMessages.java
@@ -18,6 +18,7 @@
* 20070517 187307 sandakith@wso2.com - Lahiru Sandakith, Fix 187307 Property File Fix
* 20070518 187311 sandakith@wso2.com - Lahiru Sandakith, Fixing test resource addition
* 20070808 194906 sandakith@wso2.com - Lahiru Sandakith, Fixing 194906 Runtime lib issue
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.core.plugin.messages;
@@ -27,29 +28,6 @@
private static final String BUNDLE_NAME =
"org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUI"; //$NON-NLS-1$
- public static final String DIR_TEMPWAR="tempwar"; //$NON-NLS-1$
- public static final String DIR_EXPLOADED_TEMPWAR="exploadedwar"; //$NON-NLS-1$
- public static final String DIR_LIB="lib"; //$NON-NLS-1$
- public static final String DIR_TEST="test"; //$NON-NLS-1$
- public static final String FILE_AXIS2_WAR="axis2.war"; //$NON-NLS-1$
- public static final String NULL=""; //$NON-NLS-1$
- public static final String ADB="adb"; //$NON-NLS-1$
- public static final String AAR="aar"; //$NON-NLS-1$
- public static final String JAR="jar"; //$NON-NLS-1$
- public static final String TEMP_AXIS2_FACET_DIR="org.apache.axis2.facet"; //$NON-NLS-1$
- public static final String DIR_DOT_METADATA=".metadata"; //$NON-NLS-1$
- public static final String DIR_DOT_PLUGINS=".plugins"; //$NON-NLS-1$
- public static final String DIR_UNZIP="nzip"; //$NON-NLS-1$
- public static final String LOCAL_SERVER_PORT="http://localhost:8080"; //$NON-NLS-1$
- public static final String SERVICES="services"; //$NON-NLS-1$
- public static final String WEBAPP_EXPLODED_SERVER_LOCATION_FILE=
- "server.properties"; //$NON-NLS-1$
- public static final String SERVER_STATUS_LOCATION_FILE="status.properties"; //$NON-NLS-1$
- public static final String WAR_STATUS_LOCATION_FILE="war.properties"; //$NON-NLS-1$
- public static final String PROPERTY_KEY_PATH="path"; //$NON-NLS-1$
- public static final String PROPERTY_KEY_STATUS="status"; //$NON-NLS-1$
- public static final String SERVER_STATUS_PASS="pass"; //$NON-NLS-1$
- public static final String SERVER_STATUS_FAIL="fail"; //$NON-NLS-1$
private Axis2CoreUIMessages() {
// Do not instantiate
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/Axis2CoreUtils.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/Axis2CoreUtils.java
index 06a749a..3f43432 100644
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/Axis2CoreUtils.java
+++ b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/Axis2CoreUtils.java
@@ -13,6 +13,7 @@
* runtime to the framework for 168762
* 20070426 183046 sandakith@wso2.com - Lahiru Sandakith
* 20070501 180284 sandakith@wso2.com - Lahiru Sandakith
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.core.utils;
@@ -24,7 +25,7 @@
import java.io.Writer;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
public class Axis2CoreUtils {
@@ -33,9 +34,9 @@
public static String tempAxis2Directory() {
if (!alreadyComputedTempAxis2Directory){
- String[] nodes = {Axis2CoreUIMessages.DIR_DOT_METADATA,
- Axis2CoreUIMessages.DIR_DOT_PLUGINS,
- Axis2CoreUIMessages.TEMP_AXIS2_FACET_DIR};
+ String[] nodes = {Axis2Constants.DIR_DOT_METADATA,
+ Axis2Constants.DIR_DOT_PLUGINS,
+ Axis2Constants.TEMP_AXIS2_FACET_DIR};
tempAxis2Dir =FileUtils.addNodesToPath(
ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString(), nodes);
alreadyComputedTempAxis2Directory= true;
@@ -46,20 +47,20 @@
public static String tempAxis2WebappFileLocation() {
return
addAnotherNodeToPath(tempAxis2Directory(),
- Axis2CoreUIMessages.WEBAPP_EXPLODED_SERVER_LOCATION_FILE);
+ Axis2Constants.WEBAPP_EXPLODED_SERVER_LOCATION_FILE);
}
public static String tempRuntimeStatusFileLocation() {
return
addAnotherNodeToPath(tempAxis2Directory(),
- Axis2CoreUIMessages.SERVER_STATUS_LOCATION_FILE);
+ Axis2Constants.SERVER_STATUS_LOCATION_FILE);
}
public static String tempWarStatusFileLocation() {
return
addAnotherNodeToPath(tempAxis2Directory(),
- Axis2CoreUIMessages.WAR_STATUS_LOCATION_FILE);
+ Axis2Constants.WAR_STATUS_LOCATION_FILE);
}
public static String addAnotherNodeToPath(String currentPath, String newNode) {
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/FacetContainerUtils.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/FacetContainerUtils.java
index efe9b8d..9333b7c 100644
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/FacetContainerUtils.java
+++ b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/FacetContainerUtils.java
@@ -17,6 +17,7 @@
* 20070612 192047 sandakith@wso2.com - Lahiru Sandakith, 192047
* 20070612 192047 kathy@ca.ibm.com - Kathy Chan
* 20070813 196173 sandakith@wso2.com - Lahiru Sandakith, Fix 196173, DWP custom location fix
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.core.utils;
@@ -25,9 +26,8 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.core.plugin.WebServiceAxis2CorePlugin;
-import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
-import org.eclipse.jst.ws.axis2.facet.messages.Axis2FacetUIMessages;
import org.eclipse.jst.ws.internal.common.J2EEUtils;
import org.eclipse.jst.ws.internal.common.ServerUtils;
import org.eclipse.wst.server.core.IServer;
@@ -84,7 +84,7 @@
public static String pathToWebProjectContainerMETAINF(String project) {
String containerDirectory = pathToWebProjectContainer(project);
- String webContainerMETAINF = Axis2FacetUIMessages.DIR_META_INF;
+ String webContainerMETAINF = Axis2Constants.DIR_META_INF;
String webContainerMETAINFString = Axis2CoreUtils.addAnotherNodeToPath(
containerDirectory,
webContainerMETAINF);
@@ -93,7 +93,7 @@
public static String pathToWebProjectContainerAxis2Web(String project) {
String containerDirectory = pathToWebProjectContainer(project);
- String webContainerAxis2Web = Axis2FacetUIMessages.DIR_AXIS2_WEB;
+ String webContainerAxis2Web = Axis2Constants.DIR_AXIS2_WEB;
String webContainerAxis2WebString = Axis2CoreUtils.addAnotherNodeToPath(
containerDirectory,
webContainerAxis2Web);
@@ -104,7 +104,7 @@
String webContainerWEBINFString = pathToWebProjectContainerWEBINF(project);
return Axis2CoreUtils.addAnotherNodeToPath(
webContainerWEBINFString,
- Axis2CoreUIMessages.DIR_LIB);
+ Axis2Constants.DIR_LIB);
}
@@ -176,9 +176,9 @@
deployedWSDLURLpath = ServerUtils.getEncodedWebComponentURL(serverProject,
ServerFactoryId, server);
if (deployedWSDLURLpath == null) {
- deployedWSDLURLpath = Axis2CoreUIMessages.LOCAL_SERVER_PORT;
+ deployedWSDLURLpath = Axis2Constants.LOCAL_SERVER_PORT;
}
- String[] deployedWSDLURLParts = {Axis2CoreUIMessages.SERVICES,serviceName};
+ String[] deployedWSDLURLParts = {Axis2Constants.SERVICES,serviceName};
return FileUtils.addNodesToURL(deployedWSDLURLpath, deployedWSDLURLParts)+"?wsdl";
}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/RuntimePropertyUtils.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/RuntimePropertyUtils.java
index e965ae4..cd3a291 100644
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/RuntimePropertyUtils.java
+++ b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/RuntimePropertyUtils.java
@@ -13,6 +13,7 @@
* runtime to the framework for 168762
* 20070426 183046 sandakith@wso2.com - Lahiru Sandakith
* 20070501 180284 sandakith@wso2.com - Lahiru Sandakith
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.core.utils;
@@ -24,6 +25,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
public class RuntimePropertyUtils {
@@ -78,12 +80,12 @@
init();
serverPropertiesFileInit();
if(! (properties.size()== 0)){
- if(properties.containsKey(Axis2CoreUIMessages.PROPERTY_KEY_PATH)){
- properties.remove(Axis2CoreUIMessages.PROPERTY_KEY_PATH);
+ if(properties.containsKey(Axis2Constants.PROPERTY_KEY_PATH)){
+ properties.remove(Axis2Constants.PROPERTY_KEY_PATH);
}
}
Axis2CoreUtils.writePropertyToFile(serverPropertiesFile,
- Axis2CoreUIMessages.PROPERTY_KEY_PATH,
+ Axis2Constants.PROPERTY_KEY_PATH,
axis2PathNew);
} catch (FileNotFoundException e) {
updateStatusError();
@@ -103,8 +105,8 @@
}
try {
properties.load(new FileInputStream(serverPropertiesFile));
- if(properties.containsKey(Axis2CoreUIMessages.PROPERTY_KEY_PATH)){
- serverPath = properties.getProperty(Axis2CoreUIMessages.PROPERTY_KEY_PATH);
+ if(properties.containsKey(Axis2Constants.PROPERTY_KEY_PATH)){
+ serverPath = properties.getProperty(Axis2Constants.PROPERTY_KEY_PATH);
}
} catch (FileNotFoundException e) {
updateStatusError();
@@ -120,13 +122,13 @@
init();
statusPropertiesFileInit();
if(! (properties.size()== 0)){
- if(properties.containsKey(Axis2CoreUIMessages.PROPERTY_KEY_STATUS)){
- properties.remove(Axis2CoreUIMessages.PROPERTY_KEY_STATUS);
+ if(properties.containsKey(Axis2Constants.PROPERTY_KEY_STATUS)){
+ properties.remove(Axis2Constants.PROPERTY_KEY_STATUS);
}
}
Axis2CoreUtils.writePropertyToFile(statusPropertyFile,
- Axis2CoreUIMessages.PROPERTY_KEY_STATUS,
- runtimeStatus);
+ Axis2Constants.PROPERTY_KEY_STATUS,
+ runtimeStatus);
} catch (FileNotFoundException e) {
updateStatusError();
} catch (IOException e) {
@@ -141,13 +143,13 @@
init();
warPropertiesFileInit();
if(! (properties.size()== 0)){
- if(properties.containsKey(Axis2CoreUIMessages.PROPERTY_KEY_STATUS)){
- properties.remove(Axis2CoreUIMessages.PROPERTY_KEY_STATUS);
+ if(properties.containsKey(Axis2Constants.PROPERTY_KEY_STATUS)){
+ properties.remove(Axis2Constants.PROPERTY_KEY_STATUS);
}
}
Axis2CoreUtils.writePropertyToFile(warPropertyFile,
- Axis2CoreUIMessages.PROPERTY_KEY_STATUS,
- String.valueOf(warStatus));
+ Axis2Constants.PROPERTY_KEY_STATUS,
+ String.valueOf(warStatus));
} catch (FileNotFoundException e) {
updateStatusError();
} catch (IOException e) {
@@ -166,9 +168,9 @@
}
try {
properties.load(new FileInputStream(warPropertyFile));
- if(properties.containsKey(Axis2CoreUIMessages.PROPERTY_KEY_STATUS)){
+ if(properties.containsKey(Axis2Constants.PROPERTY_KEY_STATUS)){
warStatus = Boolean.parseBoolean(
- properties.getProperty(Axis2CoreUIMessages.PROPERTY_KEY_STATUS));
+ properties.getProperty(Axis2Constants.PROPERTY_KEY_STATUS));
}
} catch (FileNotFoundException e) {
updateStatusError();
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/commands/Axis2WebservicesServerCommand.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/commands/Axis2WebservicesServerCommand.java
index cac90af..92a5739 100644
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/commands/Axis2WebservicesServerCommand.java
+++ b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/commands/Axis2WebservicesServerCommand.java
@@ -16,6 +16,7 @@
* 20070523 174876 sandakith@wso2.com - Lahiru Sandakith, Persist Preferences inside Framework
* 20070606 177421 sandakith@wso2.com - fix web.xml wiped out when Axis2 facet
* 20070808 194906 sandakith@wso2.com - Lahiru Sandakith, Fixing 194906 Runtime lib issue
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.facet.commands;
@@ -33,6 +34,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.core.context.Axis2EmitterContext;
import org.eclipse.jst.ws.axis2.core.plugin.WebServiceAxis2CorePlugin;
import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
@@ -40,7 +42,6 @@
import org.eclipse.jst.ws.axis2.core.utils.FacetContainerUtils;
import org.eclipse.jst.ws.axis2.core.utils.FileUtils;
import org.eclipse.jst.ws.axis2.core.utils.RuntimePropertyUtils;
-import org.eclipse.jst.ws.axis2.facet.messages.Axis2FacetUIMessages;
import org.eclipse.jst.ws.axis2.facet.utils.Axis2RuntimeUtils;
import org.eclipse.jst.ws.axis2.facet.utils.Axis2WebappUtils;
import org.eclipse.jst.ws.axis2.facet.utils.ContentCopyUtils;
@@ -72,12 +73,12 @@
|| RuntimePropertyUtils.getWarStatusFromPropertiesFile()){
runtimeLocation = Axis2RuntimeUtils.copyAxis2War(
monitor,
- Axis2CoreUIMessages.PROPERTY_KEY_PATH);
+ Axis2Constants.PROPERTY_KEY_PATH);
}else{
runtimeLocation = Axis2WebappUtils.copyAxis2War(
monitor,
- Axis2CoreUIMessages.PROPERTY_KEY_PATH);
+ Axis2Constants.PROPERTY_KEY_PATH);
}
} catch (FileNotFoundException e) {
return handleExceptionStatus(e);
@@ -89,8 +90,8 @@
//First Setting the libs folder as ignored and then copy the content of the runtime
IPath libPath = new Path(runtimeLocation);
- libPath = libPath.append(Axis2FacetUIMessages.DIR_WEB_INF);
- libPath = libPath.append(Axis2CoreUIMessages.DIR_LIB);
+ libPath = libPath.append(Axis2Constants.DIR_WEB_INF);
+ libPath = libPath.append(Axis2Constants.DIR_LIB);
List<String> ignoreList = new ArrayList<String>();
ignoreList.add(libPath.toOSString());
contentCopyUtils.updateCheckList(ignoreList);
@@ -106,7 +107,7 @@
List<String> includeList = new ArrayList<String>();
contentCopyUtils.updateCheckList(loadIncludeListWithAxis2Libs(libPath.toOSString(),
includeList));
- String[] nodes = {Axis2FacetUIMessages.DIR_WEB_INF,Axis2CoreUIMessages.DIR_LIB};
+ String[] nodes = {Axis2Constants.DIR_WEB_INF,Axis2Constants.DIR_LIB};
status = contentCopyUtils.copyDirectoryRecursivelyIntoWorkspace(
libPath.toOSString(),
FileUtils.addNodesToPath(
@@ -153,10 +154,10 @@
* @return loaded list
*/
private List loadIncludeListWithAxis2Libs(String path, List includeList){
- for (int i = 0; i < Axis2FacetUIMessages.AXIS2_LIB_PREFIXES.length; i++) {
+ for (int i = 0; i < Axis2Constants.AXIS2_LIB_PREFIXES.length; i++) {
File[] fileList = FileUtils.getMatchingFiles(path,
- Axis2FacetUIMessages.AXIS2_LIB_PREFIXES[i],
- Axis2CoreUIMessages.JAR);
+ Axis2Constants.AXIS2_LIB_PREFIXES[i],
+ Axis2Constants.JAR);
for (int j = 0; j < fileList.length; j++) {
includeList.add(fileList[j].getAbsolutePath());
}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/deligate/Axis2CoreFacetInstallDelegate.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/deligate/Axis2CoreFacetInstallDelegate.java
index ab12201..fc3a21c 100644
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/deligate/Axis2CoreFacetInstallDelegate.java
+++ b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/deligate/Axis2CoreFacetInstallDelegate.java
@@ -13,6 +13,7 @@
* facet to the framework for 168766
* 20070501 180284 sandakith@wso2.com - Lahiru Sandakith
* 20070606 177421 sandakith@wso2.com - fix web.xml wiped out when Axis2 facet
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.facet.deligate;
@@ -21,6 +22,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
import org.eclipse.jst.ws.axis2.core.utils.RuntimePropertyUtils;
import org.eclipse.jst.ws.axis2.facet.commands.Axis2WebservicesServerCommand;
@@ -39,10 +41,10 @@
status = command.executeOverride(monitor);
if (status.getCode() == Status.OK_STATUS.getCode() ){
RuntimePropertyUtils.writeServerStausToPropertiesFile(
- Axis2CoreUIMessages.SERVER_STATUS_PASS);
+ Axis2Constants.SERVER_STATUS_PASS);
}else{
RuntimePropertyUtils.writeServerStausToPropertiesFile(
- Axis2CoreUIMessages.SERVER_STATUS_FAIL);
+ Axis2Constants.SERVER_STATUS_FAIL);
throw new CoreException(status);
}
monitor.worked( 1 );
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/messages/Axis2FacetUIMessages.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/messages/Axis2FacetUIMessages.java
index 6843d30..41e0a26 100644
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/messages/Axis2FacetUIMessages.java
+++ b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/messages/Axis2FacetUIMessages.java
@@ -16,6 +16,7 @@
* 20070606 177421 sandakith@wso2.com - fix web.xml wiped out when Axis2 facet
* 20070730 194786 sandakith@wso2.com - Lahiru Sandakith, adding servletapi jar filter
* 20070808 194906 sandakith@wso2.com - Lahiru Sandakith, Fixing 194906 Runtime lib issue
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.facet.messages;
@@ -25,29 +26,6 @@
private static final String BUNDLE_NAME =
"org.eclipse.jst.ws.axis2.facet.messages.Axis2FacetUI";//$NON-NLS-1$
- public static final String DIR_WEB_INF ="WEB-INF";//$NON-NLS-1$
- public static final String DIR_META_INF ="META-INF";//$NON-NLS-1$
- public static final String DIR_AXIS2_WEB="axis2-web";//$NON-NLS-1$
- public static final String FILE_WEB_XML="web.xml";//$NON-NLS-1$
- public static final String FILE_SERVLET_API="servletapi";//$NON-NLS-1$
-
- public static final String[] AXIS2_LIB_PREFIXES = { //$NON-NLS-1$
- "ant",
- "axiom",
- "axis2",
- "commons",
- "log4j",
- "neethi",
- "stax",
- "wsdl4j",
- "wstx",
- "xbean",
- "XmlSchema",
- "woden",
- "activation",
- "annogen",
- "backport-util"
- };
private Axis2FacetUIMessages() {
// Do not instantiate
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/utils/Axis2RuntimeUtils.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/utils/Axis2RuntimeUtils.java
index f66f9bb..c6ebdb9 100644
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/utils/Axis2RuntimeUtils.java
+++ b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/utils/Axis2RuntimeUtils.java
@@ -15,6 +15,7 @@
* 20070501 180284 sandakith@wso2.com - Lahiru Sandakith
* 20070516 183147 sandakith@wso2.com - Lahiru Sandakith Fix for the persisting DBCS paths
* 20070523 174876 sandakith@wso2.com - Lahiru Sandakith, Persist Preferences inside Framework
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.facet.utils;
@@ -34,12 +35,11 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.core.context.Axis2EmitterContext;
import org.eclipse.jst.ws.axis2.core.plugin.WebServiceAxis2CorePlugin;
-import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
import org.eclipse.jst.ws.axis2.core.utils.Axis2CoreUtils;
import org.eclipse.jst.ws.axis2.core.utils.FileUtils;
-import org.eclipse.jst.ws.axis2.facet.messages.Axis2FacetUIMessages;
public class Axis2RuntimeUtils {
@@ -61,7 +61,7 @@
if (new File (Axis2CoreUtils.tempAxis2Directory()).isDirectory()) {
tempWarLocation = Axis2CoreUtils.addAnotherNodeToPath(
Axis2CoreUtils.tempAxis2Directory(),
- Axis2CoreUIMessages.DIR_TEMPWAR);
+ Axis2Constants.DIR_TEMPWAR);
File tempWarLocationFile= new File(tempWarLocation);
if (tempWarLocationFile.exists()) {
FileUtils.deleteDirectories(tempWarLocationFile);
@@ -69,7 +69,7 @@
tempWarLocationFile.mkdirs();
tempWarFile = Axis2CoreUtils.addAnotherNodeToPath(
tempWarLocation,
- Axis2CoreUIMessages.FILE_AXIS2_WAR);
+ Axis2Constants.FILE_AXIS2_WAR);
new File(tempWarFile).createNewFile();
String axis2RuntimrLocation = null;
if(context.getAxis2RuntimeLocation()!=null){
@@ -82,7 +82,7 @@
}
String axis2WarFile = Axis2CoreUtils.addAnotherNodeToPath(
axis2RuntimrLocation,
- Axis2CoreUIMessages.FILE_AXIS2_WAR);
+ Axis2Constants.FILE_AXIS2_WAR);
FileChannel srcChannel = new FileInputStream(axis2WarFile).getChannel();
FileChannel dstChannel = new FileOutputStream(tempWarFile).getChannel();
// Copy file contents from source to destination
@@ -93,7 +93,7 @@
//unzip this into another foulder
tempUnzipLocation = FileUtils.addAnotherNodeToPath(tempWarLocation,
- Axis2CoreUIMessages.DIR_UNZIP);
+ Axis2Constants.DIR_UNZIP);
File tempUnzipLocationFile= new File(tempUnzipLocation);
if (!tempUnzipLocationFile.exists()) {
tempUnzipLocationFile.mkdirs();
@@ -103,8 +103,8 @@
}
IPath tempWebXMLLocationPath = new Path(tempUnzipLocation)
- .append(Axis2FacetUIMessages.DIR_WEB_INF)
- .append(Axis2FacetUIMessages.FILE_WEB_XML);
+ .append(Axis2Constants.DIR_WEB_INF)
+ .append(Axis2Constants.FILE_WEB_XML);
//delete the axis2 web.xml File(DWP already have)
new File(tempWebXMLLocationPath.toOSString()).delete();
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/utils/Axis2WebappUtils.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/utils/Axis2WebappUtils.java
index a2694a7..2a47366 100644
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/utils/Axis2WebappUtils.java
+++ b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/utils/Axis2WebappUtils.java
@@ -17,6 +17,7 @@
* 20070516 183147 sandakith@wso2.com - Lahiru Sandakith Fix for the persisting DBCS paths
* 20070523 174876 sandakith@wso2.com - Lahiru Sandakith, Persist Preferences inside Framework
* 20070730 194786 sandakith@wso2.com - Lahiru Sandakith, adding servletapi jar filter
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.facet.utils;
@@ -25,12 +26,11 @@
import java.io.IOException;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.core.context.Axis2EmitterContext;
import org.eclipse.jst.ws.axis2.core.plugin.WebServiceAxis2CorePlugin;
-import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
import org.eclipse.jst.ws.axis2.core.utils.Axis2CoreUtils;
import org.eclipse.jst.ws.axis2.core.utils.FileUtils;
-import org.eclipse.jst.ws.axis2.facet.messages.Axis2FacetUIMessages;
public class Axis2WebappUtils {
@@ -49,7 +49,7 @@
if (tempAxis2Directory.isDirectory()) {
tempWarLocation = Axis2CoreUtils.addAnotherNodeToPath(
Axis2CoreUtils.tempAxis2Directory(),
- Axis2CoreUIMessages.DIR_EXPLOADED_TEMPWAR);
+ Axis2Constants.DIR_EXPLOADED_TEMPWAR);
File tempWarLocationFile= new File(tempWarLocation);
if (tempWarLocationFile.exists()) {
FileUtils.deleteDirectories(tempWarLocationFile);
@@ -92,7 +92,7 @@
"build.xml");
String axis2TempWebXMLFile = Axis2CoreUtils.addAnotherNodeToPath(
axis2TempWebInfFile,
- Axis2FacetUIMessages.FILE_WEB_XML);
+ Axis2Constants.FILE_WEB_XML);
//Copy the webapp content
FileUtils.copyDirectory(new File(axis2WebappLocation), tempWarLocationFile);
@@ -111,7 +111,7 @@
new File(axis2TempWebInfFile));
//Filter out the servletapi jars
FileUtils.filterOutRestrictedFiles(axis2TempWebInfLibFile,
- Axis2FacetUIMessages.FILE_SERVLET_API,"jar");
+ Axis2Constants.FILE_SERVLET_API,"jar");
alreadyWarExist= true;
}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2BUServiceCreationCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2BUServiceCreationCommand.java
index efd483c..33ee397 100644
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2BUServiceCreationCommand.java
+++ b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2BUServiceCreationCommand.java
@@ -13,6 +13,7 @@
* 20070426 183046 sandakith@wso2.com - Lahiru Sandakith
* 20070625 192522 sandakith@wso2.com - Lahiru Sandakith, fix the build path problem
* 20070813 196173 sandakith@wso2.com - Lahiru Sandakith, Fix 196173, DWP custom location fix
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.creation.core.command;
@@ -28,6 +29,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.core.utils.FacetContainerUtils;
import org.eclipse.jst.ws.axis2.core.utils.FileUtils;
import org.eclipse.jst.ws.axis2.creation.core.data.DataModel;
@@ -66,13 +68,13 @@
String workspaceDirectory = ResourcesPlugin.getWorkspace()
.getRoot().getLocation().toOSString();
String matadataDir = FileUtils.addAnotherNodeToPath(workspaceDirectory,
- Axis2CreationUIMessages.DIR_DOT_METADATA);
+ Axis2Constants.DIR_DOT_METADATA);
String matadataPluginsDir = FileUtils.addAnotherNodeToPath(matadataDir,
- Axis2CreationUIMessages.DIR_DOT_PLUGINS);
+ Axis2Constants.DIR_DOT_PLUGINS);
String matadataAxis2Dir = FileUtils.addAnotherNodeToPath(matadataPluginsDir,
- Axis2CreationUIMessages.AXIS2_PROJECT);
+ Axis2Constants.AXIS2_PROJECT);
String webservicesDir = FileUtils.addAnotherNodeToPath(matadataAxis2Dir,
- Axis2CreationUIMessages.DIR_WEBSERVICES);
+ Axis2Constants.DIR_WEBSERVICES);
model.setPathToWebServicesTempDir(webservicesDir);
//Get the Service name from the class name
@@ -81,7 +83,7 @@
String servicesDirectory = FileUtils.addAnotherNodeToPath(webservicesDir, serviceName);
String serviceXMLDirectory = FileUtils.addAnotherNodeToPath(servicesDirectory,
- Axis2CreationUIMessages.DIR_META_INF);
+ Axis2Constants.DIR_META_INF);
//Create the directories
//Create the Webservices stuff on the workspace .matadata directory
@@ -95,7 +97,7 @@
serviceClass,
null);
serviceXMLFile = new File(serviceXMLDirectory + File.separator +
- Axis2CreationUIMessages.FILE_SERVICES_XML);
+ Axis2Constants.FILE_SERVICES_XML);
FileWriter serviceXMLFileWriter;
serviceXMLFileWriter = new FileWriter(serviceXMLFile, false);
@@ -111,7 +113,7 @@
}else{
serviceXMLFile = new File(pathToServicesXML);
File targetServicesXMLFile = new File(serviceXMLDirectory + File.separator +
- Axis2CreationUIMessages.FILE_SERVICES_XML);
+ Axis2Constants.FILE_SERVICES_XML);
FileUtils.copy(serviceXMLFile, targetServicesXMLFile);
}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2DefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2DefaultingCommand.java
index 1c03043..ffd5b23 100644
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2DefaultingCommand.java
+++ b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2DefaultingCommand.java
@@ -13,6 +13,7 @@
* runtime to the framework for 168762
* 20070508 175030 sandakith@wso2.com - Lahiru Sandakith, WSDL not passed to Axis2 client fix
* 20070612 192047 sandakith@wso2.com - Lahiru Sandakith, 192047
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.creation.core.command;
@@ -27,12 +28,12 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jst.ws.axis2.consumption.core.utils.DefaultCodegenUtil;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.core.context.ServiceContext;
import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
import org.eclipse.jst.ws.axis2.core.utils.Axis2CoreUtils;
import org.eclipse.jst.ws.axis2.core.utils.FacetContainerUtils;
import org.eclipse.jst.ws.axis2.creation.core.data.DataModel;
-import org.eclipse.jst.ws.axis2.creation.core.messages.Axis2CreationUIMessages;
import org.eclipse.jst.ws.axis2.creation.core.utils.CommonUtils;
import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
@@ -58,7 +59,7 @@
Properties properties = new Properties();
try {
properties.load(new FileInputStream(Axis2CoreUtils.tempRuntimeStatusFileLocation()));
- if (properties.containsKey(Axis2CoreUIMessages.PROPERTY_KEY_STATUS)){
+ if (properties.containsKey(Axis2Constants.PROPERTY_KEY_STATUS)){
status = Status.OK_STATUS;
model.setServerStatus(true);
}else{
@@ -74,7 +75,7 @@
if (scenario == WebServiceScenario.TOPDOWN) {
model.setWsdlURI(ws.getWebServiceInfo().getWsdlURL());
- model.setDatabindingType(Axis2CreationUIMessages.DATA_BINDING_ADB);
+ model.setDatabindingType(Axis2Constants.DATA_BINDING_ADB);
DefaultCodegenUtil defaultCodegenUtil = new DefaultCodegenUtil(model);
defaultCodegenUtil.populateModelParamsFromWSDL();
model.setServicesXML(true);
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2SkelImplCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2SkelImplCommand.java
index 6d1b04d..27b2243 100644
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2SkelImplCommand.java
+++ b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2SkelImplCommand.java
@@ -12,6 +12,7 @@
* 20070123 168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2
* runtime to the framework for 168762
* 20070426 183046 sandakith@wso2.com - Lahiru Sandakith
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.creation.core.command;
@@ -25,6 +26,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.core.utils.FileUtils;
import org.eclipse.jst.ws.axis2.creation.core.data.DataModel;
import org.eclipse.jst.ws.axis2.creation.core.messages.Axis2CreationUIMessages;
@@ -57,15 +59,14 @@
model.getWebProjectName());
String projectSrcDir = FileUtils.addAnotherNodeToPath(
currentDynamicWebProjectDir,
- Axis2CreationUIMessages.DIR_SRC);
+ Axis2Constants.DIR_SRC);
String packagePath = CommonUtils.packgeName2PathName(model.getPackageText());
String packageDir = FileUtils.addAnotherNodeToPath(projectSrcDir, packagePath);
String serviceSkeletonImpl = FileUtils.addAnotherNodeToPath(packageDir, model.
getServiceName());
- String serviceSkeletonImplURL = serviceSkeletonImpl +
- Axis2CreationUIMessages.SKELETON_SUFFIX;
+ String serviceSkeletonImplURL = serviceSkeletonImpl + Axis2Constants.SKELETON_SUFFIX;
IPath serviceSkeletonImplURLPath = new Path(serviceSkeletonImplURL);
try {
//webServiceInfo.setImplURL(serviceSkeletonImplURLPath.toFile().toURL().toString());
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2TDServiceCreationCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2TDServiceCreationCommand.java
index 5be2471..dc4e477 100644
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2TDServiceCreationCommand.java
+++ b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2TDServiceCreationCommand.java
@@ -13,6 +13,7 @@
* 20070507 184740 sandakith@wso2.com - Lahiru Sandakith
* 20070625 192522 sandakith@wso2.com - Lahiru Sandakith, fix the build path problem
* 20070813 196173 sandakith@wso2.com - Lahiru Sandakith, Fix 196173, DWP custom location fix
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.creation.core.command;
@@ -26,6 +27,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.core.utils.FacetContainerUtils;
import org.eclipse.jst.ws.axis2.core.utils.FileUtils;
import org.eclipse.jst.ws.axis2.creation.core.data.DataModel;
@@ -60,13 +62,13 @@
String currentDynamicWebProjectDir = FacetContainerUtils.getProjectRoot(
model.getWebProjectName()).toOSString();
String matadataDir = FileUtils.addAnotherNodeToPath(workspaceDirectory,
- Axis2CreationUIMessages.DIR_DOT_METADATA);
+ Axis2Constants.DIR_DOT_METADATA);
String matadataPluginsDir = FileUtils.addAnotherNodeToPath(matadataDir,
- Axis2CreationUIMessages.DIR_DOT_PLUGINS);
+ Axis2Constants.DIR_DOT_PLUGINS);
String matadataAxis2Dir = FileUtils.addAnotherNodeToPath(matadataPluginsDir,
- Axis2CreationUIMessages.AXIS2_PROJECT);
+ Axis2Constants.AXIS2_PROJECT);
String tempServicesDir = FileUtils.addAnotherNodeToPath(matadataAxis2Dir,
- Axis2CreationUIMessages.DIR_SERVICES);
+ Axis2Constants.DIR_SERVICES);
model.setPathToWebServicesTempDir(tempServicesDir);
@@ -74,7 +76,7 @@
String currentservicesDirectory = FileUtils.addAnotherNodeToPath(tempServicesDir,
model.getServiceName());
String metaInfDirectory = FileUtils.addAnotherNodeToPath(currentservicesDirectory,
- Axis2CreationUIMessages.DIR_META_INF);
+ Axis2Constants.DIR_META_INF);
//Create the directories
//Create the Webservices stuff on the workspace .matadata directory
@@ -86,7 +88,7 @@
//at resources/service.xml
String currentProjectResourcesDirString = FileUtils
.addAnotherNodeToPath(currentDynamicWebProjectDir,
- Axis2CreationUIMessages.DIR_RESOURCES);
+ Axis2Constants.DIR_RESOURCES);
File currentProjectResourcesDir = new File(currentProjectResourcesDirString);
if(!currentProjectResourcesDir.exists()){
currentProjectResourcesDir.mkdir();
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2WebservicesServerCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2WebservicesServerCommand.java
index 9fdb64c..9d7e3c9 100644
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2WebservicesServerCommand.java
+++ b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2WebservicesServerCommand.java
@@ -13,6 +13,7 @@
* runtime to the framework for 168762
* 20070510 172926 sandakith@wso2.com - Lahiru Sandakith, Fix 172926 Use Util Classes
* 20070813 196173 sandakith@wso2.com - Lahiru Sandakith, Fix 196173, DWP custom location fix
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.creation.core.command;
@@ -24,10 +25,10 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jst.ws.axis2.consumption.core.utils.ContentCopyUtils;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.core.utils.FacetContainerUtils;
import org.eclipse.jst.ws.axis2.core.utils.FileUtils;
import org.eclipse.jst.ws.axis2.creation.core.data.DataModel;
-import org.eclipse.jst.ws.axis2.creation.core.messages.Axis2CreationUIMessages;
import org.eclipse.wst.common.environment.IEnvironment;
import org.eclipse.wst.common.environment.IStatusHandler;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
@@ -61,8 +62,8 @@
//Import the tempory webservices directory according to the Resources API of eclipse
String webserviceTempDirString = model.getPathToWebServicesTempDir();
String repositoryString = webContainerDirString
- + File.separator + Axis2CreationUIMessages.DIR_WEB_INF
- + File.separator + Axis2CreationUIMessages.DIR_SERVICES;
+ + File.separator + Axis2Constants.DIR_WEB_INF
+ + File.separator + Axis2Constants.DIR_SERVICES;
//Copy the existing services to the repository
status = contentCopyUtils.copyDirectoryRecursivelyIntoWorkspace(
webserviceTempDirString,
@@ -76,8 +77,8 @@
//Do topdown
String webserviceTempDirString = model.getPathToWebServicesTempDir();
String repositoryString = webContainerDirString
- + File.separator + Axis2CreationUIMessages.DIR_WEB_INF
- + File.separator + Axis2CreationUIMessages.DIR_SERVICES;
+ + File.separator + Axis2Constants.DIR_WEB_INF
+ + File.separator + Axis2Constants.DIR_SERVICES;
//Copy the existing services to the repository
status = contentCopyUtils.copyDirectoryRecursivelyIntoWorkspace(
webserviceTempDirString,
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/messages/Axis2CreationUIMessages.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/messages/Axis2CreationUIMessages.java
index 898bd7f..13249f8 100644
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/messages/Axis2CreationUIMessages.java
+++ b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/messages/Axis2CreationUIMessages.java
@@ -14,6 +14,7 @@
* 20070511 186440 sandakith@wso2.com - Lahiru Sandakith fix 186440
* 20070517 187307 sandakith@wso2.com - Lahiru Sandakith, Fix 187307 Property File Fix
* 20070601 190505 pmoogk@ca.ibm.com - Peter Moogk
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.creation.core.messages;
@@ -24,25 +25,6 @@
//get the lables from this massages to the properties file
private static final String BUNDLE_NAME =
"org.eclipse.jst.ws.axis2.creation.core.messages.Axis2CreationUI"; //$NON-NLS-1$
- public static final String FILE_SERVICES_XML="services.xml"; //$NON-NLS-1$
- public static final String FILE_XML="*.xml"; //$NON-NLS-1$
- public static final String DIR_META_INF="META-INF"; //$NON-NLS-1$
- public static final String DIR_BUILD="build"; //$NON-NLS-1$
- public static final String DIR_SRC="src"; //$NON-NLS-1$
- public static final String DIR_CLASSES="classes"; //$NON-NLS-1$
- public static final String DIR_RESOURCES="resources"; //$NON-NLS-1$
- public static final String DIR_WEB_INF="WEB-INF"; //$NON-NLS-1$
- public static final String DIR_SERVICES="services"; //$NON-NLS-1$
- public static final String DIR_WEBSERVICES="webservices"; //$NON-NLS-1$
- public static final String DIR_WEBCONTENT="WebContent"; //$NON-NLS-1$
- public static final String DIR_DOT_METADATA=".metadata"; //$NON-NLS-1$
- public static final String DIR_DOT_PLUGINS=".plugins"; //$NON-NLS-1$
- public static final String JAR_TASK="jar"; //$NON-NLS-1$
- public static final String AXIS2_PROJECT="org.eclipse.jst.ws.axis2"; //$NON-NLS-1$
- public static final String CODEGEN_RESULTS="codegen"; //$NON-NLS-1$
- public static final String DATA_BINDING_ADB="ADB"; //$NON-NLS-1$
- public static final String DATA_BINDING_NONE="NONE"; //$NON-NLS-1$
- public static final String SKELETON_SUFFIX="Skeleton.java"; //$NON-NLS-1$
private Axis2CreationUIMessages() {
// Do not instantiate
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/AARFileWriter.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/AARFileWriter.java
index eeff2ec..72eebb2 100644
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/AARFileWriter.java
+++ b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/AARFileWriter.java
@@ -11,22 +11,24 @@
* -------- -------- -----------------------------------------------------------
* 20070110 168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2
* runtime to the framework for 168762
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.creation.core.utils;
import java.io.File;
import java.io.IOException;
+
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Jar;
-import org.eclipse.jst.ws.axis2.creation.core.messages.Axis2CreationUIMessages;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
public class AARFileWriter extends Jar{
public AARFileWriter() {
this.setProject(new Project());
this.getProject().init();
- this.setTaskType(Axis2CreationUIMessages.JAR_TASK);
- this.setTaskName(Axis2CreationUIMessages.JAR_TASK);
+ this.setTaskType(Axis2Constants.JAR_TASK);
+ this.setTaskName(Axis2Constants.JAR_TASK);
this.setOwningTarget(new org.apache.tools.ant.Target());
}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/PathLoadingUtil.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/PathLoadingUtil.java
index 6c24d22..5926011 100644
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/PathLoadingUtil.java
+++ b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/PathLoadingUtil.java
@@ -14,13 +14,14 @@
* 20070426 183046 sandakith@wso2.com - Lahiru Sandakith
* 20070507 184740 sandakith@wso2.com - Lahiru Sandakith
* 20070507 185686 sandakith@wso2.com - Lahiru Sandakith
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.axis2.creation.core.utils;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.core.utils.FileUtils;
import org.eclipse.jst.ws.axis2.creation.core.data.DataModel;
-import org.eclipse.jst.ws.axis2.creation.core.messages.Axis2CreationUIMessages;
public class PathLoadingUtil {
@@ -70,10 +71,11 @@
public static String getTempCodegenOutputLocation() {
if (!alreadyComputeTempCodegenOutputLocation){
- String[] nodes = { Axis2CreationUIMessages.DIR_DOT_METADATA,
- Axis2CreationUIMessages.DIR_DOT_PLUGINS,
- Axis2CreationUIMessages.AXIS2_PROJECT,
- Axis2CreationUIMessages.CODEGEN_RESULTS};
+ String[] nodes = {
+ Axis2Constants.DIR_DOT_METADATA,
+ Axis2Constants.DIR_DOT_PLUGINS,
+ Axis2Constants.AXIS2_PROJECT,
+ Axis2Constants.CODEGEN_RESULTS};
tempCodegenOutputLocation = FileUtils.addNodesToPath(getWorkspaceDirectory(), nodes);
alreadyComputeTempCodegenOutputLocation = true;
}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/widgets/bean/ServicesXMLSelectBeanWidget.java b/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/widgets/bean/ServicesXMLSelectBeanWidget.java
index 94cca03..d382271 100644
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/widgets/bean/ServicesXMLSelectBeanWidget.java
+++ b/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/widgets/bean/ServicesXMLSelectBeanWidget.java
@@ -14,11 +14,13 @@
* 20070513 186430 sandakith@wso2.com - Lahiru Sandakith, fix for 186430
* Text not accessible on AXIS2 wizard pages.
* 20070529 188742 sandakith@wso2.com - Lahiru Sandakith, fix for 188742
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.internal.axis2.creation.ui.widgets.bean;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.creation.core.data.DataModel;
import org.eclipse.jst.ws.axis2.creation.core.messages.Axis2CreationUIMessages;
import org.eclipse.swt.SWT;
@@ -215,7 +217,7 @@
*/
private void handleBrowse(Shell parent) {
FileDialog fileDialog = new FileDialog(parent);
- fileDialog.setFilterExtensions(new String[] { Axis2CreationUIMessages.FILE_XML });
+ fileDialog.setFilterExtensions(new String[] { Axis2Constants.FILE_XML });
String fileName = fileDialog.open();
if (fileName != null) {
servicesXMLPath.setText(fileName);
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/widgets/skeleton/WSDL2JAVASkelConfigWidget.java b/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/widgets/skeleton/WSDL2JAVASkelConfigWidget.java
index 416f0bc..6e0bd75 100644
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/widgets/skeleton/WSDL2JAVASkelConfigWidget.java
+++ b/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/widgets/skeleton/WSDL2JAVASkelConfigWidget.java
@@ -15,6 +15,7 @@
* 20070518 187311 sandakith@wso2.com - Lahiru Sandakith, Fixing test resource addition
* 20070523 174876 sandakith@wso2.com - Lahiru Sandakith, Persist Preferences inside Framework
* 20070823 200413 sandakith@wso2.com - Lahiru Sandakith, Namespace to Package table fix
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.internal.axis2.creation.ui.widgets.skeleton;
@@ -26,6 +27,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jst.ws.axis2.consumption.core.utils.WSDLPropertyReader;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.core.context.Axis2EmitterContext;
import org.eclipse.jst.ws.axis2.core.plugin.WebServiceAxis2CorePlugin;
import org.eclipse.jst.ws.axis2.core.utils.ClassLoadingUtil;
@@ -418,8 +420,8 @@
* Fill the combo with proper databinding names
*/
private void fillDatabinderCombo() {
- databindingTypeCombo.add(Axis2CreationUIMessages.DATA_BINDING_ADB);
- databindingTypeCombo.add(Axis2CreationUIMessages.DATA_BINDING_NONE);
+ databindingTypeCombo.add(Axis2Constants.DATA_BINDING_ADB);
+ databindingTypeCombo.add(Axis2Constants.DATA_BINDING_NONE);
databindingTypeCombo.select(0);
}
diff --git a/bundles/org.eclipse.jst.ws.axis2.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis2.ui/META-INF/MANIFEST.MF
index a058afe..504644b 100644
--- a/bundles/org.eclipse.jst.ws.axis2.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.axis2.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws.axis2.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.jst.ws.axis2.ui.plugin.WebServiceAxis2UIPlugin
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.jst.ws.axis2.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/preferences/Axis2RuntimePreferencePage.java b/bundles/org.eclipse.jst.ws.axis2.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/preferences/Axis2RuntimePreferencePage.java
index 664150a..97660e7 100644
--- a/bundles/org.eclipse.jst.ws.axis2.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/preferences/Axis2RuntimePreferencePage.java
+++ b/bundles/org.eclipse.jst.ws.axis2.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/preferences/Axis2RuntimePreferencePage.java
@@ -21,6 +21,7 @@
* 20070603 188740 sandakith@wso2.com - Lahiru Sandakith,
* 20070604 190505 sandakith@wso2.com - Lahiru Sandakith,
* 20070604 190067 pmoogk@ca.ibm.com - Peter Moogk
+ * 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
*******************************************************************************/
package org.eclipse.jst.ws.internal.axis2.consumption.ui.preferences;
@@ -29,6 +30,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
import org.eclipse.jst.ws.axis2.core.context.Axis2EmitterContext;
import org.eclipse.jst.ws.axis2.core.plugin.WebServiceAxis2CorePlugin;
import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
@@ -157,7 +159,7 @@
}
});
- if(axis2Path.getText().equals(Axis2CoreUIMessages.NULL)){
+ if(axis2Path.getText().equals(Axis2Constants.NULL)){
status = new Status( IStatus.ERROR,
"id",
0,
@@ -412,7 +414,7 @@
aarExtentionLabel.setText( Axis2CoreUIMessages.LABEL_AAR_EXTENTION);
//AAR extention items
- final String[] aarExtentionItems = { Axis2CoreUIMessages.AAR };
+ final String[] aarExtentionItems = { Axis2Constants.AAR };
aarExtensionCombo = new Combo(codegenGroup,SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
aarExtensionCombo.setItems(aarExtentionItems);
