summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-02-09 10:16:26 (EST)
committer Stephan Born2012-04-24 04:33:29 (EDT)
commit00943938cc7a2c5d880326b82d1658eec16f66db (patch)
tree3bd4b4ba1aab805cb31d3451e537271e9d12173c
parent78a01eeddfa755b0e0050499c801670c5f0bafc6 (diff)
downloadorg.eclipse.stardust.ide-00943938cc7a2c5d880326b82d1658eec16f66db.zip
org.eclipse.stardust.ide-00943938cc7a2c5d880326b82d1658eec16f66db.tar.gz
org.eclipse.stardust.ide-00943938cc7a2c5d880326b82d1658eec16f66db.tar.bz2
Jira-ID: CRNT-23200 Stardust: Rename NL Plugins to new name pattern (fixing missing externalized Strings)
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@53671 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--modeling/org.eclipse.stardust.modeling.debug/.settings/org.eclipse.core.resources.prefs4
-rw-r--r--modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/Internal_Debugger_Messages.java2
-rw-r--r--modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/debugger/Debugger.java36
-rw-r--r--modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/launching/RuntimeClasspathEntryResolver.java32
-rw-r--r--modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/model/ManualApplicationDialog.java12
5 files changed, 42 insertions, 44 deletions
diff --git a/modeling/org.eclipse.stardust.modeling.debug/.settings/org.eclipse.core.resources.prefs b/modeling/org.eclipse.stardust.modeling.debug/.settings/org.eclipse.core.resources.prefs
index fdbb571..ef4b751 100644
--- a/modeling/org.eclipse.stardust.modeling.debug/.settings/org.eclipse.core.resources.prefs
+++ b/modeling/org.eclipse.stardust.modeling.debug/.settings/org.eclipse.core.resources.prefs
@@ -1,5 +1,3 @@
-#Mon Nov 14 16:55:54 CET 2011
+#Tue Feb 07 14:34:46 CET 2012
eclipse.preferences.version=1
encoding//src/ag/carnot/workflow/model/debug/messages.properties=8859_1
-encoding//src/org/eclipse/stardust/modeling/debug/debug_messages.properties=8859_1
-encoding//src/org/eclipse/stardust/modeling/debug/internal_debugger_messages.properties=8859_1
diff --git a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/Internal_Debugger_Messages.java b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/Internal_Debugger_Messages.java
index c542cc6..961d792 100644
--- a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/Internal_Debugger_Messages.java
+++ b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/Internal_Debugger_Messages.java
@@ -15,7 +15,7 @@ import java.util.ResourceBundle;
public class Internal_Debugger_Messages
{
- private static final String BUNDLE_NAME = "org.eclipse.stardust.modeling.debug.internal-debugger_messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.stardust.modeling.debug.internal-debugger-messages"; //$NON-NLS-1$
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
.getBundle(BUNDLE_NAME);
diff --git a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/debugger/Debugger.java b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/debugger/Debugger.java
index 30e1339..b59d745 100644
--- a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/debugger/Debugger.java
+++ b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/debugger/Debugger.java
@@ -79,7 +79,7 @@ import org.eclipse.stardust.modeling.debug.engine.WorkflowEventListener;
*/
public class Debugger
{
- private static final String CARNOT_SPRING_DEBUGGING_CONTEXT_XML = "carnot-spring-debugging-context.xml";
+ private static final String CARNOT_SPRING_DEBUGGING_CONTEXT_XML = "carnot-spring-debugging-context.xml"; //$NON-NLS-1$
private static final Logger trace = LogManager.getLogger(Debugger.class);
private static final String unsupportedImplType = Internal_Debugger_Messages.getString("MSG_UnsupportedActivityImplType"); //$NON-NLS-1$
@@ -127,7 +127,7 @@ public class Debugger
{
// Workaround (rsauer): fixing #5261 (route activities with performers are to be accepted for analyst models)
boolean analystView = "analyst".equals(arg.getViewType()); //$NON-NLS-1$
- Parameters.instance().setBoolean("Carnot.Internal.EnableDebuggerHacks", analystView);
+ Parameters.instance().setBoolean("Carnot.Internal.EnableDebuggerHacks", analystView); //$NON-NLS-1$
List<String> deps = arg.getDependencyPaths();
List<String> paths = CollectionUtils.newList(deps.size() + 1);
@@ -137,7 +137,7 @@ public class Debugger
oldStyleModels = CollectionUtils.newList(paths.size());
for (String modelPath : paths)
{
- System.err.println("Bootstrap: loading model from: " + modelPath);
+ System.err.println("Bootstrap: loading model from: " + modelPath); //$NON-NLS-1$
File modelFile = new File(modelPath);
try
{
@@ -276,7 +276,7 @@ public class Debugger
String hint = (String) data.getAttribute(CarnotConstants.DATA_TYPE_HINT_ATT);
if (CarnotConstants.TEXT_HINT.equals(hint) && primitive != null)
{
- trace.debug("Setting data type primitive string for " + data);
+ trace.debug("Setting data type primitive string for " + data); //$NON-NLS-1$
data.setDataType(primitive);
data.setAttribute(PredefinedConstants.TYPE_ATT,
org.eclipse.stardust.engine.core.pojo.data.Type.String);
@@ -285,7 +285,7 @@ public class Debugger
}
else if (CarnotConstants.NUMERIC_HINT.equals(hint) && primitive != null)
{
- trace.debug("Setting data type primitive double for " + data);
+ trace.debug("Setting data type primitive double for " + data); //$NON-NLS-1$
data.setDataType(primitive);
data.setAttribute(PredefinedConstants.TYPE_ATT,
org.eclipse.stardust.engine.core.pojo.data.Type.Double);
@@ -294,7 +294,7 @@ public class Debugger
}
else if (CarnotConstants.COMPLEX_HINT.equals(hint) && serializable != null)
{
- trace.debug("Setting data type serializable for " + data);
+ trace.debug("Setting data type serializable for " + data); //$NON-NLS-1$
data.setDataType(serializable);
data.setAttribute(PredefinedConstants.CLASS_NAME_ATT,
"java.io.Serializable"); //$NON-NLS-1$
@@ -303,7 +303,7 @@ public class Debugger
}
else if (primitive != null)
{
- trace.debug("Setting data type primitive string for " + data);
+ trace.debug("Setting data type primitive string for " + data); //$NON-NLS-1$
data.setDataType(primitive);
data.setAttribute(PredefinedConstants.TYPE_ATT,
org.eclipse.stardust.engine.core.pojo.data.Type.String);
@@ -312,7 +312,7 @@ public class Debugger
}
else if (serializable != null)
{
- trace.debug("Setting data type serializable for " + data);
+ trace.debug("Setting data type serializable for " + data); //$NON-NLS-1$
data.setDataType(serializable);
data.setAttribute(PredefinedConstants.CLASS_NAME_ATT,
"java.io.Serializable"); //$NON-NLS-1$
@@ -321,7 +321,7 @@ public class Debugger
}
else
{
- trace.warn("No suitable data type found for " + data);
+ trace.warn("No suitable data type found for " + data); //$NON-NLS-1$
}
}
else
@@ -412,7 +412,7 @@ public class Debugger
for (IExternalPackage pkg : packages)
{
IModel ref = pkg.getReferencedModel();
- System.err.println("Bootstrap: " + model + " uses " + ref);
+ System.err.println("Bootstrap: " + model + " uses " + ref); //$NON-NLS-1$ //$NON-NLS-2$
}
}
}
@@ -460,7 +460,7 @@ public class Debugger
{
IModel model = oldStyleModels.get(0);
String qualifiedId = '{' + model.getId() + '}' + oldStyleProcessDefinition.getId();
- System.err.println("Bootstrap: starting process " + qualifiedId);
+ System.err.println("Bootstrap: starting process " + qualifiedId); //$NON-NLS-1$
processInstance = workflowService.startProcess(qualifiedId, null, false);
}
finally
@@ -629,7 +629,7 @@ public class Debugger
Class clsSpringUtils = null;
try
{
- clsSpringUtils = Class.forName("ag.carnot.workflow.runtime.spring.SpringUtils");
+ clsSpringUtils = Class.forName("ag.carnot.workflow.runtime.spring.SpringUtils"); //$NON-NLS-1$
File file = new File(CARNOT_SPRING_DEBUGGING_CONTEXT_XML);
if (file.exists())
{
@@ -643,18 +643,18 @@ public class Debugger
if (hasSpringContext)
{
- Parameters.instance().set("Carnot.Spring.ApplicationContextFile",
+ Parameters.instance().set("Carnot.Spring.ApplicationContextFile", //$NON-NLS-1$
CARNOT_SPRING_DEBUGGING_CONTEXT_XML);
Method mthdGetAppContext = clsSpringUtils.getDeclaredMethod(
- "getApplicationContext", new Class[0]);
+ "getApplicationContext", new Class[0]); //$NON-NLS-1$
if (null != mthdGetAppContext)
{
Object context = mthdGetAppContext.invoke(null, new Object [0]);
if (null != context)
{
Parameters.instance().set(
- "ag.carnot.workflow.runtime.spring.applicationContext", context);
+ "ag.carnot.workflow.runtime.spring.applicationContext", context); //$NON-NLS-1$
springInitiated = true;
}
@@ -663,16 +663,16 @@ public class Debugger
}
catch (Exception e)
{
- trace.warn("", e);
+ trace.warn("", e); //$NON-NLS-1$
}
if (springInitiated)
{
- trace.info("Spring RT support is available.");
+ trace.info("Spring RT support is available."); //$NON-NLS-1$
}
else
{
- trace.info("Spring RT support is not available.");
+ trace.info("Spring RT support is not available."); //$NON-NLS-1$
}
}
diff --git a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/launching/RuntimeClasspathEntryResolver.java b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/launching/RuntimeClasspathEntryResolver.java
index d5a4332..189cda8 100644
--- a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/launching/RuntimeClasspathEntryResolver.java
+++ b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/launching/RuntimeClasspathEntryResolver.java
@@ -39,29 +39,29 @@ import org.osgi.framework.Bundle;
public class RuntimeClasspathEntryResolver implements IRuntimeClasspathEntryResolver
{
private static final String[][] carnot_libs = {
- {"org.eclipse.equinox.common", "/"},
- {"org.eclipse.debug.core", "/"},
+ {"org.eclipse.equinox.common", "/"}, //$NON-NLS-1$ //$NON-NLS-2$
+ {"org.eclipse.debug.core", "/"}, //$NON-NLS-1$ //$NON-NLS-2$
- {"org.eclipse.stardust.ide.thirdparty.runtime.xml", "lib/commons-jxpath-1.3.jar"},
- {"org.eclipse.stardust.ide.thirdparty.runtime.xml", "lib/xercesImpl-2.9.0.jar"},
+ {"org.eclipse.stardust.ide.thirdparty.runtime.xml", "lib/commons-jxpath-1.3.jar"}, //$NON-NLS-1$ //$NON-NLS-2$
+ {"org.eclipse.stardust.ide.thirdparty.runtime.xml", "lib/xercesImpl-2.9.0.jar"}, //$NON-NLS-1$ //$NON-NLS-2$
// {"org.eclipse.stardust.ide.thirdparty.runtime.xml", "lib/xalan-2.6.0.jar"},
- {"org.eclipse.stardust.ide.thirdparty.jaxws", "lib/webservices-api-1.5.jar"},
- {"org.eclipse.stardust.ide.thirdparty.jaxws", "lib/webservices-extra-api-1.5.jar"},
+ {"org.eclipse.stardust.ide.thirdparty.jaxws", "lib/webservices-api-1.5.jar"}, //$NON-NLS-1$ //$NON-NLS-2$
+ {"org.eclipse.stardust.ide.thirdparty.jaxws", "lib/webservices-extra-api-1.5.jar"}, //$NON-NLS-1$ //$NON-NLS-2$
- {"org.eclipse.stardust.ide.thirdparty.jaxws.metro", "lib/webservices-rt-1.5.jar"},
- {"org.eclipse.stardust.ide.thirdparty.jaxws.metro", "lib/webservices-extra-1.5.jar"},
- {"org.eclipse.stardust.ide.thirdparty.jaxws.metro", "lib/webservices-tools-1.5.jar"},
+ {"org.eclipse.stardust.ide.thirdparty.jaxws.metro", "lib/webservices-rt-1.5.jar"}, //$NON-NLS-1$ //$NON-NLS-2$
+ {"org.eclipse.stardust.ide.thirdparty.jaxws.metro", "lib/webservices-extra-1.5.jar"}, //$NON-NLS-1$ //$NON-NLS-2$
+ {"org.eclipse.stardust.ide.thirdparty.jaxws.metro", "lib/webservices-tools-1.5.jar"}, //$NON-NLS-1$ //$NON-NLS-2$
- {"org.eclipse.stardust.ide.thirdparty.runtime.j2ee", "lib/ejb-2.1.jar"},
- {"org.eclipse.stardust.ide.thirdparty.runtime.j2ee", "lib/jms-1.1.jar"},
+ {"org.eclipse.stardust.ide.thirdparty.runtime.j2ee", "lib/ejb-2.1.jar"}, //$NON-NLS-1$ //$NON-NLS-2$
+ {"org.eclipse.stardust.ide.thirdparty.runtime.j2ee", "lib/jms-1.1.jar"}, //$NON-NLS-1$ //$NON-NLS-2$
- {"org.eclipse.stardust.ide.engine.core", "lib/carnot-engine.jar"},
- {"org.eclipse.stardust.ide.engine.core", "lib/carnot-emf-xsd-integration.jar"},
- {"org.eclipse.stardust.ide.engine.core", "lib/ipp-engine-ws-metro.jar"},
- {"org.eclipse.stardust.ide.engine.core", "etc"},
+ {"org.eclipse.stardust.ide.engine.core", "lib/carnot-engine.jar"}, //$NON-NLS-1$ //$NON-NLS-2$
+ {"org.eclipse.stardust.ide.engine.core", "lib/carnot-emf-xsd-integration.jar"}, //$NON-NLS-1$ //$NON-NLS-2$
+ {"org.eclipse.stardust.ide.engine.core", "lib/ipp-engine-ws-metro.jar"}, //$NON-NLS-1$ //$NON-NLS-2$
+ {"org.eclipse.stardust.ide.engine.core", "etc"}, //$NON-NLS-1$ //$NON-NLS-2$
- {"org.eclipse.stardust.modeling.debug", ".eclipse/bin", "/"},
+ {"org.eclipse.stardust.modeling.debug", ".eclipse/bin", "/"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
};
public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(
diff --git a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/model/ManualApplicationDialog.java b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/model/ManualApplicationDialog.java
index aa7b4a8..a17de8a 100644
--- a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/model/ManualApplicationDialog.java
+++ b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/model/ManualApplicationDialog.java
@@ -481,12 +481,12 @@ public class ManualApplicationDialog extends Dialog
String encodedResult = new String(Base64.encode(out.toByteArray()));
// Eclipse debugger will deserialize it and show the value as Map / List
- result.append("java.lang.String encodedResult = \"" + encodedResult + "\";");
- result.append("byte[] encodedBytes = encodedResult.getBytes();");
- result.append("byte[] bytes = org.eclipse.stardust.common.Base64.decode(encodedBytes);");
- result.append("java.io.ByteArrayInputStream in = new java.io.ByteArrayInputStream(bytes);");
- result.append("java.io.ObjectInputStream objectIn = new java.io.ObjectInputStream(in);");
- result.append("return objectIn.readObject();");
+ result.append("java.lang.String encodedResult = \"" + encodedResult + "\";"); //$NON-NLS-1$ //$NON-NLS-2$
+ result.append("byte[] encodedBytes = encodedResult.getBytes();"); //$NON-NLS-1$
+ result.append("byte[] bytes = org.eclipse.stardust.common.Base64.decode(encodedBytes);"); //$NON-NLS-1$
+ result.append("java.io.ByteArrayInputStream in = new java.io.ByteArrayInputStream(bytes);"); //$NON-NLS-1$
+ result.append("java.io.ObjectInputStream objectIn = new java.io.ObjectInputStream(in);"); //$NON-NLS-1$
+ result.append("return objectIn.readObject();"); //$NON-NLS-1$
}
catch (Exception e)
{