Change to static references to constants

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@684981 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 9 insertions, 9 deletions

diff --git a/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
index a13080eac4..493f704fe0 100644
--- a/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
+++ b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
@@ -106,7 +106,7 @@ public class EJBModuleProcessor {
                 String intf = ((JavaInterface)reference.getInterfaceContract().getInterface()).getName();
                 for (String bean : intfToBean.get(intf)) {
                     if (statefulBeans.contains(bean)) {
-                        reference.getRequiredIntents().add(helper.CONVERSATIONAL_INTENT);
+                        reference.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT);
                         break;
                     }
                 }
@@ -245,7 +245,7 @@ public class EJBModuleProcessor {
             }
             service.setInterfaceContract(ic);
             if (conversational) {
-                service.getRequiredIntents().add(helper.CONVERSATIONAL_INTENT);
+                service.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT);
             }
             componentType.getServices().add(service);
         }
@@ -266,7 +266,7 @@ public class EJBModuleProcessor {
             }
             service.setInterfaceContract(ic);
             if (conversational) {
-                service.getRequiredIntents().add(helper.CONVERSATIONAL_INTENT);
+                service.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT);
             }
             componentType.getServices().add(service);
         }
@@ -296,7 +296,7 @@ public class EJBModuleProcessor {
         for (Map.Entry<String, EnvEntry> entry : bean.getEnvEntryMap().entrySet()) {
             EnvEntry envEntry = entry.getValue();
             String type = envEntry.getEnvEntryType();
-            if (!helper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
+            if (!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
                 continue;
             }
             String propertyName = entry.getKey();
@@ -304,7 +304,7 @@ public class EJBModuleProcessor {
             String value = envEntry.getEnvEntryValue();
             Property property = helper.createComponentProperty();
             property.setName(propertyName);
-            property.setXSDType(helper.ALLOWED_ENV_ENTRY_TYPES.get(type));
+            property.setXSDType(AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.get(type));
             property.setValue(value);
             componentType.getProperties().add(property);
         }
@@ -340,7 +340,7 @@ public class EJBModuleProcessor {
         for (Map.Entry<String, EnvEntry> entry : bean.getEnvEntryMap().entrySet()) {
             EnvEntry envEntry = entry.getValue();
             String type = envEntry.getEnvEntryType();
-            if (!helper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
+            if (!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
                 continue;
             }
             String propertyName = entry.getKey();
@@ -348,7 +348,7 @@ public class EJBModuleProcessor {
             String value = envEntry.getEnvEntryValue();
             Property property = helper.createComponentProperty();
             property.setName(propertyName);
-            property.setXSDType(helper.ALLOWED_ENV_ENTRY_TYPES.get(type));
+            property.setXSDType(AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.get(type));
             property.setValue(value);
             componentType.getProperties().add(property);
         }
diff --git a/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
index 992151f70f..9fdcb32de5 100644
--- a/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
+++ b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
@@ -94,7 +94,7 @@ public class WebModuleProcessor {
         for (Map.Entry<String, EnvEntry> entry : webApp.getEnvEntryMap().entrySet()) {
             EnvEntry envEntry = entry.getValue();
             String type = envEntry.getEnvEntryType();
-            if (!helper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
+            if (!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
                 continue;
             }
             String propertyName = entry.getKey();
@@ -102,7 +102,7 @@ public class WebModuleProcessor {
             String value = envEntry.getEnvEntryValue();
             Property property = helper.createComponentProperty();
             property.setName(propertyName);
-            property.setXSDType(helper.ALLOWED_ENV_ENTRY_TYPES.get(type));
+            property.setXSDType(AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.get(type));
             property.setValue(value);
             componentType.getProperties().add(property);
         }